diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-12-15 14:33:18 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-12-15 14:33:18 (GMT) |
| commit | e6bf94b6ff0fcb918cc42dc26f3627382a50490c (patch) | |
| tree | 8b0a36e9ffa9d9ae393ad87e377590b3a4f4f178 /src | |
| parent | f570b7fd2558d73f8446681be10bc82fa1c283e6 (diff) | |
tab spaces
Diffstat (limited to 'src')
| -rw-r--r-- | src/dxftess-cgal.cc | 20 | ||||
| -rw-r--r-- | src/polyset.h | 1 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc index 9c4e6fe..a2d3cb3 100644 --- a/src/dxftess-cgal.cc +++ b/src/dxftess-cgal.cc @@ -410,11 +410,11 @@ projection_t find_good_projection( PolySet::Polygon pgon ) { NT3 qxz = pl.c()*pl.c()+pl.a()*pl.a(); NT3 min = std::min(qxy,std::min(qyz,qxz)); if (min==qxy) return XYPLANE; - else if (min==qyz) return YZPLANE; - return XZPLANE; + else if (min==qyz) return YZPLANE; + return XZPLANE; } -/* triangulate the given polygon using CGAL's 2d Constrained Delaunay +/* triangulate the given 3d polygon using CGAL's 2d Constrained Delaunay algorithm. Project the polygon's points into 2d using the given projection before performing the triangulation. This code assumes input polygon is simple, no holes, no self-intersections, no duplicate points, and is @@ -449,9 +449,9 @@ bool triangulate_polygon( const PolySet::Polygon &pgon, std::vector<PolySet::Pol list_of_seeds.begin(), list_of_seeds.end(), DummyCriteria<CDT>()); CDT::Finite_faces_iterator fit; - for( fit=cdt.finite_faces_begin(); fit!=cdt.finite_faces_end(); fit++ ) - { - if(fit->is_in_domain()) { + for( fit=cdt.finite_faces_begin(); fit!=cdt.finite_faces_end(); fit++ ) + { + if(fit->is_in_domain()) { CDTPoint p1 = cdt.triangle( fit )[0]; CDTPoint p2 = cdt.triangle( fit )[1]; CDTPoint p3 = cdt.triangle( fit )[2]; @@ -469,9 +469,9 @@ bool triangulate_polygon( const PolySet::Polygon &pgon, std::vector<PolySet::Pol pgon.push_back(v1); } triangles.push_back( pgon ); - } - } - catch (const CGAL::Assertion_exception &e) { + } + } + } catch (const CGAL::Assertion_exception &e) { PRINTB("CGAL error in dxftess triangulate_polygon: %s", e.what()); err = true; } @@ -486,7 +486,7 @@ polyset has simple polygon faces with no holes, no self intersections, no duplicate points, and proper orientation. */ void tessellate_3d_faces( const PolySet &inps, PolySet &outps ) { for (size_t i = 0; i < inps.polygons.size(); i++) { - const PolySet::Polygon pgon = inps.polygons[i]; + const PolySet::Polygon pgon = inps.polygons[i]; if (pgon.size()<3) { PRINT("WARNING: PolySet has polygon with <3 points"); continue; diff --git a/src/polyset.h b/src/polyset.h index 5c97396..2ff817a 100644 --- a/src/polyset.h +++ b/src/polyset.h @@ -26,6 +26,7 @@ public: void append_vertex(double x, double y, double z = 0.0); void insert_vertex(double x, double y, double z = 0.0); size_t memsize() const; + BoundingBox getBoundingBox() const; #define CSGMODE_DIFFERENCE_FLAG 0x10 |