From eb8f93af918d4a5d467e02aee9a24a3f6c7e8305 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Wed, 10 May 2017 01:53:09 +0100 Subject: [PATCH] enable depth test when rendering the layers, reduce pan camera speed --- engine/canvas_modes.cpp | 2 +- engine/layout.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/canvas_modes.cpp b/engine/canvas_modes.cpp index 1ff6bd3..a35759b 100644 --- a/engine/canvas_modes.cpp +++ b/engine/canvas_modes.cpp @@ -172,7 +172,7 @@ void CanvasModeCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc) break; case kEventType::MouseMove: if (m_dragging) - canvas->m_cam_pos.xy = m_pos_start + (me->m_pos - m_drag_start) * glm::vec2(1, -1) * 0.01f; + canvas->m_cam_pos.xy = m_pos_start + (me->m_pos - m_drag_start) * glm::vec2(1, -1) * 0.001f; break; case kEventType::MouseCancel: m_dragging = false; diff --git a/engine/layout.h b/engine/layout.h index b4369bf..7133df7 100644 --- a/engine/layout.h +++ b/engine/layout.h @@ -2043,6 +2043,8 @@ public: auto blend = glIsEnabled(GL_BLEND); glEnable(GL_BLEND); + glEnable(GL_DEPTH_TEST); + glClear(GL_DEPTH_BUFFER_BIT); for (int plane_index = 0; plane_index < 6; plane_index++) { auto plane_mvp = proj * camera * glm::scale(glm::vec3(m_canvas->m_order.size())) * m_canvas->m_plane_transform[plane_index] * glm::translate(glm::vec3(0, 0, -1)); @@ -2076,6 +2078,7 @@ public: } } } + glDisable(GL_DEPTH_TEST); for (auto& mode : *m_canvas->m_mode) mode->on_Draw(ortho_proj, proj, camera);