diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-06-23 11:28:35 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-06-23 11:28:35 (GMT) |
| commit | 0fcdcb6bd6117e8e8ccaff15b0a083c2f76266a6 (patch) | |
| tree | 3935db3fda7426d1b7180c8fc15f2069301aee76 /csg.cc | |
| parent | 9271046a02c5e8b62a9ed92e914ab6cf30938fc7 (diff) | |
Clifford Wolf:
Added cylinder primitive
git-svn-id: http://svn.clifford.at/openscad/trunk@12 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'csg.cc')
| -rw-r--r-- | csg.cc | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -25,7 +25,7 @@ enum csg_type_e { UNION, DIFFERENCE, - INTERSECT + INTERSECTION }; class CsgModule : public AbstractModule @@ -68,7 +68,7 @@ CGAL_Nef_polyhedron CsgNode::render_cgal_nef_polyhedron() const N += v->render_cgal_nef_polyhedron(); } else if (type == DIFFERENCE) { N -= v->render_cgal_nef_polyhedron(); - } else if (type == INTERSECT) { + } else if (type == INTERSECTION) { N *= v->render_cgal_nef_polyhedron(); } } @@ -83,8 +83,8 @@ QString CsgNode::dump(QString indent) const text += "union() {\n"; if (type == DIFFERENCE) text += "difference() {\n"; - if (type == INTERSECT) - text += "intersect() {\n"; + if (type == INTERSECTION) + text += "intersection() {\n"; foreach (AbstractNode *v, children) text += v->dump(indent + QString("\t")); return text + indent + "}\n"; @@ -94,6 +94,6 @@ void register_builtin_csg() { builtin_modules["union"] = new CsgModule(UNION); builtin_modules["difference"] = new CsgModule(DIFFERENCE); - builtin_modules["intersect"] = new CsgModule(INTERSECT); + builtin_modules["intersection"] = new CsgModule(INTERSECTION); } |