mirror
/
msdfgen
mirror of https://github.com/Chlumsky/msdfgen.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'point_tolerance' 

* point_tolerance:
  Clean up degenerate segments during normalization
This commit is contained in:
Christopher Kohnert 2017-05-31 15:44:33 -07:00
parent 4b21ad24e7 4fdaa524fc
commit 7cc65a66d2
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/Shape.cpp
View File

@ -38,6 +38,17 @@ bool Shape::validate() const {
void Shape::normalize() { void Shape::normalize() {
for (std::vector<Contour>::iterator contour = contours.begin(); contour != contours.end(); ++contour) { for (std::vector<Contour>::iterator contour = contours.begin(); contour != contours.end(); ++contour) {
// First, erase all degenerate edges.
std::vector<EdgeHolder>::iterator edge_it = contour->edges.begin();
while( edge_it != contour->edges.end() ) {
if( (*edge_it)->isDegenerate() ) {
edge_it = contour->edges.erase(edge_it);
}
else {
edge_it++;
}
}
if (contour->edges.size() == 1) { if (contour->edges.size() == 1) {
EdgeSegment *parts[3] = { }; EdgeSegment *parts[3] = { };
contour->edges[0]->splitInThirds(parts[0], parts[1], parts[2]); contour->edges[0]->splitInThirds(parts[0], parts[1], parts[2]);

12
core/edge-segments.cpp
View File

@ -295,5 +295,17 @@ void CubicSegment::splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeS
point(2/3.), color); point(2/3.), color);
part3 = new CubicSegment(point(2/3.), mix(mix(p[1], p[2], 2/3.), mix(p[2], p[3], 2/3.), 2/3.), p[2] == p[3] ? p[3] : mix(p[2], p[3], 2/3.), p[3], color); part3 = new CubicSegment(point(2/3.), mix(mix(p[1], p[2], 2/3.), mix(p[2], p[3], 2/3.), 2/3.), p[2] == p[3] ? p[3] : mix(p[2], p[3], 2/3.), p[3], color);
} }
bool LinearSegment::isDegenerate() const {
return p[0].same(p[1]);
}
bool QuadraticSegment::isDegenerate() const {
return p[0].same(p[2]);
}
bool CubicSegment::isDegenerate() const {
return p[0].same(p[3]) && (p[0].same(p[1]) || p[2].same(p[1]));
}
} }

8
core/edge-segments.h
View File

@ -38,6 +38,8 @@ public:
virtual void moveEndPoint(Point2 to) = 0; virtual void moveEndPoint(Point2 to) = 0;
/// Splits the edge segments into thirds which together represent the original edge. /// Splits the edge segments into thirds which together represent the original edge.
virtual void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const = 0; virtual void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const = 0;
virtual bool isDegenerate() const = 0;
}; };
@ -57,6 +59,8 @@ public:
void moveStartPoint(Point2 to); void moveStartPoint(Point2 to);
void moveEndPoint(Point2 to); void moveEndPoint(Point2 to);
void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const; void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const;
bool isDegenerate() const;
}; };
@ -77,6 +81,8 @@ public:
void moveEndPoint(Point2 to); void moveEndPoint(Point2 to);
void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const; void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const;
bool isDegenerate() const;
}; };
/// A cubic Bezier curve. /// A cubic Bezier curve.
@ -96,6 +102,8 @@ public:
void moveEndPoint(Point2 to); void moveEndPoint(Point2 to);
void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const; void splitInThirds(EdgeSegment *&part1, EdgeSegment *&part2, EdgeSegment *&part3) const;
bool isDegenerate() const;
}; };
} }