vitalif
/
Slic3r
mirror of https://github.com/vitalif/Slic3r
1
0
Fork 0
Code Issues Releases Wiki Activity

Always do one island at time instead of doing that only when avoid_crossing_perimeters is enabled. #1907

visilibity
Alessandro Ranellucci 2014-04-19 11:57:01 +02:00
parent f51921a11a
commit 1e5dcd8154
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/Slic3r/GCode/Layer.pm
View File

@ -145,45 +145,39 @@ sub process_layer {
my $region = $self->print->regions->[$region_id]; my $region = $self->print->regions->[$region_id];
$self->gcodegen->region($region); $self->gcodegen->region($region);
my @islands = (); # group extrusions by island
if ($self->print->config->avoid_crossing_perimeters) { my @perimeters_by_island = map [], 0..$#{$layer->slices}; # slice idx => @perimeters
push @islands, { perimeters => [], fills => [] } my @infill_by_island = map [], 0..$#{$layer->slices}; # slice idx => @fills
for 1 .. (@{$layer->slices} || 1); # make sure we have at least one island hash to avoid failure of the -1 subscript below
PERIMETER: foreach my $perimeter (@{$layerm->perimeters}) { PERIMETER: foreach my $perimeter (@{$layerm->perimeters}) {
for my $i (0 .. $#{$layer->slices}-1) { for my $i (0 .. $#{$layer->slices}-1) {
if ($layer->slices->[$i]->contour->contains_point($perimeter->first_point)) { if ($layer->slices->[$i]->contour->contains_point($perimeter->first_point)) {
push @{ $islands[$i]{perimeters} }, $perimeter; push @{ $perimeters_by_island[$i] }, $perimeter;
next PERIMETER; next PERIMETER;
}
} }
push @{ $islands[-1]{perimeters} }, $perimeter; # optimization
} }
FILL: foreach my $fill (@{$layerm->fills}) { push @{ $perimeters_by_island[-1] }, $perimeter; # optimization
for my $i (0 .. $#{$layer->slices}-1) { }
if ($layer->slices->[$i]->contour->contains_point($fill->first_point)) { FILL: foreach my $fill (@{$layerm->fills}) {
push @{ $islands[$i]{fills} }, $fill; for my $i (0 .. $#{$layer->slices}-1) {
next FILL; if ($layer->slices->[$i]->contour->contains_point($fill->first_point)) {
} push @{ $infill_by_island[$i] }, $fill;
next FILL;
} }
push @{ $islands[-1]{fills} }, $fill; # optimization
} }
} else { push @{ $infill_by_island[-1] }, $fill; # optimization
push @islands, {
perimeters => $layerm->perimeters,
fills => $layerm->fills,
};
} }
foreach my $island (@islands) { for my $i (0 .. $#{$layer->slices}) {
# give priority to infill if we were already using its extruder and it wouldn't # give priority to infill if we were already using its extruder and it wouldn't
# be good for perimeters # be good for perimeters
if ($self->print->config->infill_first if ($self->print->config->infill_first
|| ($self->gcodegen->multiple_extruders && $region->config->infill_extruder-1 == $self->gcodegen->extruder->id && $region->config->infill_extruder != $region->config->perimeter_extruder)) { || ($self->gcodegen->multiple_extruders && $region->config->infill_extruder-1 == $self->gcodegen->extruder->id && $region->config->infill_extruder != $region->config->perimeter_extruder)) {
$gcode .= $self->_extrude_infill($island, $region); $gcode .= $self->_extrude_infill($infill_by_island[$i], $region);
$gcode .= $self->_extrude_perimeters($island, $region); $gcode .= $self->_extrude_perimeters($perimeters_by_island[$i], $region);
} else { } else {
$gcode .= $self->_extrude_perimeters($island, $region); $gcode .= $self->_extrude_perimeters($perimeters_by_island[$i], $region);
$gcode .= $self->_extrude_infill($island, $region); $gcode .= $self->_extrude_infill($infill_by_island[$i], $region);
} }
} }
} }
@ -208,25 +202,25 @@ sub process_layer {
sub _extrude_perimeters { sub _extrude_perimeters {
my $self = shift; my $self = shift;
my ($island, $region) = @_; my ($island_perimeters, $region) = @_;
return "" if !@{ $island->{perimeters} }; return "" if !@$island_perimeters;
my $gcode = ""; my $gcode = "";
$gcode .= $self->gcodegen->set_extruder($region->config->perimeter_extruder-1); $gcode .= $self->gcodegen->set_extruder($region->config->perimeter_extruder-1);
$gcode .= $self->gcodegen->extrude($_, 'perimeter') for @{ $island->{perimeters} }; $gcode .= $self->gcodegen->extrude($_, 'perimeter') for @$island_perimeters;
return $gcode; return $gcode;
} }
sub _extrude_infill { sub _extrude_infill {
my $self = shift; my $self = shift;
my ($island, $region) = @_; my ($island_fills, $region) = @_;
return "" if !@{ $island->{fills} }; return "" if !@$island_fills;
my $gcode = ""; my $gcode = "";
$gcode .= $self->gcodegen->set_extruder($region->config->infill_extruder-1); $gcode .= $self->gcodegen->set_extruder($region->config->infill_extruder-1);
for my $fill (@{ $island->{fills} }) { for my $fill (@$island_fills) {
if ($fill->isa('Slic3r::ExtrusionPath::Collection')) { if ($fill->isa('Slic3r::ExtrusionPath::Collection')) {
$gcode .= $self->gcodegen->extrude($_, 'fill') $gcode .= $self->gcodegen->extrude($_, 'fill')
for @{$fill->chained_path_from($self->gcodegen->last_pos, 0)}; for @{$fill->chained_path_from($self->gcodegen->last_pos, 0)};