implement zoom shortcut with ctrl+rmb, update nanort with merged size_t pull request

2019-01-16 11:04:03 +01:00
parent 9c93747b17
commit 3d7b7107d4
3 changed files with 16 additions and 5 deletions
--- a/src/canvas_modes.h
+++ b/src/canvas_modes.h
@@ -38,8 +38,10 @@ class CanvasModeBasicCamera : public CanvasMode
 {
    bool m_draggingR = false;
    bool m_draggingT = false; // touch drag
+    bool m_zooming = false;
    glm::vec2 m_dragR_start;
    glm::vec2 m_pan_start;
+    float m_fov_start;
    float m_camera_fov;
    float m_zoom_canvas = 1.f;
    float m_zoom_start;