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

Fill gaps. #281

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-06-07 15:31:51 +02:00
parent 00c6b1bdf8
commit c0c53c4397
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Slic3r/ExPolygon.pm
View File

@ -213,7 +213,7 @@ sub medial_axis {
$pointmap{$_->[A]} >= 2 && $pointmap{$_->[B]} >= 2 $pointmap{$_->[A]} >= 2 && $pointmap{$_->[B]} >= 2
} @skeleton_lines; } @skeleton_lines;
} }
return undef if !@skeleton_lines; return () if !@skeleton_lines;
# now walk along the medial axis and build continuos polylines or polygons # now walk along the medial axis and build continuos polylines or polygons
my @polylines = (); my @polylines = ();

30
lib/Slic3r/Layer.pm
View File

@ -157,7 +157,8 @@ sub make_surfaces {
foreach my $surface (@surfaces) { foreach my $surface (@surfaces) {
push @{$self->slices}, map Slic3r::Surface->new push @{$self->slices}, map Slic3r::Surface->new
(expolygon => $_, surface_type => S_TYPE_INTERNAL), (expolygon => $_, surface_type => S_TYPE_INTERNAL),
$surface->expolygon->offset_ex(-$distance); map $_->offset_ex(+$distance),
$surface->expolygon->offset_ex(-2*$distance);
} }
# now detect thin walls by re-outgrowing offsetted surfaces and subtracting # now detect thin walls by re-outgrowing offsetted surfaces and subtracting
@ -194,6 +195,8 @@ sub make_perimeters {
my $self = shift; my $self = shift;
Slic3r::debugf "Making perimeters for layer %d\n", $self->id; Slic3r::debugf "Making perimeters for layer %d\n", $self->id;
my $gap_area_threshold = scale($self->perimeters_flow->width)** 2;
# this array will hold one arrayref per original surface (island); # this array will hold one arrayref per original surface (island);
# each item of this arrayref is an arrayref representing a depth (from outer # each item of this arrayref is an arrayref representing a depth (from outer
# perimeters to inner); each item of this arrayref is an ExPolygon: # perimeters to inner); each item of this arrayref is an ExPolygon:
@ -234,12 +237,27 @@ sub make_perimeters {
$hole->reverse; $hole->reverse;
} }
my @gaps = ();
# generate perimeters inwards # generate perimeters inwards
my $loop_number = $Slic3r::perimeters + ($surface->additional_inner_perimeters || 0); my $loop_number = $Slic3r::perimeters + ($surface->additional_inner_perimeters || 0);
push @perimeters, []; push @perimeters, [];
for (my $loop = 0; $loop < $loop_number; $loop++) { for (my $loop = 0; $loop < $loop_number; $loop++) {
# offsetting a polygon can result in one or many offset polygons # offsetting a polygon can result in one or many offset polygons
@last_offsets = map $_->offset_ex(-$distance), @last_offsets if $distance; if ($distance) {
my @new_offsets = ();
foreach my $expolygon (@last_offsets) {
my @offsets = map $_->offset_ex(+0.5*$distance), $expolygon->offset_ex(-1.5*$distance);
push @new_offsets, @offsets;
my $diff = diff_ex(
[ map @$_, $expolygon->offset_ex(-$distance) ],
[ map @$_, @offsets ],
);
push @gaps, grep $_->area >= $gap_area_threshold, @$diff;
}
@last_offsets = @new_offsets;
}
last if !@last_offsets; last if !@last_offsets;
push @{ $perimeters[-1] }, [@last_offsets]; push @{ $perimeters[-1] }, [@last_offsets];
@ -254,13 +272,11 @@ sub make_perimeters {
# detect the small gaps that we need to treat like thin polygons, # detect the small gaps that we need to treat like thin polygons,
# thus generating the skeleton and using it to fill them # thus generating the skeleton and using it to fill them
my $small_gaps = diff_ex(
[ map @$_, map $_->offset_ex(-$distance/2), map @$_, @{$perimeters[-1]} ],
[ map @$_, map $_->offset_ex(+$distance/2), @fill_boundaries ],
);
push @{ $self->thin_fills }, push @{ $self->thin_fills },
map $_->medial_axis(scale $self->perimeters_flow->width), map $_->medial_axis(scale $self->perimeters_flow->width),
@$small_gaps if 0; @gaps;
Slic3r::debugf " %d gaps filled\n", scalar @{ $self->thin_fills }
if @{ $self->thin_fills };
} }
} }