update openvr, move layers far away in vr to match brush cursor

This commit is contained in:
2019-08-04 23:25:35 +02:00
parent 6043857ad8
commit 6785feb9d9
2 changed files with 4 additions and 4 deletions

View File

@@ -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));