jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplified how faces/vertices were reversed. resolved segfault

Browse source
This commit is contained in:
Hans Loeblich 2015-11-11 14:48:05 -06:00
parent 2f8297891e
commit 8ffd03b58f
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/GeometryEvaluator.cc
View file

@ -761,12 +761,21 @@ Response GeometryEvaluator::visit(State &state, const LinearExtrudeNode &node)
return ContinueTraversal;
}
static void fill_ring(std::vector<Vector3d> &ring, const Outline2d &o, double a)
static void fill_ring(std::vector<Vector3d> &ring, const Outline2d &o, double a, bool flip)
{
for (unsigned int i=0;i<o.vertices.size();i++) {
ring[i][0] = o.vertices[i][0] * sin(a);
ring[i][1] = o.vertices[i][0] * cos(a);
ring[i][2] = o.vertices[i][1];
if (flip) {
unsigned int l = o.vertices.size()-1;
for (unsigned int i=0 ;i<o.vertices.size();i++) {
ring[i][0] = o.vertices[l-i][0] * sin(a);
ring[i][1] = o.vertices[l-i][0] * cos(a);
ring[i][2] = o.vertices[l-i][1];
}
} else {
for (unsigned int i=0 ;i<o.vertices.size();i++) {
ring[i][0] = o.vertices[i][0] * sin(a);
ring[i][1] = o.vertices[i][0] * cos(a);
ring[i][2] = o.vertices[i][1];
}
}
}
@ -810,25 +819,10 @@ static Geometry *rotatePolygon(const RotateExtrudeNode &node, const Polygon2d &p
fragments = Calc::get_fragments_from_r(max_x - min_x, node.fn, node.fs, node.fa) * std::abs(node.angle) / 360;
}
Polygon2d *poly2;
bool flip_faces = (min_x >= 0 && node.angle > 0) || (min_x < 0 && node.angle < 0);
// build a copy with reversed outlines
if (flip_faces) {
poly2 = new Polygon2d();
BOOST_FOREACH(const Outline2d &o, poly.outlines()) {
Outline2d o2;
o2.positive = o.positive;
BOOST_REVERSE_FOREACH(const Vector2d &v, o.vertices) {
o2.vertices.push_back(v);
}
poly2->addOutline(o2);
}
} else {
poly2 = new Polygon2d(poly);
}
if (node.angle != 360) {
PolySet *ps_start = poly2->tessellate(); // starting face
PolySet *ps_start = poly.tessellate(); // starting face
Transform3d rot(Eigen::AngleAxisd(M_PI/2, Vector3d::UnitX()));
ps_start->transform(rot);
// Flip vertex ordering
@ -840,7 +834,7 @@ static Geometry *rotatePolygon(const RotateExtrudeNode &node, const Polygon2d &p
ps->append(*ps_start);
delete ps_start;
PolySet *ps_end = poly2->tessellate();
PolySet *ps_end = poly.tessellate();
Transform3d rot2(Eigen::AngleAxisd(node.angle*M_PI/180, Vector3d::UnitZ()) * Eigen::AngleAxisd(M_PI/2, Vector3d::UnitX()));
ps_end->transform(rot2);
if (flip_faces) {
@ -852,19 +846,19 @@ static Geometry *rotatePolygon(const RotateExtrudeNode &node, const Polygon2d &p
delete ps_end;
}
BOOST_FOREACH(const Outline2d &o, poly2->outlines()) {
BOOST_FOREACH(const Outline2d &o, poly.outlines()) {
std::vector<Vector3d> rings[2];
rings[0].resize(o.vertices.size());
rings[1].resize(o.vertices.size());
fill_ring(rings[0], o, M_PI/2); // first ring
fill_ring(rings[0], o, M_PI/2, flip_faces); // first ring
for (int j = 0; j < fragments; j++) {
double a;
if (node.angle == 360)
a = M_PI/2 - ((j+1)%fragments*2*M_PI) / fragments; // start on the X axis
else
a = M_PI/2 - (j+1)*(node.angle*M_PI/180) / fragments; // start on the X axis
fill_ring(rings[(j+1)%2], o, a);
fill_ring(rings[(j+1)%2], o, a, flip_faces);
for (size_t i=0;i<o.vertices.size();i++) {
ps->append_poly();
@ -878,7 +872,6 @@ static Geometry *rotatePolygon(const RotateExtrudeNode &node, const Polygon2d &p
}
}
}
delete poly2;
return ps;
}