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

Skip converting to/from CGAL when importing a single object.

Browse source
This commit is contained in:
Torsten Paul 2016-09-20 00:55:48 +02:00
parent c2cb0572a9
commit cfdbfe13a6
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/import_amf.cc
View file

@ -202,16 +202,20 @@ PolySet *import_amf(const std::string filename) {
PolySet *p;
#ifdef ENABLE_CGAL
Geometry::Geometries children;
for (std::vector<PolySet *>::iterator it = polySets.begin();it != polySets.end();it++) {
children.push_back(std::make_pair((const AbstractNode*)NULL, shared_ptr<const Geometry>(*it)));
}
CGAL_Nef_polyhedron *N = CGALUtils::applyOperator(children, OPENSCAD_UNION);
PolySet *result = new PolySet(3);
if (CGALUtils::createPolySetFromNefPolyhedron3(*N->p3, *result)) {
delete result;
if (polySets.size() == 1) {
p = polySets[0];
} else {
p = result;
Geometry::Geometries children;
for (std::vector<PolySet *>::iterator it = polySets.begin();it != polySets.end();it++) {
children.push_back(std::make_pair((const AbstractNode*)NULL, shared_ptr<const Geometry>(*it)));
}
CGAL_Nef_polyhedron *N = CGALUtils::applyOperator(children, OPENSCAD_UNION);
PolySet *result = new PolySet(3);
if (CGALUtils::createPolySetFromNefPolyhedron3(*N->p3, *result)) {
delete result;
} else {
p = result;
}
}
#else
p = new PolySet(3);