3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 20:51:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix numerical issues causing incomplete raft under certain circumstances. Includes a minor refactoring of raft layer logic. #2723

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-06-02 19:44:29 +02:00
parent 854be6a186
commit ee66392e11
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,9 @@ sub slice {
$self->clear_layers; $self->clear_layers;
# make layers taking custom heights into account # make layers taking custom heights into account
my $print_z = my $slice_z = my $height = my $id = 0; my $id = 0;
my $first_object_layer_height = -1; my $print_z = 0;
my $first_object_layer_height = -1;
my $first_object_layer_distance = -1; my $first_object_layer_distance = -1;
# add raft layers # add raft layers
@ -63,8 +64,8 @@ sub slice {
{ {
my @nozzle_diameters = ( my @nozzle_diameters = (
map $self->print->config->get_at('nozzle_diameter', $_), map $self->print->config->get_at('nozzle_diameter', $_),
$self->config->support_material_extruder, $self->config->support_material_extruder-1,
$self->config->support_material_interface_extruder, $self->config->support_material_interface_extruder-1,
); );
$support_material_layer_height = 0.75 * min(@nozzle_diameters); $support_material_layer_height = 0.75 * min(@nozzle_diameters);
} }
@ -78,20 +79,17 @@ sub slice {
); );
$nozzle_diameter = sum(@nozzle_diameters)/@nozzle_diameters; $nozzle_diameter = sum(@nozzle_diameters)/@nozzle_diameters;
} }
my $distance = $self->_support_material->contact_distance($self->config->layer_height, $nozzle_diameter); $first_object_layer_distance = $self->_support_material->contact_distance($self->config->layer_height, $nozzle_diameter);
# force first layer print_z according to the contact distance # force first layer print_z according to the contact distance
# (the loop below will raise print_z by such height) # (the loop below will raise print_z by such height)
if ($self->config->support_material_contact_distance == 0) { $first_object_layer_height = $first_object_layer_distance - $self->config->support_material_contact_distance;
$first_object_layer_height = $distance;
} else {
$first_object_layer_height = $nozzle_diameter;
}
$first_object_layer_distance = $distance;
} }
# loop until we have at least one layer and the max slice_z reaches the object height # loop until we have at least one layer and the max slice_z reaches the object height
my $max_z = unscale($self->size->z); my $slice_z = 0;
my $height = 0;
my $max_z = unscale($self->size->z);
while (($slice_z - $height) <= $max_z) { while (($slice_z - $height) <= $max_z) {
# assign the default height to the layer according to the general settings # assign the default height to the layer according to the general settings
$height = ($id == 0) $height = ($id == 0)

4
lib/Slic3r/Print/SupportMaterial.pm
View file

@ -4,7 +4,7 @@ use Moo;
use List::Util qw(sum min max); use List::Util qw(sum min max);
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Flow ':roles'; use Slic3r::Flow ':roles';
use Slic3r::Geometry qw(scale scaled_epsilon PI rad2deg deg2rad convex_hull); use Slic3r::Geometry qw(epsilon scale scaled_epsilon PI rad2deg deg2rad convex_hull);
use Slic3r::Geometry::Clipper qw(offset diff union union_ex intersection offset_ex offset2 use Slic3r::Geometry::Clipper qw(offset diff union union_ex intersection offset_ex offset2
intersection_pl offset2_ex diff_pl); intersection_pl offset2_ex diff_pl);
use Slic3r::Surface ':types'; use Slic3r::Surface ':types';
@ -273,7 +273,7 @@ sub contact_area {
my $contact_z = $layer->print_z - $self->contact_distance($layer->height, $nozzle_diameter); my $contact_z = $layer->print_z - $self->contact_distance($layer->height, $nozzle_diameter);
# ignore this contact area if it's too low # ignore this contact area if it's too low
next if $contact_z < $self->object_config->get_value('first_layer_height'); next if $contact_z < $self->object_config->get_value('first_layer_height') - epsilon;
$contact{$contact_z} = [ @contact ]; $contact{$contact_z} = [ @contact ];
$overhang{$contact_z} = [ @overhang ]; $overhang{$contact_z} = [ @overhang ];