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

improve brush preview

Browse Source
This commit is contained in:
omigamedev
2019-02-19 11:33:41 +01:00
parent e4ee87e4c6
commit 08cca154b7
11 changed files with 612 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/canvas_modes.cpp
View File

@@ -521,7 +521,7 @@ void CanvasModeMaskFree::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
m_shape.draw_fill();
};
// use m_shape to render the mask polygon
auto v = Canvas::I->triangulate(poly_remove_duplicate(m_points2d));
auto v = triangulate(poly_remove_duplicate(m_points2d));
Canvas::I->project2Dpoints(v);
m_shape.update_vertices(v.data(), (int)v.size());
Canvas::I->draw_objects_direct(std::bind(drawer, std::placeholders::_1, std::placeholders::_2), Canvas::I->m_smask);
@@ -629,7 +629,7 @@ void CanvasModeMaskLine::leave()
std::vector<vertex_t> points;
for (int i = 0; i < (int)m_points2d.size(); i++)
points.emplace_back(m_points2d[i]);
auto v = Canvas::I->triangulate(poly_remove_duplicate(points));
auto v = triangulate(poly_remove_duplicate(points));
Canvas::I->project2Dpoints(v);
LOG("%d points", (int)v.size());
@@ -922,7 +922,7 @@ void CanvasModeTransform::enter(kCanvasMode prev)
vertex_t(corners[1], { 1, 1 }),
vertex_t(corners[3], { 0, 1 }),
});
auto shape3d = Canvas::I->triangulate(m_points_face[0]);
auto shape3d = triangulate(m_points_face[0]);
m_shape[0].update_vertices(shape3d.data(), shape3d.size());
m_commit_on_leave = true;
@@ -1028,7 +1028,7 @@ void CanvasModeTransform::enter(kCanvasMode prev)
v.pos = center_mat * v.pos;
}
auto shape3d = Canvas::I->triangulate(m_points_face[plane]);
auto shape3d = triangulate(m_points_face[plane]);
m_shape[plane].update_vertices(shape3d.data(), shape3d.size());
Canvas::I->m_layers[Canvas::I->m_current_layer_idx].m_rtt[plane].bindFramebuffer();