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

Bugfix: flow wasn't adjusted for perimeters when a custom perimeters extrusion width was applied

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-07-01 18:12:21 +02:00
parent 07f2dab5f6
commit c4b9a6cf61
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Slic3r/ExtrusionLoop.pm
View file

@ -8,6 +8,8 @@ has 'polygon' => (
handles => [qw(is_printable nearest_point_to reverse)], handles => [qw(is_printable nearest_point_to reverse)],
); );
has 'flow_spacing' => (is => 'rw');
# see EXTR_ROLE_* constants in ExtrusionPath.pm # see EXTR_ROLE_* constants in ExtrusionPath.pm
has 'role' => (is => 'rw', required => 1); has 'role' => (is => 'rw', required => 1);
@ -52,6 +54,7 @@ sub split_at {
return Slic3r::ExtrusionPath->new( return Slic3r::ExtrusionPath->new(
polyline => Slic3r::Polyline->new(\@new_points), polyline => Slic3r::Polyline->new(\@new_points),
role => $self->role, role => $self->role,
flow_spacing => $self->flow_spacing,
); );
} }

12
lib/Slic3r/Fill.pm
View file

@ -178,11 +178,17 @@ sub make_fill {
} }
# add thin fill regions # add thin fill regions
push @fills, map { {
my %args = (
role => EXTR_ROLE_SOLIDFILL,
flow_spacing => $layer->perimeters_flow->spacing,
);
push @fills, map {
$_->isa('Slic3r::Polygon') $_->isa('Slic3r::Polygon')
? Slic3r::ExtrusionLoop->new(polygon => $_, role => EXTR_ROLE_SOLIDFILL)->split_at_first_point ? Slic3r::ExtrusionLoop->new(polygon => $_, %args)->split_at_first_point
: Slic3r::ExtrusionPath->new(polyline => $_, role => EXTR_ROLE_SOLIDFILL), : Slic3r::ExtrusionPath->new(polyline => $_, %args),
} @{$layer->thin_fills}; } @{$layer->thin_fills};
}
push @fills_ordering_points, map $_->[0], @{$layer->thin_fills}; push @fills_ordering_points, map $_->[0], @{$layer->thin_fills};
# organize infill paths using a shortest path search # organize infill paths using a shortest path search

2
lib/Slic3r/GCode.pm
View file

@ -158,7 +158,7 @@ sub extrude_path {
$gcode .= $self->unretract if $self->retracted; $gcode .= $self->unretract if $self->retracted;
# calculate extrusion length per distance unit # calculate extrusion length per distance unit
my $s = $path->flow_spacing || $self->layer ? $self->layer->flow->spacing : $Slic3r::flow->spacing; my $s = $path->flow_spacing || ($self->layer ? $self->layer->flow->spacing : $Slic3r::flow->spacing);
my $h = $path->depth_layers * $self->layer->height; my $h = $path->depth_layers * $self->layer->height;
my $w = ($s - ($self->layer ? $self->layer->flow->min_spacing : $Slic3r::flow->min_spacing) * $Slic3r::overlap_factor) / (1 - $Slic3r::overlap_factor); my $w = ($s - ($self->layer ? $self->layer->flow->min_spacing : $Slic3r::flow->min_spacing) * $Slic3r::overlap_factor) / (1 - $Slic3r::overlap_factor);

6
lib/Slic3r/Layer.pm
View file

@ -354,6 +354,7 @@ sub make_perimeters {
} else { } else {
push @thin_paths, Slic3r::ExtrusionPath->new(polyline => $_, role => EXTR_ROLE_PERIMETER); push @thin_paths, Slic3r::ExtrusionPath->new(polyline => $_, role => EXTR_ROLE_PERIMETER);
} }
$thin_paths[-1]->flow_spacing($self->perimeters_flow->spacing);
} }
my $collection = Slic3r::ExtrusionPath::Collection->new(paths => \@thin_paths); my $collection = Slic3r::ExtrusionPath::Collection->new(paths => \@thin_paths);
push @{ $self->perimeters }, $collection->shortest_path; push @{ $self->perimeters }, $collection->shortest_path;
@ -366,8 +367,9 @@ sub add_perimeter {
return unless $polygon->is_printable($self->perimeters_flow->width); return unless $polygon->is_printable($self->perimeters_flow->width);
push @{ $self->perimeters }, Slic3r::ExtrusionLoop->new( push @{ $self->perimeters }, Slic3r::ExtrusionLoop->new(
polygon => $polygon, polygon => $polygon,
role => (abs($polygon->length) <= $Slic3r::small_perimeter_length) ? EXTR_ROLE_SMALLPERIMETER : ($role // EXTR_ROLE_PERIMETER), #/ role => (abs($polygon->length) <= $Slic3r::small_perimeter_length) ? EXTR_ROLE_SMALLPERIMETER : ($role // EXTR_ROLE_PERIMETER), #/
flow_spacing => $self->perimeters_flow->spacing,
); );
} }