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

Bugfix: PlanePath infills sometimes did not cover the whole area. #863 #1162

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-12-22 00:18:45 +01:00
parent 74f25ef52f
commit 5cd3ef7b8a
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/Slic3r/Fill/PlanePath.pm
View file

@ -9,14 +9,6 @@ use Slic3r::Geometry::Clipper qw(intersection_pl);
sub multiplier () { 1 } sub multiplier () { 1 }
sub get_n {
my $self = shift;
my ($path, $bounding_box) = @_;
my ($n_lo, $n_hi) = $path->rect_to_n_range(@$bounding_box);
return ($n_lo .. $n_hi);
}
sub process_polyline {} sub process_polyline {}
sub fill_surface { sub fill_surface {
@ -32,12 +24,21 @@ sub fill_surface {
my $distance_between_lines = $flow->scaled_spacing / $params{density} * $self->multiplier; my $distance_between_lines = $flow->scaled_spacing / $params{density} * $self->multiplier;
my $bounding_box = $expolygon->bounding_box; my $bounding_box = $expolygon->bounding_box;
# since not all PlanePath infills extend in negative coordinate space,
# move expolygon in positive coordinate space
$expolygon->translate(-$bounding_box->x_min, -$bounding_box->y_min);
(ref $self) =~ /::([^:]+)$/; (ref $self) =~ /::([^:]+)$/;
my $path = "Math::PlanePath::$1"->new; my $path = "Math::PlanePath::$1"->new;
my @n = $self->get_n($path, [ map +($_ / $distance_between_lines), @{$bounding_box->min_point}, @{$bounding_box->max_point} ]);
my ($n_lo, $n_hi) = $path->rect_to_n_range(
map { $_ / $distance_between_lines }
0, 0,
@{$bounding_box->size},
);
my $polyline = Slic3r::Polyline->new( my $polyline = Slic3r::Polyline->new(
map [ map {$_*$distance_between_lines} $path->n_to_xy($_) ], @n, map [ map { $_ * $distance_between_lines } $path->n_to_xy($_) ], ($n_lo..$n_hi)
); );
return {} if @$polyline <= 1; return {} if @$polyline <= 1;
@ -48,12 +49,14 @@ sub fill_surface {
if (0) { if (0) {
require "Slic3r/SVG.pm"; require "Slic3r/SVG.pm";
Slic3r::SVG::output("fill.svg", Slic3r::SVG::output("fill.svg",
polygons => $expolygon, no_arrows => 1,
polylines => [map $_->p, @paths], polygons => \@$expolygon,
polylines => \@paths,
); );
} }
# paths must be rotated back # paths must be repositioned and rotated back
$_->translate($bounding_box->x_min, $bounding_box->y_min) for @paths;
$self->rotate_points_back(\@paths, $rotate_vector); $self->rotate_points_back(\@paths, $rotate_vector);
return { flow => $flow }, @paths; return { flow => $flow }, @paths;