3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 07:34:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Turn ExtrusionLoop into a collection of polylines. Includes some changes to the Polygon API to avoid returning newly allocatd objects

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-05-07 12:02:09 +02:00
parent c72dc13d7e
commit d2d885fc53
11 changed files with 107 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

59
xs/src/ExtrusionEntity.cpp
View file

@ -157,56 +157,85 @@ ExtrusionPath::gcode(Extruder* extruder, double e, double F,
}
#endif
ExtrusionLoop::ExtrusionLoop(const Polygon &polygon, ExtrusionRole role)
{
this->role = role;
this->set_polygon(polygon);
}
ExtrusionLoop*
ExtrusionLoop::clone() const
{
return new ExtrusionLoop (*this);
}
ExtrusionPath*
ExtrusionLoop::split_at_index(int index) const
void
ExtrusionLoop::split_at_index(int index, ExtrusionPath* path) const
{
Polyline* poly = this->polygon.split_at_index(index);
Polygon polygon;
this->polygon(&polygon);
polygon.split_at_index(index, &path->polyline);
ExtrusionPath* path = new ExtrusionPath();
path->polyline = *poly;
path->role = this->role;
path->mm3_per_mm = this->mm3_per_mm;
path->width = this->width;
path->height = this->height;
delete poly;
return path;
}
ExtrusionPath*
ExtrusionLoop::split_at_first_point() const
void
ExtrusionLoop::split_at_first_point(ExtrusionPath* path) const
{
return this->split_at_index(0);
return this->split_at_index(0, path);
}
bool
ExtrusionLoop::make_counter_clockwise()
{
return this->polygon.make_counter_clockwise();
Polygon polygon;
this->polygon(&polygon);
bool was_cw = polygon.is_clockwise();
if (was_cw) this->reverse();
return was_cw;
}
void
ExtrusionLoop::reverse()
{
// no-op
for (Polylines::iterator polyline = this->polylines.begin(); polyline != this->polylines.end(); ++polyline)
polyline->reverse();
std::reverse(this->polylines.begin(), this->polylines.end());
}
Point
ExtrusionLoop::first_point() const
{
return this->polygon.points.front();
return this->polylines.front().points.front();
}
Point
ExtrusionLoop::last_point() const
{
return this->polygon.points.front(); // in polygons, first == last
return this->polylines.back().points.back(); // which coincides with first_point(), by the way
}
void
ExtrusionLoop::set_polygon(const Polygon &polygon)
{
Polyline polyline;
polygon.split_at_first_point(&polyline);
this->polylines.clear();
this->polylines.push_back(polyline);
}
void
ExtrusionLoop::polygon(Polygon* polygon) const
{
for (Polylines::const_iterator polyline = this->polylines.begin(); polyline != this->polylines.end(); ++polyline) {
// for each polyline, append all points except the last one (because it coincides with the first one of the next polyline)
polygon->points.insert(polygon->points.end(), polyline->points.begin(), polyline->points.end()-1);
}
}
#ifdef SLIC3RXS