separate pen mode and camera in different modes to be composed, start implementing line draw mode

2017-05-05 21:57:02 +01:00
parent 484bf6fab4
commit 427dd66976
7 changed files with 147 additions and 92 deletions
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -3,9 +3,10 @@
 #include "canvas.h"

 ui::Canvas* ui::Canvas::I;
-CanvasMode* ui::Canvas::modes[] = {
-    new CanvasModePen,
-    new CanvasModePen,
+std::vector<CanvasMode*> ui::Canvas::modes[] = {
+    { new CanvasModePen, new CanvasModeBasicCamera },
+    { new CanvasModePen, new CanvasModeBasicCamera },
+    { new CanvasModeLine, new CanvasModeBasicCamera },
 };
 glm::vec3 ui::Canvas::m_plane_origin[6] = {
    { 0, 0,-1}, // front