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

if angle==360 then use legacy orientation, starting from -x side

Browse source
This commit is contained in:
Hans Loeblich 2015-11-15 04:31:16 -06:00
parent c6bec5eff5
commit 331c4fb63d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/GeometryEvaluator.cc
View file

@ -821,7 +821,7 @@ static Geometry *rotatePolygon(const RotateExtrudeNode &node, const Polygon2d &p
fragments = fmax(Calc::get_fragments_from_r(max_x - min_x, node.fn, node.fs, node.fa) * std::abs(node.angle) / 360, 1);
}
bool flip_faces = (min_x >= 0 && node.angle > 0) || (min_x < 0 && node.angle < 0);
bool flip_faces = (min_x >= 0 && node.angle > 0 && node.angle != 360) || (min_x < 0 && (node.angle < 0 || node.angle == 360));
if (node.angle != 360) {
PolySet *ps_start = poly.tessellate(); // starting face
@ -853,11 +853,11 @@ static Geometry *rotatePolygon(const RotateExtrudeNode &node, const Polygon2d &p
rings[0].resize(o.vertices.size());
rings[1].resize(o.vertices.size());
fill_ring(rings[0], o, M_PI/2, flip_faces); // first ring
fill_ring(rings[0], o, (node.angle == 360) ? -M_PI/2 : 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
a = -M_PI/2 + ((j+1)%fragments*2*M_PI) / fragments; // start on the -X axis, for legacy support
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, flip_faces);