integrate quick brushes, simulate pressed keys on windows active

This commit is contained in:
2019-03-05 23:41:43 +01:00
parent 1cbe9a4a76
commit b0933c29fb
8 changed files with 79 additions and 44 deletions

View File

@@ -70,7 +70,6 @@ class CanvasModePen : public CanvasMode
bool m_draw_tip = false;
bool m_dragging = false;
glm::vec2 m_pan_start;
glm::vec2 m_cur_pos;
glm::vec2 m_size_pos_start;
float m_size_value_start;
float m_camera_fov;
@@ -88,6 +87,7 @@ public:
virtual void enter(kCanvasMode prev) override;
virtual void leave() override;
bool m_picking = false;
glm::vec2 m_cur_pos;
};
class CanvasModeLine : public CanvasMode
@@ -96,10 +96,13 @@ class CanvasModeLine : public CanvasMode
bool m_dragging = false;
glm::vec2 m_drag_start;
glm::vec2 m_drag_pos;
std::shared_ptr<Brush> m_brush;
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 init() override;
virtual void enter(kCanvasMode prev) override;
virtual void leave() override;
};
class CanvasModeGrid : public CanvasMode