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

src/canvas_modes.cpp

@@ -34,9 +34,11 @@ void CanvasModeBasicCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
         case kEventType::MouseDownR:
             if (App::I.keys[(int)kKey::KeyAlt])
                 break;
+            m_zooming = App::I.keys[(int)kKey::KeyCtrl];
             m_draggingR = true;
             m_dragR_start = me->m_pos;
             m_pan_start = canvas->m_pan;
+            m_fov_start = canvas->m_cam_fov;
             node->mouse_capture();
             break;
         case kEventType::MouseUpR:
@@ -45,12 +47,19 @@ void CanvasModeBasicCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
             break;
         case kEventType::MouseMove:
             if (m_draggingR)
+            {
+                if (m_zooming)
+                {
+                    canvas->m_cam_fov = m_fov_start - (me->m_pos.x - m_dragR_start.x) * 0.05f;
+                }
+                else
                 {
                     auto dir = (App::I.has_vr && App::I.vr_active) ? glm::vec2(1, 1) : glm::vec2(-1, -1);
                     canvas->m_pan = m_pan_start + (me->m_pos - m_dragR_start) * dir * (canvas->m_cam_fov / 85.f);
                     auto angle = canvas->m_pan * 0.003f;
                     canvas->m_cam_rot = glm::eulerAngleXY(angle.y, angle.x);
                 }
+            }
             break;
         case kEventType::MouseScroll:
             m_zoom_canvas += me->m_scroll_delta * 0.1f;

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;