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

Merge branch 'acp-voronoi'

Browse source 
Conflicts:
	xs/xsp/my.map
This commit is contained in:
Alessandro Ranellucci 2014-07-26 22:38:35 +02:00
commit 3ff613d166
18 changed files with 509 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Slic3r/GCode.pm
View file

@ -75,8 +75,8 @@ sub change_layer {
$self->_layer_islands($layer->islands);
$self->_upper_layer_islands($layer->upper_layer ? $layer->upper_layer->islands : []);
if ($self->config->avoid_crossing_perimeters) {
$self->layer_mp(Slic3r::GCode::MotionPlanner->new(
islands => union_ex([ map @$_, @{$layer->slices} ], 1),
$self->layer_mp(Slic3r::MotionPlanner->new(
union_ex([ map @$_, @{$layer->slices} ], 1),
));
}

5
lib/Slic3r/Model.pm
View file

@ -158,11 +158,6 @@ sub _arrange {
);
}
sub has_objects_with_no_instances {
my ($self) = @_;
return (first { !defined $_->instances } @{$self->objects}) ? 1 : 0;
}
# makes sure all objects have at least one instance
sub add_default_instances {
my ($self) = @_;

5
lib/Slic3r/Print.pm
View file

@ -883,10 +883,7 @@ sub write_gcode {
}
}
}
$gcodegen->external_mp(Slic3r::GCode::MotionPlanner->new(
islands => union_ex([ map @$_, @islands ]),
internal => 0,
));
$gcodegen->external_mp(Slic3r::MotionPlanner->new(union_ex([ map @$_, @islands ])));
}
# calculate wiping points if needed