omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix selection and cursor

Browse Source
This commit is contained in:
omigamedev
2019-03-09 23:07:06 +01:00
parent f0fed897f6
commit 3af923db96
5 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/canvas_modes.h
View File

@@ -43,7 +43,7 @@ public:
virtual void on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) {}
virtual void init() {}
virtual void enter(kCanvasMode prev) {}
virtual void leave() {}
virtual void leave(kCanvasMode next) {}
CanvasMode() = default;
virtual ~CanvasMode() = default;
};
@@ -84,7 +84,7 @@ public:
virtual void on_MouseEvent(MouseEvent* me, glm::vec2& loc) override;
virtual void on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) override;
virtual void enter(kCanvasMode prev) override;
virtual void leave() override;
virtual void leave(kCanvasMode next) override;
bool m_picking = false;
glm::vec2 m_cur_pos;
bool m_draw_tip = false;
@@ -105,7 +105,7 @@ public:
virtual void on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) override;
virtual void init() override;
virtual void enter(kCanvasMode prev) override;
virtual void leave() override;
virtual void leave(kCanvasMode next) override;
};
class CanvasModeGrid : public CanvasMode
@@ -144,7 +144,7 @@ public:
virtual void on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) override;
virtual void on_MouseEvent(MouseEvent* me, glm::vec2& loc) override;
virtual void init() override;
virtual void leave() override;
virtual void leave(kCanvasMode next) override;
};
class CanvasModeMaskBase : public CanvasMode
@@ -165,7 +165,7 @@ public:
virtual void on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) override;
virtual void on_MouseEvent(MouseEvent* me, glm::vec2& loc) override;
virtual void init() override;
virtual void leave() override;
virtual void leave(kCanvasMode next) override;
void clear();
};
@@ -178,7 +178,7 @@ public:
virtual void on_MouseEvent(MouseEvent* me, glm::vec2& loc) override;
virtual void init() override;
virtual void enter(kCanvasMode prev) override;
virtual void leave() override;
virtual void leave(kCanvasMode next) override;
};
class CanvasModeTransform : public CanvasMode
@@ -218,5 +218,5 @@ public:
virtual void on_MouseEvent(MouseEvent* me, glm::vec2& loc) override;
virtual void init() override;;
virtual void enter(kCanvasMode prev) override;
virtual void leave() override;
virtual void leave(kCanvasMode next) override;
};