New logic for connecting honeycomb loops

This commit is contained in:
Alessandro Ranellucci 2013-06-16 13:31:10 +02:00
parent 9ff85898b1
commit 258842b845

View File

@ -6,7 +6,7 @@ extends 'Slic3r::Fill::Base';
has 'cache' => (is => 'rw', default => sub {{}}); has 'cache' => (is => 'rw', default => sub {{}});
use Slic3r::Geometry qw(PI X Y MIN MAX scale scaled_epsilon); use Slic3r::Geometry qw(PI X Y MIN MAX scale scaled_epsilon);
use Slic3r::Geometry::Clipper qw(intersection_ex); use Slic3r::Geometry::Clipper qw(intersection);
sub angles () { [0, PI/3, PI/3*2] } sub angles () { [0, PI/3, PI/3*2] }
@ -77,10 +77,18 @@ sub fill_surface {
$_->rotate(-$rotate_vector->[0][0], $m->{hex_center}) for @polygons; $_->rotate(-$rotate_vector->[0][0], $m->{hex_center}) for @polygons;
} }
my @paths;
if ($params{complete}) {
# we were requested to complete each loop;
# in this case we don't try to make more continuous paths
@paths = map $_->split_at_first_point,
@{intersection($surface->expolygon, \@polygons)};
} else {
# consider polygons as polylines without re-appending the initial point: # consider polygons as polylines without re-appending the initial point:
# this cuts the last segment on purpose, so that the jump to the next # this cuts the last segment on purpose, so that the jump to the next
# path is more straight # path is more straight
my @paths = map Slic3r::Polyline->new($_), @paths = map Slic3r::Polyline->new($_),
@{ Boost::Geometry::Utils::polygon_multi_linestring_intersection( @{ Boost::Geometry::Utils::polygon_multi_linestring_intersection(
$surface->expolygon, $surface->expolygon,
\@polygons, \@polygons,
@ -110,6 +118,7 @@ sub fill_surface {
[ $surface->expolygon->offset_ex(scaled_epsilon) ], [ $surface->expolygon->offset_ex(scaled_epsilon) ],
[ @paths ], [ @paths ],
) }; ) };
}
return { flow_spacing => $params{flow_spacing} }, @paths; return { flow_spacing => $params{flow_spacing} }, @paths;
} }