Model extrusion threads as rectangles with semicircles at the end. Remove overlap_ratio setting. #109 #112

This commit is contained in:
Alessandro Ranellucci 2011-12-13 17:34:31 +01:00
parent 869cb48c1a
commit 56691c1dea
16 changed files with 43 additions and 57 deletions

View file

@ -87,8 +87,7 @@ sub make_fill {
SURFACE: foreach my $surface (@surfaces) {
my $filler = $Slic3r::fill_pattern;
my $density = $Slic3r::fill_density;
my $flow_spacing = $Slic3r::flow_spacing;
my $flow_ratio = 1;
my $flow_width = $Slic3r::flow_width;
my $is_bridge = $layer->id > 0 && $surface->surface_type eq 'bottom';
my $is_solid = $surface->surface_type =~ /^(top|bottom)$/;
@ -98,9 +97,7 @@ sub make_fill {
$filler = $Slic3r::solid_fill_pattern;
if ($is_bridge) {
$filler = 'rectilinear';
$flow_spacing = sqrt($Slic3r::bridge_flow_ratio * ($Slic3r::nozzle_diameter**2))
* (1-$Slic3r::overlap_ratio);
$flow_ratio = $Slic3r::bridge_flow_ratio;
$flow_width = sqrt($Slic3r::bridge_flow_ratio * ($Slic3r::nozzle_diameter**2));
}
} else {
next SURFACE unless $density > 0;
@ -109,7 +106,7 @@ sub make_fill {
my @paths = $self->fillers->{$filler}->fill_surface(
$surface,
density => $density,
flow_spacing => $flow_spacing,
flow_width => $flow_width,
);
my $params = shift @paths;
@ -120,7 +117,7 @@ sub make_fill {
[ @$_ ],
role => ($is_bridge ? 'bridge' : $is_solid ? 'solid-fill' : 'fill'),
depth_layers => $surface->depth_layers,
flow_ratio => $flow_ratio * ($params->{flow_ratio} || 1),
flow_width => $flow_width,
), @paths,
],
) if @paths;