diff --git a/libs/openvr b/libs/openvr index 64fc059..d9cffe2 160000 --- a/libs/openvr +++ b/libs/openvr @@ -1 +1 @@ -Subproject commit 64fc05966a109543a1e191a45e1ab3a25a651211 +Subproject commit d9cffe2ff87bf0bac69b56bcf6fb60652a9d4009 diff --git a/src/app_vr.cpp b/src/app_vr.cpp index 61cc832..196d182 100644 --- a/src/app_vr.cpp +++ b/src/app_vr.cpp @@ -94,8 +94,8 @@ void App::vr_update(float dt) auto p = controller_points.average(); if (glm::distance(p, controller_last_point) > 1) { - render_task_async([p, c=down_controller]{ - Canvas::I->stroke_update(p, c->get_trigger_value()); + render_task_async([p, f=down_controller->get_trigger_value()]{ + Canvas::I->stroke_update(p, f); Canvas::I->stroke_draw(); }); controller_last_point = p; @@ -216,7 +216,7 @@ void App::vr_draw(const glm::mat4& proj, const glm::mat4& camera, const glm::mat int z = (int)(canvas->m_canvas->m_layers.size() - i); auto plane_mvp_z = proj * camera * - glm::scale(glm::vec3(z) * 20.f) * + glm::scale(glm::vec3(100.f)) * //glm::eulerAngleYXZ(yaw, pitch, roll) * canvas->m_canvas->m_plane_transform[plane_index] * glm::translate(glm::vec3(0, 0, -1));