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

fix poly clip and fix poly_remove_duplicate

Browse Source
This commit is contained in:
omigamedev
2018-11-29 23:13:04 +01:00
parent f64f157e82
commit d0919862da
5 changed files with 14 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/node_canvas.cpp
View File

@@ -268,7 +268,9 @@ void NodeCanvas::draw()
mode->on_Draw(ortho_proj, proj, camera);
glDisable(GL_DEPTH_TEST);
if (m_canvas->m_smask_active || m_canvas->m_state == Canvas::kCanvasMode::Transform)
auto transform_mode = static_cast<CanvasModeTransform*>(Canvas::modes[(int)Canvas::kCanvasMode::Transform][0]);
bool importing = transform_mode->m_action == CanvasModeTransform::ActionType::Import;
if (m_canvas->m_smask_active || m_canvas->m_state == Canvas::kCanvasMode::Transform && !importing)
{
m_canvas->modes[(int)Canvas::kCanvasMode::MaskFree][0]->on_Draw(ortho_proj, proj, camera);
m_canvas->modes[(int)Canvas::kCanvasMode::MaskLine][0]->on_Draw(ortho_proj, proj, camera);