3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New option to randomize starting points across layers

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-05-19 22:36:29 +02:00
parent b360b2bcea
commit fa4f2c8b97
8 changed files with 50 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.markdown
View file

@ -161,6 +161,7 @@ The author is Alessandro Ranellucci (me).
home X axis [G28 X], disable motors [M84]).
--layer-gcode Load layer-change G-code from the supplied file (default: nothing).
--support-material Generate support material for overhangs
--randomize-start Randomize starting point across layers (default: yes)
Retraction options:
--retract-length Length of retraction in mm when pausing extrusion

1
lib/Slic3r.pm
View file

@ -105,6 +105,7 @@ our $fill_pattern = 'rectilinear';
our $solid_fill_pattern = 'rectilinear';
our $fill_density = 0.4; # 1 = 100%
our $fill_angle = 45;
our $randomize_start = 1;
our $support_material = 0;
our $support_material_tool = 0;
our $start_gcode = "G28 ; home all axes";

5
lib/Slic3r/Config.pm
View file

@ -245,6 +245,11 @@ our $Options = {
cli => 'fill-angle=i',
type => 'i',
},
'randomize_start' => {
label => 'Randomize starting points',
cli => 'randomize-start',
type => 'bool',
},
'support_material' => {
label => 'Generate support material',
cli => 'support-material',

24
lib/Slic3r/Extruder.pm
View file

@ -35,13 +35,14 @@ has 'speeds' => (
);
my %role_speeds = (
&EXTR_ROLE_PERIMETER => 'perimeter',
&EXTR_ROLE_SMALLPERIMETER => 'small_perimeter',
&EXTR_ROLE_FILL => 'infill',
&EXTR_ROLE_SOLIDFILL => 'solid_infill',
&EXTR_ROLE_BRIDGE => 'bridge',
&EXTR_ROLE_SKIRT => 'perimeter',
&EXTR_ROLE_SUPPORTMATERIAL => 'perimeter',
&EXTR_ROLE_PERIMETER => 'perimeter',
&EXTR_ROLE_SMALLPERIMETER => 'small_perimeter',
&EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER => 'perimeter',
&EXTR_ROLE_FILL => 'infill',
&EXTR_ROLE_SOLIDFILL => 'solid_infill',
&EXTR_ROLE_BRIDGE => 'bridge',
&EXTR_ROLE_SKIRT => 'perimeter',
&EXTR_ROLE_SUPPORTMATERIAL => 'perimeter',
);
use Slic3r::Geometry qw(points_coincide PI X Y);
@ -85,7 +86,14 @@ sub extrude_loop {
$loop->polygon->make_counter_clockwise;
# find the point of the loop that is closest to the current extruder position
my $start_at = $loop->nearest_point_to($self->last_pos);
# or randomize if requested
my $last_pos = $self->last_pos;
if ($Slic3r::randomize_start && $loop->role == EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER) {
srand $self->layer->id * 10;
$last_pos = Slic3r::Point->new(scale $Slic3r::print_center->[X], scale $Slic3r::bed_size->[Y]);
$last_pos->rotate(rand(2*PI), $Slic3r::print_center);
}
my $start_at = $loop->nearest_point_to($last_pos);
# split the loop at the starting point and make a path
my $extrusion_path = $loop->split_at($start_at);

19
lib/Slic3r/ExtrusionPath.pm
View file

@ -3,8 +3,8 @@ use Moo;
require Exporter;
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(EXTR_ROLE_PERIMETER EXTR_ROLE_SMALLPERIMETER EXTR_ROLE_FILL EXTR_ROLE_SOLIDFILL
EXTR_ROLE_BRIDGE EXTR_ROLE_SKIRT EXTR_ROLE_SUPPORTMATERIAL);
our @EXPORT_OK = qw(EXTR_ROLE_PERIMETER EXTR_ROLE_SMALLPERIMETER EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER
EXTR_ROLE_FILL EXTR_ROLE_SOLIDFILL EXTR_ROLE_BRIDGE EXTR_ROLE_SKIRT EXTR_ROLE_SUPPORTMATERIAL);
our %EXPORT_TAGS = (roles => \@EXPORT_OK);
use Slic3r::Geometry qw(PI X Y epsilon deg2rad rotate_points);
@ -23,13 +23,14 @@ has 'depth_layers' => (is => 'ro', default => sub {1});
has 'flow_spacing' => (is => 'rw');
has 'role' => (is => 'rw', required => 1);
use constant EXTR_ROLE_PERIMETER => 0;
use constant EXTR_ROLE_SMALLPERIMETER => 1;
use constant EXTR_ROLE_FILL => 2;
use constant EXTR_ROLE_SOLIDFILL => 3;
use constant EXTR_ROLE_BRIDGE => 4;
use constant EXTR_ROLE_SKIRT => 5;
use constant EXTR_ROLE_SUPPORTMATERIAL => 6;
use constant EXTR_ROLE_PERIMETER => 0;
use constant EXTR_ROLE_SMALLPERIMETER => 1;
use constant EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER => 2;
use constant EXTR_ROLE_FILL => 3;
use constant EXTR_ROLE_SOLIDFILL => 4;
use constant EXTR_ROLE_BRIDGE => 5;
use constant EXTR_ROLE_SKIRT => 6;
use constant EXTR_ROLE_SUPPORTMATERIAL => 7;
sub BUILD {
my $self = shift;

2
lib/Slic3r/GUI/SkeinPanel.pm
View file

@ -44,7 +44,7 @@ sub new {
},
print => {
title => 'Print settings',
options => [qw(perimeters solid_layers fill_density fill_angle fill_pattern solid_fill_pattern support_material support_material_tool)],
options => [qw(perimeters solid_layers fill_density fill_angle fill_pattern solid_fill_pattern randomize_start support_material support_material_tool)],
},
retract => {
title => 'Retraction',

21
lib/Slic3r/Layer.pm
View file

@ -285,12 +285,10 @@ sub make_perimeters {
}
# do holes, then contours starting from innermost one
foreach my $polygon ((reverse @holes), (map $_->contour, map @$_, reverse @$island)) {
next unless $polygon->is_printable;
push @{ $self->perimeters }, Slic3r::ExtrusionLoop->new(
polygon => $polygon,
role => (abs($polygon->length) <= $Slic3r::small_perimeter_length) ? EXTR_ROLE_SMALLPERIMETER : EXTR_ROLE_PERIMETER,
);
$self->add_perimeter($_) for reverse @holes;
for my $depth (reverse 0 .. $#$island) {
my $role = $depth == $#$island ? EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER : EXTR_ROLE_PERIMETER;
$self->add_perimeter($_, $role) for map $_->contour, @{$island->[$depth]};
}
}
@ -304,6 +302,17 @@ sub make_perimeters {
}
}
sub add_perimeter {
my $self = shift;
my ($polygon, $role) = @_;
return unless $polygon->is_printable;
push @{ $self->perimeters }, Slic3r::ExtrusionLoop->new(
polygon => $polygon,
role => (abs($polygon->length) <= $Slic3r::small_perimeter_length) ? EXTR_ROLE_SMALLPERIMETER : ($role // EXTR_ROLE_PERIMETER), #/
);
}
sub prepare_fill_surfaces {
my $self = shift;

1
slic3r.pl
View file

@ -197,6 +197,7 @@ $j
home X axis [G28 X], disable motors [M84]).
--layer-gcode Load layer-change G-code from the supplied file (default: nothing).
--support-material Generate support material for overhangs
--randomize-start Randomize starting point across layers (default: yes)
Retraction options:
--retract-length Length of retraction in mm when pausing extrusion