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

Fixed regression causing inefficient paths during infill

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-12-20 18:10:20 +01:00
parent dcc0ce78db
commit bf603b0221
3 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Slic3r/ExtrusionPath/Collection.pm
View File

@ -12,11 +12,15 @@ sub shortest_path {
my $self = shift; my $self = shift;
my ($start_near) = @_; my ($start_near) = @_;
# make sure we pass the same path objects to the Collection constructor
# and the ->shortest_path() method because the latter will reverse the
# paths in-place when needed and we need to return them that way
my @paths = map $_->unpack, @{$self->paths};
my $collection = Slic3r::Polyline::Collection->new( my $collection = Slic3r::Polyline::Collection->new(
polylines => [ map $_->unpack->polyline, @{$self->paths} ], polylines => [ map $_->polyline, @paths ],
); );
return $collection->shortest_path($start_near, $self->paths); return $collection->shortest_path($start_near, \@paths);
} }
sub cleanup { sub cleanup {

10
lib/Slic3r/Polyline.pm
View File

@ -49,6 +49,11 @@ sub boost_linestring {
return Boost::Geometry::Utils::linestring($self); return Boost::Geometry::Utils::linestring($self);
} }
sub wkt {
my $self = shift;
return sprintf "LINESTRING((%s))", join ',', map "$_->[0] $_->[1]", @$self;
}
sub merge_continuous_lines { sub merge_continuous_lines {
my $self = shift; my $self = shift;
polyline_remove_parallel_continuous_edges($self); polyline_remove_parallel_continuous_edges($self);
@ -188,8 +193,9 @@ use Moo;
has 'polylines' => (is => 'ro', default => sub { [] }); has 'polylines' => (is => 'ro', default => sub { [] });
# if the second argument is provided, this method will return its items sorted # If the second argument is provided, this method will return its items sorted
# instead of returning the actual sorted polylines # instead of returning the actual sorted polylines.
# Note that our polylines will be reversed in place when necessary.
sub shortest_path { sub shortest_path {
my $self = shift; my $self = shift;
my ($start_near, $items) = @_; my ($start_near, $items) = @_;

37
t/fill.t
View File

@ -2,7 +2,7 @@ use Test::More;
use strict; use strict;
use warnings; use warnings;
plan tests => 5; plan tests => 8;
BEGIN { BEGIN {
use FindBin; use FindBin;
@ -52,4 +52,39 @@ sub scale_points (@) { map [scale $_->[X], scale $_->[Y]], @_ }
'shortest path'; 'shortest path';
} }
{
my $collection = Slic3r::Polyline::Collection->new(polylines => [
Slic3r::Polyline->new([4,0], [10,0], [15,0]),
Slic3r::Polyline->new([10,5], [15,5], [20,5]),
]);
is_deeply
[ map $_->[X], map @$_, $collection->shortest_path(Slic3r::Point->new(30,0)) ],
[reverse 4, 10, 15, 10, 15, 20],
'shortest path';
}
{
my $collection = Slic3r::ExtrusionPath::Collection->new(paths => [
map Slic3r::ExtrusionPath->pack(polyline => $_, role => 0),
Slic3r::Polyline->new([0,15], [0,18], [0,20]),
Slic3r::Polyline->new([0,10], [0,8], [0,5]),
]);
is_deeply
[ map $_->[Y], map @{$_->unpack->polyline}, $collection->shortest_path(Slic3r::Point->new(0,30)) ],
[20, 18, 15, 10, 8, 5],
'shortest path';
}
{
my $collection = Slic3r::ExtrusionPath::Collection->new(paths => [
map Slic3r::ExtrusionPath->pack(polyline => $_, role => 0),
Slic3r::Polyline->new([15,0], [10,0], [4,0]),
Slic3r::Polyline->new([10,5], [15,5], [20,5]),
]);
is_deeply
[ map $_->[X], map @{$_->unpack->polyline}, $collection->shortest_path(Slic3r::Point->new(30,0)) ],
[reverse 4, 10, 15, 10, 15, 20],
'shortest path';
}
__END__ __END__