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

Enable retraction for support material too, but only when moving away from support islands. #831

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-12-20 18:47:40 +01:00
parent bf603b0221
commit d5537e7797
3 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -626,39 +626,40 @@ sub generate_support_material {
};
return @paths;
};
my %layer_paths = ();
my %layer_interface_paths = ();
my %layer_paths = ();
my %layer_interface_paths = ();
my %layer_islands = ();
my $process_layer = sub {
my ($layer_id) = @_;
my $layer = $self->layers->[$layer_id];
my $paths = [ $clip_pattern->($layer_id, $layers{$layer_id}, $layer->height) ];
my $interface_paths = [ $clip_pattern->($layer_id, $layers_interfaces{$layer_id}, $layer->support_material_interface_height) ];
return ($paths, $interface_paths);
my $islands = union_ex([ map @$_, map @$_, $layers{$layer_id}, $layers_interfaces{$layer_id} ]);
return ($paths, $interface_paths, $islands);
};
Slic3r::parallelize(
items => [ keys %layers ],
thread_cb => sub {
my $q = shift;
my $paths = {};
my $interface_paths = {};
my $result = {};
while (defined (my $layer_id = $q->dequeue)) {
($paths->{$layer_id}, $interface_paths->{$layer_id}) = $process_layer->($layer_id);
$result->{$layer_id} = [ $process_layer->($layer_id) ];
}
return [ $paths, $interface_paths ];
return $result;
},
collect_cb => sub {
my $paths = shift;
$layer_paths{$_} = $paths->[0]{$_} for keys %{$paths->[0]};
$layer_interface_paths{$_} = $paths->[1]{$_} for keys %{$paths->[1]};
my $result = shift;
($layer_paths{$_}, $layer_interface_paths{$_}, $layer_islands{$_}) = @{$result->{$_}} for keys %$result;
},
no_threads_cb => sub {
($layer_paths{$_}, $layer_interface_paths{$_}) = $process_layer->($_) for keys %layers;
($layer_paths{$_}, $layer_interface_paths{$_}, $layer_islands{$_}) = $process_layer->($_) for keys %layers;
},
);
foreach my $layer_id (keys %layer_paths) {
my $layer = $self->layers->[$layer_id];
$layer->support_islands($layer_islands{$layer_id});
$layer->support_fills(Slic3r::ExtrusionPath::Collection->new);
$layer->support_interface_fills(Slic3r::ExtrusionPath::Collection->new);
push @{$layer->support_fills->paths}, @{$layer_paths{$layer_id}};