josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Polygon objects now prune adjacent points that are the same -- no more fuzzies in extrudes with offsets of 0

Browse Source 
git-svn-id: svn://anubis/fart/trunk@281 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2010-07-09 14:29:17 +00:00
parent d2b37a1687
commit 17d69c54ce
2 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
util/Polygon.cc
View File

@ -11,7 +11,7 @@
* The angle is from vector 1 to vector 2, positive anticlockwise * The angle is from vector 1 to vector 2, positive anticlockwise
* The result is between -pi -> pi * The result is between -pi -> pi
*/ */
double angle2D(double x1, double y1, double x2, double y2) static double angle2D(double x1, double y1, double x2, double y2)
{ {
double dtheta, theta1, theta2; double dtheta, theta1, theta2;
@ -26,8 +26,41 @@ double angle2D(double x1, double y1, double x2, double y2)
return dtheta; return dtheta;
} }
bool Polygon::containsPoint2D(const Vector & v) const static bool similarPoint(const Vector & v, const Vector & w)
{ {
return FP_EQUAL(v[0], w[0]) && FP_EQUAL(v[1], w[1]) && FP_EQUAL(v[2], w[2]);
}
Polygon & Polygon::add(const Vector & v)
{
int sz = size();
if (sz < 1 || !similarPoint(v, *(*this)[sz-1]))
{
push_back(new Vector(v));
}
return *this;
}
Polygon & Polygon::add(refptr<Vector> v)
{
int sz = size();
if (sz < 1 || !similarPoint(*v, *(*this)[sz-1]))
{
push_back(v);
}
return *this;
}
bool Polygon::containsPoint2D(const Vector & v)
{
if (size() < 3)
{
return false;
}
if (similarPoint(*(*this)[0], *(*this)[size()-1]))
{
pop_back();
}
double angle_sum = 0.0; double angle_sum = 0.0;
for (int i = 0, sz = size(); i < sz; i++) for (int i = 0, sz = size(); i < sz; i++)
{ {
@ -39,8 +72,16 @@ bool Polygon::containsPoint2D(const Vector & v) const
return FP_EQUAL(angle_sum, 2.0 * M_PI); return FP_EQUAL(angle_sum, 2.0 * M_PI);
} }
bool Polygon::containsPointConvex(const Vector & v) const bool Polygon::containsPointConvex(const Vector & v)
{ {
if (size() < 3)
{
return false;
}
if (similarPoint(*(*this)[0], *(*this)[size()-1]))
{
pop_back();
}
double angle_sum = 0.0; double angle_sum = 0.0;
for (int i = 0, sz = size(); i < sz; i++) for (int i = 0, sz = size(); i < sz; i++)
{ {

16
util/Polygon.h
View File

@ -10,18 +10,10 @@
class Polygon : public std::vector< refptr<Vector> > class Polygon : public std::vector< refptr<Vector> >
{ {
public: public:
Polygon & add(const Vector & v) Polygon & add(const Vector & v);
{ Polygon & add(refptr<Vector> v);
push_back(new Vector(v)); bool containsPoint2D(const Vector & v);
return *this; bool containsPointConvex(const Vector & v);
}
Polygon & add(refptr<Vector> v)
{
push_back(v);
return *this;
}
bool containsPoint2D(const Vector & v) const;
bool containsPointConvex(const Vector & v) const;
}; };
#endif #endif