vitalif
/
Slic3r
mirror of https://github.com/vitalif/Slic3r
1
0
Fork 0
Code Issues Releases Wiki Activity

Corrections to math. Threads are not always rectangles with semicircles. Better calculation of overlap.

degen-loop-screen
Alessandro Ranellucci 2011-12-17 19:52:34 +01:00
parent cd0fd80a69
commit 1e6ecd9eab
13 changed files with 62 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r.pm
View File

@ -67,8 +67,10 @@ our $infill_every_layers = 1;
# flow options # flow options
our $extrusion_width_ratio = 0; our $extrusion_width_ratio = 0;
our $bridge_flow_ratio = 1; our $bridge_flow_ratio = 1;
our $overlap_factor = 0.15; our $overlap_factor = 0.5;
our $flow_width; our $flow_width;
our $min_flow_spacing;
our $flow_spacing;
# print options # print options
our $perimeters = 3; our $perimeters = 3;

27
lib/Slic3r/Config.pm
View File

@ -373,15 +373,34 @@ sub validate {
} else { } else {
# here we calculate a sane default by matching the flow speed (at the nozzle) # here we calculate a sane default by matching the flow speed (at the nozzle)
# and the feed rate # and the feed rate
$Slic3r::flow_width = (($Slic3r::nozzle_diameter**2) * PI + ($Slic3r::layer_height**2) * (4 - PI)) / (4 * $Slic3r::layer_height); my $volume = ($Slic3r::nozzle_diameter**2) * PI/4;
my $shape_threshold = $Slic3r::nozzle_diameter * $Slic3r::layer_height
+ ($Slic3r::layer_height**2) * PI/4;
if ($volume >= $shape_threshold) {
# rectangle with semicircles at the ends
$Slic3r::flow_width = (($Slic3r::nozzle_diameter**2) * PI + ($Slic3r::layer_height**2) * (4 - PI)) / (4 * $Slic3r::layer_height);
} else {
# rectangle with squished semicircles at the ends
$Slic3r::flow_width = $Slic3r::nozzle_diameter * ($Slic3r::nozzle_diameter/$Slic3r::layer_height - 4/PI + 1);
}
my $max_flow_width = $Slic3r::nozzle_diameter * 1.2; my $min_flow_width = $Slic3r::nozzle_diameter * 1.05;
my $max_flow_width = $Slic3r::nozzle_diameter * 1.4;
$Slic3r::flow_width = $max_flow_width if $Slic3r::flow_width > $max_flow_width; $Slic3r::flow_width = $max_flow_width if $Slic3r::flow_width > $max_flow_width;
$Slic3r::flow_width = $Slic3r::nozzle_diameter * 1.05 $Slic3r::flow_width = $min_flow_width if $Slic3r::flow_width < $min_flow_width;
if $Slic3r::flow_width < $Slic3r::nozzle_diameter;
} }
if ($Slic3r::flow_width >= ($Slic3r::nozzle_diameter + $Slic3r::layer_height)) {
# rectangle with shrunk at the ends
$Slic3r::min_flow_spacing = $Slic3r::flow_width - $Slic3r::layer_height * (1 - PI/4);
} else {
# rectangle with shrunk semicircles at the ends
$Slic3r::min_flow_spacing = $Slic3r::flow_width * (1 - PI/4) + $Slic3r::nozzle_diameter * PI/4;
}
$Slic3r::flow_spacing = $Slic3r::flow_width - $Slic3r::overlap_factor * ($Slic3r::flow_width - $Slic3r::min_flow_spacing);
Slic3r::debugf "Flow width = $Slic3r::flow_width\n"; Slic3r::debugf "Flow width = $Slic3r::flow_width\n";
Slic3r::debugf "Flow spacing = $Slic3r::flow_spacing\n";
# --perimeters # --perimeters
die "Invalid value for --perimeters\n" die "Invalid value for --perimeters\n"

21
lib/Slic3r/Extruder.pm
View File

@ -76,7 +76,7 @@ sub extrude_loop {
my $extrusion_path = $loop->split_at($start_at); my $extrusion_path = $loop->split_at($start_at);
# clip the path to avoid the extruder to get exactly on the first point of the loop # clip the path to avoid the extruder to get exactly on the first point of the loop
$extrusion_path->clip_end(scale $Slic3r::flow_width); $extrusion_path->clip_end(scale $Slic3r::nozzle_diameter);
# extrude along the path # extrude along the path
return $self->extrude($extrusion_path, $description); return $self->extrude($extrusion_path, $description);
@ -118,16 +118,23 @@ sub extrude {
$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 $w = $path->flow_width || $Slic3r::flow_width; my $s = $path->flow_spacing || $Slic3r::flow_spacing;
my $h = $path->depth_layers * $Slic3r::layer_height; my $h = $path->depth_layers * $Slic3r::layer_height;
$h = $w if $path->role eq 'bridge'; my $w = ($s - $Slic3r::min_flow_spacing * $Slic3r::overlap_factor) / (1 - $Slic3r::overlap_factor);
# calculate additional flow for overlapping my $area;
my $overlap_area = $Slic3r::overlap_factor * (($Slic3r::layer_height**2) - ($Slic3r::layer_height**2) / 4 * PI); if ($path->role eq 'bridge') {
$overlap_area = 0 if $path->role eq 'bridge'; $area = ($s**2) * PI/4;
} elsif ($w >= ($Slic3r::nozzle_diameter + $h)) {
# rectangle with semicircles at the ends
$area = $w * $h + ($h**2) / 4 * (PI - 4);
} else {
# rectangle with shrunk semicircles at the ends
$area = $Slic3r::nozzle_diameter * $h * (1 - PI/4) + $h * $w * PI/4;
}
my $e = $Slic3r::resolution my $e = $Slic3r::resolution
* ($w * $h + ($Slic3r::layer_height**2) / 4 * (PI - 4) + $overlap_area) * $area
* $Slic3r::extrusion_multiplier * $Slic3r::extrusion_multiplier
* (4 / (($Slic3r::filament_diameter ** 2) * PI)); * (4 / (($Slic3r::filament_diameter ** 2) * PI));

2
lib/Slic3r/ExtrusionPath.pm
View File

@ -7,7 +7,7 @@ extends 'Slic3r::Polyline';
# expressed in layers # expressed in layers
has 'depth_layers' => (is => 'ro', default => sub {1}); has 'depth_layers' => (is => 'ro', default => sub {1});
has 'flow_width' => (is => 'rw'); has 'flow_spacing' => (is => 'rw');
# perimeter/fill/solid-fill/bridge/skirt # perimeter/fill/solid-fill/bridge/skirt
has 'role' => (is => 'rw', required => 1); has 'role' => (is => 'rw', required => 1);

8
lib/Slic3r/Fill.pm
View File

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

6
lib/Slic3r/Fill/Concentric.pm
View File

@ -12,8 +12,8 @@ sub fill_surface {
# no rotation is supported for this infill pattern # no rotation is supported for this infill pattern
my $scaled_flow_width = scale $params{flow_width}; my $scaled_flow_spacing = scale $params{flow_spacing};
my $distance = $scaled_flow_width / $params{density}; my $distance = $scaled_flow_spacing / $params{density};
# TODO: adjust distance and flow width for solid surfaces # TODO: adjust distance and flow width for solid surfaces
# using the same logic as Rectilinear infill # using the same logic as Rectilinear infill
# (factor it out to parent class) # (factor it out to parent class)
@ -47,7 +47,7 @@ sub fill_surface {
my $path = $loop->split_at($cur_pos); my $path = $loop->split_at($cur_pos);
# clip the path to avoid the extruder to get exactly on the first point of the loop # clip the path to avoid the extruder to get exactly on the first point of the loop
$path->clip_end(scale $Slic3r::flow_width); $path->clip_end(scale $Slic3r::nozzle_diameter);
push @paths, $path->p; push @paths, $path->p;
} }

2
lib/Slic3r/Fill/PlanePath.pm
View File

@ -27,7 +27,7 @@ sub fill_surface {
my $rotate_vector = $self->infill_direction($surface); my $rotate_vector = $self->infill_direction($surface);
$self->rotate_points($expolygon, $rotate_vector); $self->rotate_points($expolygon, $rotate_vector);
my $distance_between_lines = scale $params{flow_width} / $params{density} * $self->multiplier; my $distance_between_lines = scale $params{flow_spacing} / $params{density} * $self->multiplier;
my $bounding_box = [ bounding_box(map @$_, $expolygon) ]; my $bounding_box = [ bounding_box(map @$_, $expolygon) ];
my $bounding_box_polygon = Slic3r::Polygon->new([ my $bounding_box_polygon = Slic3r::Polygon->new([
[ $bounding_box->[X1], $bounding_box->[Y1] ], [ $bounding_box->[X1], $bounding_box->[Y1] ],

10
lib/Slic3r/Fill/Rectilinear.pm
View File

@ -19,18 +19,18 @@ sub fill_surface {
$bounding_box->[X1] += scale 0.1; $bounding_box->[X1] += scale 0.1;
$bounding_box->[X2] -= scale 0.1; $bounding_box->[X2] -= scale 0.1;
my $min_spacing = scale $params{flow_width}; my $min_spacing = scale $params{flow_spacing};
my $distance_between_lines = $min_spacing / $params{density}; my $distance_between_lines = $min_spacing / $params{density};
my $line_oscillation = $distance_between_lines - $min_spacing; my $line_oscillation = $distance_between_lines - $min_spacing;
my $number_of_lines = int(($bounding_box->[X2] - $bounding_box->[X1]) / $distance_between_lines) + 1; my $number_of_lines = int(($bounding_box->[X2] - $bounding_box->[X1]) / $distance_between_lines) + 1;
my $flow_width = undef; my $flow_spacing = undef;
if ($params{density} == 1) { if ($params{density} == 1) {
my $extra_space = ($bounding_box->[X2] - $bounding_box->[X1]) % $distance_between_lines; my $extra_space = ($bounding_box->[X2] - $bounding_box->[X1]) % $distance_between_lines;
$distance_between_lines += $extra_space / ($number_of_lines - 1) if $number_of_lines > 1; $distance_between_lines += $extra_space / ($number_of_lines - 1) if $number_of_lines > 1;
$flow_width = unscale $distance_between_lines; $flow_spacing = unscale $distance_between_lines;
} }
my $overlap_distance = $min_spacing * $Slic3r::overlap_factor; my $overlap_distance = $Slic3r::nozzle_diameter * 0.20;
my @paths = (); my @paths = ();
my $x = $bounding_box->[X1]; my $x = $bounding_box->[X1];
@ -79,7 +79,7 @@ sub fill_surface {
# paths must be rotated back # paths must be rotated back
$self->rotate_points_back(\@paths, $rotate_vector); $self->rotate_points_back(\@paths, $rotate_vector);
return { flow_width => $flow_width }, @paths; return { flow_spacing => $flow_spacing }, @paths;
} }
1; 1;

2
lib/Slic3r/Fill/Rectilinear2.pm
View File

@ -16,7 +16,7 @@ sub fill_surface {
my $rotate_vector = $self->infill_direction($surface); my $rotate_vector = $self->infill_direction($surface);
$self->rotate_points($polygons, $rotate_vector); $self->rotate_points($polygons, $rotate_vector);
my $distance_between_lines = scale $params{flow_width} / $params{density}; my $distance_between_lines = scale $params{flow_spacing} / $params{density};
my $number_of_lines = int(0.99999999 + $self->max_print_dimension / $distance_between_lines); # ceil my $number_of_lines = int(0.99999999 + $self->max_print_dimension / $distance_between_lines); # ceil
#printf "distance = %f\n", $distance_between_lines; #printf "distance = %f\n", $distance_between_lines;

15
lib/Slic3r/Layer.pm
View File

@ -124,14 +124,7 @@ sub make_surfaces {
# the contours must be offsetted by half extrusion width inwards # the contours must be offsetted by half extrusion width inwards
{ {
my $distance = $Slic3r::flow_width / 2; my $distance = scale $Slic3r::flow_width / 2;
if ($Slic3r::overlap_factor) {
# our overlap is done by increasing the flow; however external perimeters will grow
# outwards, so we offset by the correct amount
$distance = ($Slic3r::flow_width + $Slic3r::overlap_factor * $Slic3r::layer_height * (1 - PI/4)) / 2;
}
$distance = scale $distance;
my @surfaces = @{$self->slices}; my @surfaces = @{$self->slices};
@{$self->slices} = (); @{$self->slices} = ();
foreach my $surface (@surfaces) { foreach my $surface (@surfaces) {
@ -156,7 +149,7 @@ sub prepare_fill_surfaces {
# merge too small internal surfaces with their surrounding tops # merge too small internal surfaces with their surrounding tops
# (if they're too small, they can be treated as solid) # (if they're too small, they can be treated as solid)
{ {
my $min_area = ((7 * $Slic3r::flow_width / $Slic3r::resolution)**2) * PI; my $min_area = ((7 * $Slic3r::flow_spacing / $Slic3r::resolution)**2) * PI;
my $small_internal = [ my $small_internal = [
grep { $_->expolygon->contour->area <= $min_area } grep { $_->expolygon->contour->area <= $min_area }
grep { $_->surface_type eq 'internal' } grep { $_->surface_type eq 'internal' }
@ -189,7 +182,7 @@ sub prepare_fill_surfaces {
sub remove_small_surfaces { sub remove_small_surfaces {
my $self = shift; my $self = shift;
my $distance = scale $Slic3r::flow_width / 2; my $distance = scale $Slic3r::flow_spacing / 2;
my @surfaces = @{$self->fill_surfaces}; my @surfaces = @{$self->fill_surfaces};
@{$self->fill_surfaces} = (); @{$self->fill_surfaces} = ();
@ -257,7 +250,7 @@ sub process_bridges {
# offset the contour and intersect it with the internal surfaces to discover # offset the contour and intersect it with the internal surfaces to discover
# which of them has contact with our bridge # which of them has contact with our bridge
my @supporting_surfaces = (); my @supporting_surfaces = ();
my ($contour_offset) = $expolygon->contour->offset(scale $Slic3r::flow_width * sqrt(2)); my ($contour_offset) = $expolygon->contour->offset(scale $Slic3r::flow_spacing * sqrt(2));
foreach my $internal_surface (@internal_surfaces) { foreach my $internal_surface (@internal_surfaces) {
my $intersection = intersection_ex([$contour_offset], [$internal_surface->contour->p]); my $intersection = intersection_ex([$contour_offset], [$internal_surface->contour->p]);
if (@$intersection) { if (@$intersection) {

2
lib/Slic3r/Perimeter.pm
View File

@ -45,7 +45,7 @@ sub make_perimeter {
push @{ $perimeters[-1] }, [@last_offsets]; push @{ $perimeters[-1] }, [@last_offsets];
# offset distance for inner loops # offset distance for inner loops
$distance = scale $Slic3r::flow_width; $distance = scale $Slic3r::flow_spacing;
} }
# create one more offset to be used as boundary for fill # create one more offset to be used as boundary for fill

2
lib/Slic3r/Polyline/Closed.pm
View File

@ -32,7 +32,7 @@ sub is_printable {
# if no offset is possible, then polyline is not printable # if no offset is possible, then polyline is not printable
my $p = $self->p; my $p = $self->p;
@$p = reverse @$p if !Math::Clipper::is_counter_clockwise($p); @$p = reverse @$p if !Math::Clipper::is_counter_clockwise($p);
my $offsets = Math::Clipper::offset([$p], -(scale $Slic3r::flow_width / 2), $Slic3r::resolution * 100000, JT_MITER, 2); my $offsets = Math::Clipper::offset([$p], -(scale $Slic3r::flow_spacing / 2), $Slic3r::resolution * 100000, JT_MITER, 2);
return @$offsets ? 1 : 0; return @$offsets ? 1 : 0;
} }

2
lib/Slic3r/Print.pm
View File

@ -336,7 +336,7 @@ sub extrude_skirt {
# draw outlines from outside to inside # draw outlines from outside to inside
my @skirts = (); my @skirts = ();
for (my $i = $Slic3r::skirts - 1; $i >= 0; $i--) { for (my $i = $Slic3r::skirts - 1; $i >= 0; $i--) {
my $distance = scale ($Slic3r::skirt_distance + ($Slic3r::flow_width * $i)); my $distance = scale ($Slic3r::skirt_distance + ($Slic3r::flow_spacing * $i));
my $outline = offset([$convex_hull], $distance, $Slic3r::resolution * 100, JT_ROUND); my $outline = offset([$convex_hull], $distance, $Slic3r::resolution * 100, JT_ROUND);
push @skirts, Slic3r::ExtrusionLoop->cast([ @{$outline->[0]} ], role => 'skirt'); push @skirts, Slic3r::ExtrusionLoop->cast([ @{$outline->[0]} ], role => 'skirt');
} }