mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-28 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the duplicate callback code for algo_line_continuous()

Browse Source
This commit is contained in:
David Capello 2019-04-29 15:28:21 -03:00
parent e3dcb2b818
commit 430c7384e5
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/tools/intertwiners.h
View File

@ -10,6 +10,15 @@
namespace app {
namespace tools {
static void addPointsWithoutDuplicatingLastOne(int x, int y, Stroke* stroke)
{
const gfx::Point newPoint(x, y);
if (stroke->empty() ||
stroke->lastPoint() != newPoint) {
stroke->addPoint(newPoint);
}
}
class IntertwineNone : public Intertwine {
public:
@ -59,13 +68,6 @@ public:
};
class IntertwineAsLines : public Intertwine {
static void Line(int x, int y, Stroke* stroke) {
gfx::Point newPoint(x, y);
if (stroke->empty() ||
stroke->lastPoint() != newPoint) {
stroke->addPoint(newPoint);
}
}
Stroke m_lastPointPrinted;
Stroke m_pts;
@ -107,7 +109,7 @@ public:
stroke[c+1].x,
stroke[c+1].y,
(void*)&m_pts,
(AlgoPixel)&IntertwineAsLines::Line);
(AlgoPixel)&addPointsWithoutDuplicatingLastOne);
}
for (int c=0; c<m_pts.size(); ++c) {
@ -399,14 +401,6 @@ public:
};
class IntertwineAsPixelPerfect : public Intertwine {
static void pixelPerfectLine(int x, int y, Stroke* stroke) {
gfx::Point newPoint(x, y);
if (stroke->empty() ||
stroke->lastPoint() != newPoint) {
stroke->addPoint(newPoint);
}
}
// It was introduced to know if joinStroke function
// was executed inmediatelly after a "Last" trace policy (i.e. after the
// user confirms a line draw while he is holding down the SHIFT key), so
@ -451,7 +445,7 @@ public:
stroke[c+1].x,
stroke[c+1].y,
(void*)&m_pts,
(AlgoPixel)&IntertwineAsPixelPerfect::pixelPerfectLine);
(AlgoPixel)&addPointsWithoutDuplicatingLastOne);
}
}