From 678114fca111deaf7661a4ad0b43892702aa6761 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Tue, 6 Aug 2019 08:33:19 +0200
Subject: [PATCH] add spacebar to rotate the view

---
 src/canvas_modes.cpp | 49 +++++++++++++++++++++++++++++++-------------
 src/canvas_modes.h   |  2 ++
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/canvas_modes.cpp b/src/canvas_modes.cpp
index 53d06ff..1e113fe 100644
--- a/src/canvas_modes.cpp
+++ b/src/canvas_modes.cpp
@@ -22,6 +22,13 @@ void CanvasModeBasicCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
 //                 m_pan_start = Canvas::I->m_pan;
 //                 node->mouse_capture();
 //             }
+            if (App::I->keys[(int)kKey::KeySpacebar])
+            {
+                m_draggingL = true;
+                m_pan_start = Canvas::I->m_pan;
+                m_dragL_start = me->m_pos;
+                node->mouse_capture();
+            }
             break;
         case kEventType::MouseUpL:
 //             if (Canvas::I->m_touch_lock && me->m_source == kEventSource::Touch)
@@ -29,6 +36,11 @@ void CanvasModeBasicCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
 //                 m_draggingR = false;
 //                 node->mouse_release();
 //             }
+            if (m_draggingL)
+            {
+                m_draggingL = false;
+                node->mouse_release();
+            }
             break;
         case kEventType::MouseDownR:
             if (App::I->keys[(int)kKey::KeyAlt])
@@ -60,6 +72,12 @@ void CanvasModeBasicCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
                     Canvas::I->m_cam_rot = glm::eulerAngleXY(angle.y, angle.x);
                 }
             }
+            if (m_draggingL)
+            {
+                Canvas::I->m_pan = m_pan_start + (me->m_pos - m_dragL_start) * glm::vec2(-1, -1) * (Canvas::I->m_cam_fov / 85.f);
+                auto angle = Canvas::I->m_pan * 0.003f;
+                Canvas::I->m_cam_rot = glm::eulerAngleXY(angle.y, angle.x);
+            }
             break;
         case kEventType::MouseScroll:
             m_zoom_canvas += me->m_scroll_delta * 0.1f;
@@ -128,23 +146,26 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
     switch (me->m_type)
     {
         case kEventType::MouseDownL:
-            if (App::I->keys[(int)kKey::KeyAlt] || m_picking)
+            if (!App::I->keys[(int)kKey::KeySpacebar])
             {
-                m_picking = true;
-                Canvas::I->pick_start();
-                glm::vec4 pix = Canvas::I->pick_get(loc);
-                Canvas::I->m_current_brush->m_tip_color = pix;
-                App::I->brush_update();
-            }
-            else
-            {
-                App::I->render_task_async([loc, pr=me->m_pressure]
+                if (App::I->keys[(int)kKey::KeyAlt] || m_picking)
                 {
-                    Canvas::I->stroke_start({ loc, 0 }, pr);
-                });
+                    m_picking = true;
+                    Canvas::I->pick_start();
+                    glm::vec4 pix = Canvas::I->pick_get(loc);
+                    Canvas::I->m_current_brush->m_tip_color = pix;
+                    App::I->brush_update();
+                }
+                else
+                {
+                    App::I->render_task_async([loc, pr = me->m_pressure]
+                        {
+                            Canvas::I->stroke_start({ loc, 0 }, pr);
+                        });
+                }
+                m_dragging = true;
+                node->mouse_capture();
             }
-            m_dragging = true;
-            node->mouse_capture();
             break;
         case kEventType::MouseUpL:
             if (m_dragging && !m_picking)
diff --git a/src/canvas_modes.h b/src/canvas_modes.h
index 54d1b47..b936ab6 100644
--- a/src/canvas_modes.h
+++ b/src/canvas_modes.h
@@ -56,9 +56,11 @@ public:
 class CanvasModeBasicCamera : public CanvasMode
 {
     bool m_draggingR = false;
+    bool m_draggingL = false;
     bool m_draggingT = false; // touch drag
     bool m_zooming = false;
     glm::vec2 m_dragR_start;
+    glm::vec2 m_dragL_start;
     glm::vec2 m_pan_start;
     float m_fov_start;
     float m_camera_fov;