|
@@ -16,7 +16,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' => (is => 'rw');
|
|
|
+has '_layer_overhangs_pp' => (is => 'rw');
|
|
|
has 'shift_x' => (is => 'rw', default => sub {0} );
|
|
|
has 'shift_y' => (is => 'rw', default => sub {0} );
|
|
|
has 'z' => (is => 'rw');
|
|
@@ -99,10 +99,10 @@ sub change_layer {
|
|
|
$self->_layer_islands([]);
|
|
|
$self->_upper_layer_islands([]);
|
|
|
}
|
|
|
- $self->_layer_overhangs(
|
|
|
+ $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->clone, grep $_->surface_type == S_TYPE_BOTTOM, map @{$_->slices}, @{$layer->regions} ]
|
|
|
+ ($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} ]
|
|
|
: []
|
|
|
);
|
|
|
if ($self->config->avoid_crossing_perimeters) {
|
|
@@ -180,7 +180,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), @concave;
|
|
|
+ @candidates = grep !Boost::Geometry::Utils::point_covered_by_multi_polygon($_->pp, $self->_layer_overhangs_pp), @concave;
|
|
|
}
|
|
|
if (!@candidates) {
|
|
|
# if none, look for any concave vertex
|
|
@@ -188,7 +188,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), @{$polygon};
|
|
|
+ @candidates = grep !Boost::Geometry::Utils::point_covered_by_multi_polygon($_->pp, $self->_layer_overhangs_pp), @$polygon;
|
|
|
}
|
|
|
if (!@candidates) {
|
|
|
# if none, all points are valid candidates
|
|
@@ -218,15 +218,15 @@ sub extrude_loop {
|
|
|
|
|
|
my @paths = ();
|
|
|
# detect overhanging/bridging perimeters
|
|
|
- if ($self->layer->config->overhangs && $extrusion_path->is_perimeter && @{$self->_layer_overhangs}) {
|
|
|
+ if ($self->layer->config->overhangs && $extrusion_path->is_perimeter && @{$self->_layer_overhangs_pp}) {
|
|
|
# get non-overhang paths by subtracting overhangs from the loop
|
|
|
push @paths,
|
|
|
- $extrusion_path->subtract_expolygons($self->_layer_overhangs);
|
|
|
+ $extrusion_path->subtract_expolygons($self->_layer_overhangs_pp);
|
|
|
|
|
|
# get overhang paths by intersecting overhangs with the loop
|
|
|
push @paths,
|
|
|
map { $_->role(EXTR_ROLE_OVERHANG_PERIMETER); $_ }
|
|
|
- $extrusion_path->intersect_expolygons($self->_layer_overhangs);
|
|
|
+ $extrusion_path->intersect_expolygons($self->_layer_overhangs_pp);
|
|
|
|
|
|
# reapply the nearest point search for starting point
|
|
|
# (clone because the collection gets DESTROY'ed)
|