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

Minor cleanup of the init_external_mp() call

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-01-06 15:04:09 +01:00
parent 2562070232
commit f0de57cbe4
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/Slic3r/Print/GCode.pm
View file

@ -121,23 +121,30 @@ sub export {
# initialize a motion planner for object-to-object travel moves # initialize a motion planner for object-to-object travel moves
if ($self->config->avoid_crossing_perimeters) { if ($self->config->avoid_crossing_perimeters) {
my $distance_from_objects = 1; my $distance_from_objects = scale 1;
# compute the offsetted convex hull for each object and repeat it for each copy. # compute the offsetted convex hull for each object and repeat it for each copy.
my @islands = (); my @islands_p = ();
foreach my $obj_idx (0 .. ($self->print->object_count - 1)) { foreach my $object (@{$self->objects}) {
# compute the convex hull of the entire object
my $convex_hull = convex_hull([ my $convex_hull = convex_hull([
map @{$_->contour}, map @{$_->slices}, @{$self->objects->[$obj_idx]->layers}, map @{$_->contour}, map @{$_->slices}, @{$object->layers},
]); ]);
# discard layers only containing thin walls (offset would fail on an empty polygon)
if (@$convex_hull) { # discard objects only containing thin walls (offset would fail on an empty polygon)
my $expolygon = Slic3r::ExPolygon->new($convex_hull); next if !@$convex_hull;
my @island = @{$expolygon->offset_ex(scale $distance_from_objects, 1, JT_SQUARE)};
foreach my $copy (@{ $self->objects->[$obj_idx]->_shifted_copies }) { # grow convex hull by the wanted clearance
push @islands, map { my $c = $_->clone; $c->translate(@$copy); $c } @island; my @obj_islands_p = @{offset([$convex_hull], $distance_from_objects, 1, JT_SQUARE)};
}
# translate convex hull for each object copy and append it to the islands array
foreach my $copy (@{ $object->_shifted_copies }) {
my @copy_islands_p = map $_->clone, @obj_islands_p;
$_->translate(@$copy) for @copy_islands_p;
push @islands_p, @copy_islands_p;
} }
} }
$gcodegen->avoid_crossing_perimeters->init_external_mp(union_ex([ map @$_, @islands ])); $gcodegen->avoid_crossing_perimeters->init_external_mp(union_ex(\@islands_p));
} }
# calculate wiping points if needed # calculate wiping points if needed