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

add drop down menu to clear grids

Browse Source
This commit is contained in:
omigamedev
2017-05-10 01:43:01 +01:00
parent fbb73ccbbb
commit aada69d447
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
engine/canvas_modes.cpp
View File

@@ -185,7 +185,7 @@ void CanvasModeCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
////////////////////////////////////////////////////////////////////
void CanvasModeNormal::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
void CanvasModeGrid::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
{
switch (me->m_type)
{
@@ -228,7 +228,7 @@ void CanvasModeNormal::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
}
}
void CanvasModeNormal::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera)
void CanvasModeGrid::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera)
{
//if (m_dragging)
for (auto l : m_lines)
@@ -246,12 +246,12 @@ void CanvasModeNormal::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, co
}
}
void CanvasModeNormal::init()
void CanvasModeGrid::init()
{
m_line.create();
}
void CanvasModeNormal::commit()
void CanvasModeGrid::commit()
{
auto drawer = [this](const glm::mat4& camera, const glm::mat4& proj){
ui::ShaderManager::use(ui::kShader::Color);
@@ -266,6 +266,11 @@ void CanvasModeNormal::commit()
canvas->draw_objects(std::bind(drawer, std::placeholders::_1, std::placeholders::_2));
}
void CanvasModeGrid::clear()
{
m_lines.clear();
}
////////////////////////////////////////////////////////////////////
void CanvasModeFill::init()