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

Fix error after recent change about bridges

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-07-29 12:15:30 +02:00
parent 1f36406a62
commit 2a2d15e422
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Slic3r/Fill.pm
View file

@ -157,17 +157,13 @@ sub make_fill {
next SURFACE unless $density > 0; next SURFACE unless $density > 0;
} }
my @paths; my $f = $self->filler($filler);
{ $f->layer_id($layerm->id);
my $f = $self->filler($filler); my ($params, @paths) = $f->fill_surface(
$f->layer_id($layerm->id); $surface,
@paths = $f->fill_surface( density => $density,
$surface, flow_spacing => $flow_spacing,
density => $density, );
flow_spacing => $flow_spacing,
);
}
my $params = shift @paths;
# ugly hack(tm) to get the right amount of flow (GCode.pm should be fixed) # ugly hack(tm) to get the right amount of flow (GCode.pm should be fixed)
$params->{flow_spacing} = $layerm->extruders->{infill}->bridge_flow->width if $is_bridge; $params->{flow_spacing} = $layerm->extruders->{infill}->bridge_flow->width if $is_bridge;

3
lib/Slic3r/Layer/Region.pm
View file

@ -531,7 +531,7 @@ sub _detect_bridge_direction {
# detect anchors as intersection between our bridge expolygon and the lower slices # detect anchors as intersection between our bridge expolygon and the lower slices
my $anchors = intersection_ex( my $anchors = intersection_ex(
[ @$expolygon ], [ @$grown ],
[ map @$_, @lower ], [ map @$_, @lower ],
undef, undef,
1, # safety offset required to avoid Clipper from detecting empty intersection while Boost actually found some @edges 1, # safety offset required to avoid Clipper from detecting empty intersection while Boost actually found some @edges
@ -549,6 +549,7 @@ sub _detect_bridge_direction {
# generate lines in this direction # generate lines in this direction
my $bounding_box = Slic3r::Geometry::BoundingBox->new_from_points([ map @$_, map @$_, @$anchors ]); my $bounding_box = Slic3r::Geometry::BoundingBox->new_from_points([ map @$_, map @$_, @$anchors ]);
my @lines = (); my @lines = ();
for (my $x = $bounding_box->x_min; $x <= $bounding_box->x_max; $x += $line_increment) { for (my $x = $bounding_box->x_min; $x <= $bounding_box->x_max; $x += $line_increment) {
push @lines, [ [$x, $bounding_box->y_min], [$x, $bounding_box->y_max] ]; push @lines, [ [$x, $bounding_box->y_min], [$x, $bounding_box->y_max] ];