3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 00:01:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Include thin walls in general top-level perimeter sorting to get more efficient paths

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-03-09 20:19:30 +01:00
parent 2a73ab988f
commit 7f5442265e
11 changed files with 130 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

24
xs/src/ExtrusionEntity.cpp
View file

@ -54,22 +54,22 @@ ExtrusionPath::last_point() const
return new Point(this->polyline.points.back());
}
ExtrusionEntityCollection*
ExtrusionPath::intersect_expolygons(ExPolygonCollection* collection) const
void
ExtrusionPath::intersect_expolygons(const ExPolygonCollection &collection, ExtrusionEntityCollection* retval) const
{
// perform clipping
Polylines clipped;
intersection(this->polyline, *collection, clipped);
return this->_inflate_collection(clipped);
intersection(this->polyline, collection, clipped);
return this->_inflate_collection(clipped, retval);
}
ExtrusionEntityCollection*
ExtrusionPath::subtract_expolygons(ExPolygonCollection* collection) const
void
ExtrusionPath::subtract_expolygons(const ExPolygonCollection &collection, ExtrusionEntityCollection* retval) const
{
// perform clipping
Polylines clipped;
diff(this->polyline, *collection, clipped);
return this->_inflate_collection(clipped);
diff(this->polyline, collection, clipped);
return this->_inflate_collection(clipped, retval);
}
void
@ -90,16 +90,14 @@ ExtrusionPath::length() const
return this->polyline.length();
}
ExtrusionEntityCollection*
ExtrusionPath::_inflate_collection(const Polylines &polylines) const
void
ExtrusionPath::_inflate_collection(const Polylines &polylines, ExtrusionEntityCollection* collection) const
{
ExtrusionEntityCollection* retval = new ExtrusionEntityCollection();
for (Polylines::const_iterator it = polylines.begin(); it != polylines.end(); ++it) {
ExtrusionPath* path = this->clone();
path->polyline = *it;
retval->entities.push_back(path);
collection->entities.push_back(path);
}
return retval;
}
ExtrusionLoop*

6
xs/src/ExtrusionEntity.hpp
View file

@ -50,13 +50,13 @@ class ExtrusionPath : public ExtrusionEntity
void reverse();
Point* first_point() const;
Point* last_point() const;
ExtrusionEntityCollection* intersect_expolygons(ExPolygonCollection* collection) const;
ExtrusionEntityCollection* subtract_expolygons(ExPolygonCollection* collection) const;
void intersect_expolygons(const ExPolygonCollection &collection, ExtrusionEntityCollection* retval) const;
void subtract_expolygons(const ExPolygonCollection &collection, ExtrusionEntityCollection* retval) const;
void clip_end(double distance);
void simplify(double tolerance);
double length() const;
private:
ExtrusionEntityCollection* _inflate_collection(const Polylines &polylines) const;
void _inflate_collection(const Polylines &polylines, ExtrusionEntityCollection* collection) const;
};
class ExtrusionLoop : public ExtrusionEntity

3
xs/src/ExtrusionEntityCollection.cpp
View file

@ -47,6 +47,8 @@ ExtrusionEntityCollection::chained_path_from(Point* start_near, bool no_reverse)
{
if (this->no_sort) return this->clone();
ExtrusionEntityCollection* retval = new ExtrusionEntityCollection;
retval->entities.reserve(this->entities.size());
retval->orig_indices.reserve(this->entities.size());
ExtrusionEntitiesPtr my_paths;
for (ExtrusionEntitiesPtr::const_iterator it = this->entities.begin(); it != this->entities.end(); ++it) {
@ -71,6 +73,7 @@ ExtrusionEntityCollection::chained_path_from(Point* start_near, bool no_reverse)
my_paths.at(path_index)->reverse();
}
retval->entities.push_back(my_paths.at(path_index));
retval->orig_indices.push_back(path_index);
my_paths.erase(my_paths.begin() + path_index);
endpoints.erase(endpoints.begin() + 2*path_index, endpoints.begin() + 2*path_index + 2);
start_near = retval->entities.back()->last_point();

1
xs/src/ExtrusionEntityCollection.hpp
View file

@ -11,6 +11,7 @@ class ExtrusionEntityCollection : public ExtrusionEntity
public:
ExtrusionEntityCollection* clone() const;
ExtrusionEntitiesPtr entities;
std::vector<int> orig_indices;
bool no_sort;
ExtrusionEntityCollection(): no_sort(false) {};
ExtrusionEntityCollection* chained_path(bool no_reverse) const;