GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-04 18:44:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: infill every N layers was consuming large amounts of memory when used with models having sloping walls. #259

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-05-01 18:51:47 +02:00
parent 305b7a9c93
commit d59d4a2c55
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Slic3r/Print/Object.pm
View File

@ -238,6 +238,8 @@ sub discover_horizontal_shells {
Slic3r::debugf "==> DISCOVERING HORIZONTAL SHELLS\n"; Slic3r::debugf "==> DISCOVERING HORIZONTAL SHELLS\n";
my $area_threshold = scale($Slic3r::flow_spacing) ** 2;
for (my $i = 0; $i < $self->layer_count; $i++) { for (my $i = 0; $i < $self->layer_count; $i++) {
my $layer = $self->layers->[$i]; my $layer = $self->layers->[$i];
foreach my $type (qw(top bottom)) { foreach my $type (qw(top bottom)) {
@ -279,6 +281,7 @@ sub discover_horizontal_shells {
my $internal = diff_ex( my $internal = diff_ex(
[ map $_->p, grep $_->surface_type eq 'internal', @neighbor_fill_surfaces ], [ map $_->p, grep $_->surface_type eq 'internal', @neighbor_fill_surfaces ],
[ map @$_, @$internal_solid ], [ map @$_, @$internal_solid ],
1,
); );
Slic3r::debugf " %d internal-solid and %d internal surfaces found\n", Slic3r::debugf " %d internal-solid and %d internal surfaces found\n",
scalar(@$internal_solid), scalar(@$internal); scalar(@$internal_solid), scalar(@$internal);
@ -303,6 +306,7 @@ sub discover_horizontal_shells {
my $solid_surfaces = diff_ex( my $solid_surfaces = diff_ex(
[ map $_->p, @$s ], [ map $_->p, @$s ],
[ map @$_, @$internal_solid, @$internal ], [ map @$_, @$internal_solid, @$internal ],
1,
); );
push @$neighbor_fill_surfaces, Slic3r::Surface->new push @$neighbor_fill_surfaces, Slic3r::Surface->new
(expolygon => $_, surface_type => $s->[0]->surface_type, bridge_angle => $s->[0]->bridge_angle) (expolygon => $_, surface_type => $s->[0]->surface_type, bridge_angle => $s->[0]->bridge_angle)
@ -310,6 +314,8 @@ sub discover_horizontal_shells {
} }
} }
} }
@{$layer->fill_surfaces} = grep $_->expolygon->area > $area_threshold, @{$layer->fill_surfaces};
} }
} }
@ -318,6 +324,8 @@ sub infill_every_layers {
my $self = shift; my $self = shift;
return unless $Slic3r::infill_every_layers > 1 && $Slic3r::fill_density > 0; return unless $Slic3r::infill_every_layers > 1 && $Slic3r::fill_density > 0;
my $area_threshold = scale($Slic3r::flow_spacing) ** 2;
# start from bottom, skip first layer # start from bottom, skip first layer
for (my $i = 1; $i < $self->layer_count; $i++) { for (my $i = 1; $i < $self->layer_count; $i++) {
my $layer = $self->layer($i); my $layer = $self->layer($i);
@ -340,7 +348,11 @@ sub infill_every_layers {
my $intersection = intersection_ex( my $intersection = intersection_ex(
[ map $_->p, grep $_->depth_layers <= $d, @lower_surfaces ], [ map $_->p, grep $_->depth_layers <= $d, @lower_surfaces ],
[ map $_->p, grep $_->surface_type eq 'internal', @{$layer->fill_surfaces} ], [ map $_->p, grep $_->surface_type eq 'internal', @{$layer->fill_surfaces} ],
undef, 1,
); );
# purge intersections, skip tiny regions
@$intersection = grep $_->area > $area_threshold, @$intersection;
next if !@$intersection; next if !@$intersection;
# new fill surfaces of the current layer are: # new fill surfaces of the current layer are:
@ -392,6 +404,8 @@ sub infill_every_layers {
} }
@{$lower_layer->fill_surfaces} = @new_surfaces; @{$lower_layer->fill_surfaces} = @new_surfaces;
} }
} }
} }
} }

2
lib/Slic3r/SVG.pm
View File

@ -14,7 +14,7 @@ sub factor {
sub svg { sub svg {
my ($print) = @_; my ($print) = @_;
$print ||= Slic3r::Print->new(x_length => 200 / $Slic3r::scaling_factor, y_length => 200 / $Slic3r::scaling_factor); $print ||= Slic3r::Print->new(x_length => 200 / $Slic3r::scaling_factor, y_length => 200 / $Slic3r::scaling_factor);
my $svg = SVG->new(width => $print->max_length * factor(), height => $print->max_length * factor()); my $svg = SVG->new(width => 200 * 10, height => 200 * 10);
my $marker_end = $svg->marker( my $marker_end = $svg->marker(
id => "endArrow", id => "endArrow",