vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bug in polyhedron() primitive keyword 'faces' vs 'triangles'

vector-concat
Don Bright 2013-12-14 22:15:57 -06:00
parent f12237a9c4
commit 60a4561da5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dxftess-cgal.cc
View File

@ -466,8 +466,6 @@ using CGAL's Constrained Delaunay algorithm. This code assumes the input
polyset has simple polygon faces with no holes, no self intersections, and no
duplicate points. */
void tessellate_3d_faces( const PolySet &inps, PolySet &outps ) {
PRINTB("tess 3d %i",inps.polygons.size());
PRINTB("%s < input ps",inps.dump());
for (size_t i = 0; i < inps.polygons.size(); i++) {
const PolySet::Polygon pgon = inps.polygons[i];
if (pgon.size()<3) continue;
@ -482,9 +480,7 @@ void tessellate_3d_faces( const PolySet &inps, PolySet &outps ) {
outps.append_vertex(t[2].x(),t[2].y(),t[2].z());
}
}
PRINTB("tess 3d done %i",outps.polygons.size());
PRINTB("%s < output ps",outps.dump());
}
// End of the Tessellation of PolySet polygons
// End of PolySet face tessellation code

5
src/primitives.cc
View File

@ -235,8 +235,11 @@ AbstractNode *PrimitiveModule::instantiate(const Context *ctx, const ModuleInsta
if (type == POLYHEDRON) {
node->points = c.lookup_variable("points");
node->faces = c.lookup_variable("triangles");
node->faces = c.lookup_variable("faces");
if (node->faces.type() == Value::UNDEFINED) {
// backwards compatable
node->faces = c.lookup_variable("triangles");
}
}
if (type == SQUARE) {