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

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

Browse Source
This commit is contained in:
omigamedev
2017-05-05 21:57:02 +01:00
parent 484bf6fab4
commit 427dd66976
7 changed files with 147 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/canvas.h
View File

@@ -45,6 +45,7 @@ public:
glm::mat4 m_mv;
glm::mat4 m_proj;
glm::vec4 m_box;
glm::vec2 m_pan;
int m_width;
int m_height;
bool m_use_instanced = false;
@@ -70,13 +71,12 @@ public:
enum class kCanvasMode { Draw, Erase, Line, Camera };
kCanvasMode m_state{ kCanvasMode::Draw };
static CanvasMode* modes[];
CanvasMode* m_mode;
static std::vector<CanvasMode*> modes[];
std::vector<CanvasMode*>* m_mode;
static void set_mode(kCanvasMode mode)
{
I->m_mode = modes[(int)mode];
I->m_mode = &modes[(int)mode];
I->m_state = mode;
I->m_mode->canvas = I;
}
GLuint cube_id;