add free and poly selection mask tools, fix some threading gl problems

2017-10-24 14:20:12 +01:00
parent 2a92beca7b
commit b40a5b656b
9 changed files with 197 additions and 137 deletions
--- a/engine/canvas.h
+++ b/engine/canvas.h
@@ -86,7 +86,7 @@ public:
    glm::vec3 m_cam_pos;
    float m_cam_fov = 85;

-    enum class kCanvasMode { Draw, Erase, Line, Camera, Grid, Fill, COUNT };
+    enum class kCanvasMode { Draw, Erase, Line, Camera, Grid, Fill, MaskFree, MaskLine, COUNT };
    kCanvasMode m_state{ kCanvasMode::Draw };
    static std::vector<CanvasMode*> modes[];
    std::vector<CanvasMode*>* m_mode = nullptr;