diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-12-27 23:49:27 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-12-27 23:49:27 (GMT) |
| commit | f7799a8e4ea0c31bd284dc4cf5e2d23b13029a4c (patch) | |
| tree | 608ae6c2f862db9d60ad3d9310645d8ef4fb319b /transform.cc | |
| parent | 612f04dfdf6378dcae3ca3de4d445ffbe53e1c75 (diff) | |
Clifford Wolf:
Added CGAL Nef Polyhedron 2D/3D abstraction
git-svn-id: http://svn.clifford.at/openscad/trunk@187 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'transform.cc')
| -rw-r--r-- | transform.cc | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/transform.cc b/transform.cc index 51b54dc..ca9fa20 100644 --- a/transform.cc +++ b/transform.cc @@ -190,20 +190,34 @@ CGAL_Nef_polyhedron TransformNode::render_cgal_nef_polyhedron() const return *cgal_nef_cache[cache_id]; } + bool first = true; CGAL_Nef_polyhedron N; + foreach (AbstractNode *v, children) { if (v->modinst->tag_background) continue; - N += v->render_cgal_nef_polyhedron(); + if (first) { + N = v->render_cgal_nef_polyhedron(); + first = false; + } else if (N.dim == 2) { + N.p2 += v->render_cgal_nef_polyhedron().p2; + } else if (N.dim == 3) { + N.p3 += v->render_cgal_nef_polyhedron().p3; + } } - CGAL_Aff_transformation t( - m[0], m[4], m[ 8], m[12], - m[1], m[5], m[ 9], m[13], - m[2], m[6], m[10], m[14], m[15]); - N.transform(t); + if (N.dim == 2) { + // FIXME + } + if (N.dim == 3) { + CGAL_Aff_transformation t( + m[0], m[4], m[ 8], m[12], + m[1], m[5], m[ 9], m[13], + m[2], m[6], m[10], m[14], m[15]); + N.p3.transform(t); + } - cgal_nef_cache.insert(cache_id, new CGAL_Nef_polyhedron(N), N.number_of_vertices()); + cgal_nef_cache.insert(cache_id, new CGAL_Nef_polyhedron(N), N.weight()); progress_report(); return N; } |