3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ported intersect_expolygons() and subtract_expolygons() to XS

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-11-21 17:53:50 +01:00
parent 5f81292f3f
commit 761f261a68
11 changed files with 95 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Slic3r/ExtrusionPath.pm
View File

@ -27,22 +27,6 @@ sub clip_with_expolygon {
$self->polyline->clip_with_expolygon($expolygon);
}
sub intersect_expolygons {
my $self = shift;
my ($expolygons_pp) = @_;
return map $self->clone(polyline => Slic3r::Polyline->new(@$_)),
@{Boost::Geometry::Utils::multi_polygon_multi_linestring_intersection($expolygons_pp, [$self->pp])};
}
sub subtract_expolygons {
my $self = shift;
my ($expolygons_pp) = @_;
return map $self->clone(polyline => Slic3r::Polyline->new(@$_)),
@{Boost::Geometry::Utils::multi_linestring_multi_polygon_difference([$self->pp], $expolygons_pp)};
}
sub simplify {
my $self = shift;
$self->polyline($self->polyline->simplify(@_));

25
lib/Slic3r/GCode.pm
View File

@ -17,7 +17,7 @@ has 'layer_count' => (is => 'ro', required => 1 );
has 'layer' => (is => 'rw');
has '_layer_islands' => (is => 'rw');
has '_upper_layer_islands' => (is => 'rw');
has '_layer_overhangs_pp' => (is => 'rw');
has '_layer_overhangs' => (is => 'ro', default => sub { Slic3r::ExPolygon::Collection->new });
has 'shift_x' => (is => 'rw', default => sub {0} );
has 'shift_y' => (is => 'rw', default => sub {0} );
has 'z' => (is => 'rw');
@ -95,12 +95,13 @@ sub change_layer {
# avoid computing islands and overhangs if they're not needed
$self->_layer_islands($layer->islands);
$self->_upper_layer_islands($layer->upper_layer ? $layer->upper_layer->islands : []);
$self->_layer_overhangs_pp(
# clone ExPolygons because they come from Surface objects but will be used outside here
($layer->id > 0 && ($layer->config->overhangs || $Slic3r::Config->start_perimeters_at_non_overhang))
? [ map $_->expolygon->pp, grep $_->surface_type == S_TYPE_BOTTOM, map @{$_->slices}, @{$layer->regions} ]
: []
$self->_layer_overhangs->clear;
if ($layer->id > 0 && ($layer->config->overhangs || $Slic3r::Config->start_perimeters_at_non_overhang)) {
$self->_layer_overhangs->append(
# clone ExPolygons because they come from Surface objects but will be used outside here
map $_->expolygon, map @{$_->slices->filter_by_type(S_TYPE_BOTTOM)}, @{$layer->regions}
);
}
if ($self->config->avoid_crossing_perimeters) {
$self->layer_mp(Slic3r::GCode::MotionPlanner->new(
islands => union_ex([ map @$_, @{$layer->slices} ], 1),
@ -176,7 +177,7 @@ sub extrude_loop {
}
my @candidates = ();
if ($Slic3r::Config->start_perimeters_at_non_overhang) {
@candidates = grep !Boost::Geometry::Utils::point_covered_by_multi_polygon($_->pp, $self->_layer_overhangs_pp), @concave;
@candidates = grep !$self->_layer_overhangs->contains_point($_), @concave;
}
if (!@candidates) {
# if none, look for any concave vertex
@ -184,7 +185,7 @@ sub extrude_loop {
if (!@candidates) {
# if none, look for any non-overhang vertex
if ($Slic3r::Config->start_perimeters_at_non_overhang) {
@candidates = grep !Boost::Geometry::Utils::point_covered_by_multi_polygon($_->pp, $self->_layer_overhangs_pp), @$polygon;
@candidates = grep !$self->_layer_overhangs->contains_point($_), @$polygon;
}
if (!@candidates) {
# if none, all points are valid candidates
@ -214,10 +215,11 @@ sub extrude_loop {
my @paths = ();
# detect overhanging/bridging perimeters
if ($self->layer->config->overhangs && $extrusion_path->is_perimeter && @{$self->_layer_overhangs_pp}) {
if ($self->layer->config->overhangs && $extrusion_path->is_perimeter && $self->_layer_overhangs->count > 0) {
# get non-overhang paths by subtracting overhangs from the loop
push @paths,
$extrusion_path->subtract_expolygons($self->_layer_overhangs_pp);
map $_->clone,
@{$extrusion_path->subtract_expolygons($self->_layer_overhangs)};
# get overhang paths by intersecting overhangs with the loop
push @paths,
@ -226,7 +228,8 @@ sub extrude_loop {
$_->flow_spacing($self->extruder->bridge_flow->width);
$_
}
$extrusion_path->intersect_expolygons($self->_layer_overhangs_pp);
map $_->clone,
@{$extrusion_path->intersect_expolygons($self->_layer_overhangs)};
# reapply the nearest point search for starting point
# (clone because the collection gets DESTROY'ed)

21
xs/src/ExPolygonCollection.cpp
View File

@ -2,6 +2,18 @@
namespace Slic3r {
ExPolygonCollection::operator Polygons() const
{
Polygons polygons;
for (ExPolygons::const_iterator it = this->expolygons.begin(); it != this->expolygons.end(); ++it) {
polygons.push_back(it->contour);
for (Polygons::const_iterator ith = it->holes.begin(); ith != it->holes.end(); ++ith) {
polygons.push_back(*ith);
}
}
return polygons;
}
void
ExPolygonCollection::scale(double factor)
{
@ -26,4 +38,13 @@ ExPolygonCollection::rotate(double angle, Point* center)
}
}
bool
ExPolygonCollection::contains_point(const Point* point) const
{
for (ExPolygons::const_iterator it = this->expolygons.begin(); it != this->expolygons.end(); ++it) {
if (it->contains_point(point)) return true;
}
return false;
}
}

2
xs/src/ExPolygonCollection.hpp
View File

@ -10,9 +10,11 @@ class ExPolygonCollection
{
public:
ExPolygons expolygons;
operator Polygons() const;
void scale(double factor);
void translate(double x, double y);
void rotate(double angle, Point* center);
bool contains_point(const Point* point) const;
};
}

33
xs/src/ExtrusionEntity.cpp
View File

@ -1,4 +1,7 @@
#include "ExtrusionEntity.hpp"
#include "ExtrusionEntityCollection.hpp"
#include "ExPolygonCollection.hpp"
#include "ClipperUtils.hpp"
namespace Slic3r {
@ -26,6 +29,36 @@ ExtrusionPath::last_point() const
return new Point(this->polyline.points.back());
}
ExtrusionEntityCollection*
ExtrusionPath::intersect_expolygons(ExPolygonCollection* collection) const
{
// perform clipping
Polylines clipped;
intersection(this->polyline, *collection, clipped);
return this->_inflate_collection(clipped);
}
ExtrusionEntityCollection*
ExtrusionPath::subtract_expolygons(ExPolygonCollection* collection) const
{
// perform clipping
Polylines clipped;
diff(this->polyline, *collection, clipped);
return this->_inflate_collection(clipped);
}
ExtrusionEntityCollection*
ExtrusionPath::_inflate_collection(const Polylines &polylines) 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);
}
return retval;
}
ExtrusionLoop*
ExtrusionLoop::clone() const
{

7
xs/src/ExtrusionEntity.hpp
View File

@ -7,6 +7,9 @@
namespace Slic3r {
class ExPolygonCollection;
class ExtrusionEntityCollection;
enum ExtrusionRole {
erPerimeter,
erExternalPerimeter,
@ -45,6 +48,10 @@ 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;
private:
ExtrusionEntityCollection* _inflate_collection(const Polylines &polylines) const;
};
class ExtrusionLoop : public ExtrusionEntity

8
xs/src/Polyline.cpp
View File

@ -1,7 +1,15 @@
#include "Polyline.hpp"
#include "Polygon.hpp"
namespace Slic3r {
Polyline::operator Polylines() const
{
Polylines polylines(1);
polylines.push_back(*this);
return polylines;
}
Point*
Polyline::last_point() const
{

6
xs/src/Polyline.hpp
View File

@ -6,8 +6,12 @@
namespace Slic3r {
class Polyline;
typedef std::vector<Polyline> Polylines;
class Polyline : public MultiPoint {
public:
operator Polylines() const;
Point* last_point() const;
Lines lines() const;
void clip_end(double distance);
@ -20,8 +24,6 @@ class Polyline : public MultiPoint {
#endif
};
typedef std::vector<Polyline> Polylines;
}
#endif

1
xs/xsp/ExPolygonCollection.xsp
View File

@ -16,6 +16,7 @@
void rotate(double angle, Point* center);
int count()
%code{% RETVAL = THIS->expolygons.size(); %};
bool contains_point(Point* point);
%{
ExPolygonCollection*

4
xs/xsp/ExtrusionPath.xsp
View File

@ -20,6 +20,10 @@
%code{% const char* CLASS = "Slic3r::Point"; RETVAL = THIS->first_point(); %};
Point* last_point()
%code{% const char* CLASS = "Slic3r::Point"; RETVAL = THIS->last_point(); %};
ExtrusionEntityCollection* intersect_expolygons(ExPolygonCollection* collection)
%code{% const char* CLASS = "Slic3r::ExtrusionPath::Collection"; RETVAL = THIS->intersect_expolygons(collection); %};
ExtrusionEntityCollection* subtract_expolygons(ExPolygonCollection* collection)
%code{% const char* CLASS = "Slic3r::ExtrusionPath::Collection"; RETVAL = THIS->subtract_expolygons(collection); %};
%{
ExtrusionPath*

1
xs/xsp/typemap.xspt
View File

@ -7,6 +7,7 @@
%typemap{AV*};
%typemap{Point*};
%typemap{ExPolygon*};
%typemap{ExPolygonCollection*};
%typemap{Line*};
%typemap{Polyline*};
%typemap{Polygon*};