3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 06:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make infill_only_where_needed idempotent. #2198

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-12-24 01:29:36 +01:00
parent 350d634433
commit 5d3cd792eb
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/Slic3r/Print/Object.pm
View file

@ -693,6 +693,8 @@ sub detect_surfaces_type {
} }
} }
# Idempotence of this method is guaranteed by the fact that we don't remove things from
# fill_surfaces but we only turn them into VOID surfaces, thus preserving the boundaries.
sub clip_fill_surfaces { sub clip_fill_surfaces {
my $self = shift; my $self = shift;
return unless $self->config->infill_only_where_needed; return unless $self->config->infill_only_where_needed;
@ -710,13 +712,13 @@ sub clip_fill_surfaces {
# clip this layer's internal surfaces to @overhangs # clip this layer's internal surfaces to @overhangs
foreach my $layerm (@{$layer->regions}) { foreach my $layerm (@{$layer->regions}) {
# we assume that this step is run before bridge_over_infill() and combine_infill()
# so these are the only internal types we might have
my (@internal, @other) = (); my (@internal, @other) = ();
foreach my $surface (map $_->clone, @{$layerm->fill_surfaces}) { foreach my $surface (map $_->clone, @{$layerm->fill_surfaces}) {
$surface->surface_type == S_TYPE_INTERNAL if ($surface->surface_type == S_TYPE_INTERNAL) {
? push @internal, $surface push @internal, $surface;
: push @other, $surface; } else {
push @other, $surface;
}
} }
# keep all the original internal surfaces to detect overhangs in this layer # keep all the original internal surfaces to detect overhangs in this layer
@ -726,10 +728,19 @@ sub clip_fill_surfaces {
expolygon => $_, expolygon => $_,
surface_type => S_TYPE_INTERNAL, surface_type => S_TYPE_INTERNAL,
), ),
@{intersection_ex( @{intersection_ex(
$overhangs, [ map $_->p, @internal ],
[ map $_->p, @internal ], $overhangs,
)}; )};
push @new, map Slic3r::Surface->new(
expolygon => $_,
surface_type => S_TYPE_INTERNALVOID,
),
@{diff_ex(
[ map $_->p, @internal ],
$overhangs,
)};
$layerm->fill_surfaces->clear; $layerm->fill_surfaces->clear;
$layerm->fill_surfaces->append($_) for (@new, @other); $layerm->fill_surfaces->append($_) for (@new, @other);

1
xs/xsp/Surface.xsp
View file

@ -17,6 +17,7 @@
double area(); double area();
bool is_solid() const; bool is_solid() const;
bool is_external() const; bool is_external() const;
bool is_internal() const;
bool is_bottom() const; bool is_bottom() const;
bool is_bridge() const; bool is_bridge() const;
%{ %{