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

New Slic3r::Print::State class

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-12-19 18:54:24 +01:00
parent 685e8e4dfa
commit d2295cdf70
3 changed files with 115 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
lib/Slic3r/Print.pm
View File

@ -9,6 +9,7 @@ use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN MAX PI scale unscale move_points c
convex_hull); convex_hull);
use Slic3r::Geometry::Clipper qw(diff_ex union_ex union_pt intersection_ex intersection offset use Slic3r::Geometry::Clipper qw(diff_ex union_ex union_pt intersection_ex intersection offset
offset2 union union_pt_chained JT_ROUND JT_SQUARE); offset2 union union_pt_chained JT_ROUND JT_SQUARE);
use Slic3r::Print::State ':steps';
has 'config' => (is => 'rw', default => sub { Slic3r::Config->new_from_defaults }, trigger => \&init_config); has 'config' => (is => 'rw', default => sub { Slic3r::Config->new_from_defaults }, trigger => \&init_config);
has 'extra_variables' => (is => 'rw', default => sub {{}}); has 'extra_variables' => (is => 'rw', default => sub {{}});
@ -19,8 +20,7 @@ has 'regions' => (is => 'rw', default => sub {[]});
has 'support_material_flow' => (is => 'rw'); has 'support_material_flow' => (is => 'rw');
has 'first_layer_support_material_flow' => (is => 'rw'); has 'first_layer_support_material_flow' => (is => 'rw');
has 'has_support_material' => (is => 'lazy'); has 'has_support_material' => (is => 'lazy');
has '_started' => (is => 'ro', default => sub {{}}); # { obj_idx => { step => 1, ... }, ... } has '_state' => (is => 'ro', default => sub { Slic3r::Print::State->new });
has '_done' => (is => 'ro', default => sub {{}}); # { obj_idx => { step => 1, ... }, ... }
# ordered collection of extrusion paths to build skirt loops # ordered collection of extrusion paths to build skirt loops
has 'skirt' => (is => 'rw', default => sub { Slic3r::ExtrusionPath::Collection->new }); has 'skirt' => (is => 'rw', default => sub { Slic3r::ExtrusionPath::Collection->new });
@ -28,15 +28,6 @@ has 'skirt' => (is => 'rw', default => sub { Slic3r::ExtrusionPath::Collection->
# ordered collection of extrusion paths to build a brim # ordered collection of extrusion paths to build a brim
has 'brim' => (is => 'rw', default => sub { Slic3r::ExtrusionPath::Collection->new }); has 'brim' => (is => 'rw', default => sub { Slic3r::ExtrusionPath::Collection->new });
use constant STEP_INIT_EXTRUDERS => 0;
use constant STEP_SLICE => 1;
use constant STEP_PERIMETERS => 2;
use constant STEP_PREPARE_INFILL => 3;
use constant STEP_INFILL => 4;
use constant STEP_SUPPORTMATERIAL => 5;
use constant STEP_SKIRT => 6;
use constant STEP_BRIM => 7;
sub BUILD { sub BUILD {
my $self = shift; my $self = shift;
@ -94,37 +85,6 @@ sub _build_has_support_material {
|| (first { $_->config->support_material_enforce_layers > 0 } @{$self->objects}); || (first { $_->config->support_material_enforce_layers > 0 } @{$self->objects});
} }
sub step_started {
my ($self, $step, $obj_idx) = @_;
$obj_idx //= -1;
return (defined $self->_started->{$obj_idx} && $self->_started->{$obj_idx}{$step}) ? 1 : 0;
}
sub step_done {
my ($self, $step, $obj_idx) = @_;
$obj_idx //= -1;
return (defined $self->_done->{$obj_idx} && $self->_done->{$obj_idx}{$step}) ? 1 : 0;
}
sub set_step_started {
my ($self, $step, $obj_idx) = @_;
$obj_idx //= -1;
$self->_started->{$obj_idx} //= {};
$self->_started->{$obj_idx}{$step} = 1;
delete $self->_done->{$obj_idx}{$step} if defined $self->_done->{$obj_idx};
}
sub set_step_done {
my ($self, $step, $obj_idx) = @_;
$obj_idx //= -1;
$self->_done->{$obj_idx} //= {};
$self->_done->{$obj_idx}{$step} = 1;
}
# caller is responsible for supplying models whose objects don't collide # caller is responsible for supplying models whose objects don't collide
# and have explicit instance positions # and have explicit instance positions
sub add_model_object { sub add_model_object {
@ -177,21 +137,29 @@ sub add_model_object {
@{$self->extra_variables}{qw(input_filename input_filename_base)} = parse_filename($input_file); @{$self->extra_variables}{qw(input_filename input_filename_base)} = parse_filename($input_file);
} }
} }
# TODO: invalidate skirt and brim
$self->_state->invalidate(STEP_SKIRT);
$self->_state->invalidate(STEP_BRIM);
} }
sub delete_object { sub delete_object {
my ($self, $obj_idx) = @_; my ($self, $obj_idx) = @_;
splice @{$self->objects}, $obj_idx, 1; splice @{$self->objects}, $obj_idx, 1;
# TODO: purge unused regions # TODO: purge unused regions
# TODO: invalidate skirt and brim
$self->_state->invalidate(STEP_SKIRT);
$self->_state->invalidate(STEP_BRIM);
} }
sub delete_all_objects { sub delete_all_objects {
my ($self) = @_; my ($self) = @_;
@{$self->objects} = (); @{$self->objects} = ();
@{$self->regions} = (); @{$self->regions} = ();
# TODO: invalidate skirt and brim
$self->_state->invalidate(STEP_SKIRT);
$self->_state->invalidate(STEP_BRIM);
} }
sub validate { sub validate {
@ -372,19 +340,20 @@ sub process {
my $print_step = sub { my $print_step = sub {
my ($step, $cb) = @_; my ($step, $cb) = @_;
if (!$self->step_done($step)) { if (!$self->_state->done($step)) {
$self->set_step_started($step); $self->_state->set_started($step);
$cb->(); $cb->();
$self->set_step_done($step); $self->_state->set_done($step);
} }
}; };
my $object_step = sub { my $object_step = sub {
my ($step, $cb) = @_; my ($step, $cb) = @_;
for my $obj_idx (0..$#{$self->objects}) { for my $obj_idx (0..$#{$self->objects}) {
if (!$self->step_done($step, $obj_idx)) { my $object = $self->objects->[$obj_idx];
$self->set_step_started($step, $obj_idx); if (!$object->_state->done($step, $obj_idx)) {
$object->_state->set_started($step, $obj_idx);
$cb->($obj_idx); $cb->($obj_idx);
$self->set_step_done($step, $obj_idx); $object->_state->set_done($step, $obj_idx);
} }
} }
}; };
@ -472,7 +441,7 @@ sub process {
); );
### we could free memory now, but this would make this step not idempotent ### we could free memory now, but this would make this step not idempotent
$_->fill_surfaces->clear for map @{$_->regions}, @{$object->layers}; ### $_->fill_surfaces->clear for map @{$_->regions}, @{$object->layers};
}); });
# generate support material # generate support material
@ -1010,4 +979,25 @@ sub apply_extra_variables {
$self->extra_variables->{$_} = $extra->{$_} for keys %$extra; $self->extra_variables->{$_} = $extra->{$_} for keys %$extra;
} }
sub invalidate_step {
my ($self, $step, $obj_idx) = @_;
# invalidate $step in the correct state object
if ($Slic3r::Print::State::print_step->{$step}) {
$self->_state->invalidate($step);
} else {
# object step
if (defined $obj_idx) {
$self->objects->[$obj_idx]->_state->invalidate($step);
} else {
$_->_state->invalidate($step) for @{$self->objects};
}
}
# recursively invalidate steps depending on $step
$self->invalidate_step($_)
for grep { grep { $_ == $step } @{$Slic3r::Print::State::prereqs{$_}} }
keys %Slic3r::Print::State::prereqs;
}
1; 1;

5
lib/Slic3r/Print/Object.pm
View File

@ -5,6 +5,7 @@ use List::Util qw(min max sum first);
use Slic3r::Geometry qw(X Y Z PI scale unscale deg2rad rad2deg scaled_epsilon chained_path); use Slic3r::Geometry qw(X Y Z PI scale unscale deg2rad rad2deg scaled_epsilon chained_path);
use Slic3r::Geometry::Clipper qw(diff diff_ex intersection intersection_ex union union_ex use Slic3r::Geometry::Clipper qw(diff diff_ex intersection intersection_ex union union_ex
offset offset_ex offset2 offset2_ex CLIPPER_OFFSET_SCALE JT_MITER); offset offset_ex offset2 offset2_ex CLIPPER_OFFSET_SCALE JT_MITER);
use Slic3r::Print::State ':steps';
use Slic3r::Surface ':types'; use Slic3r::Surface ':types';
has 'print' => (is => 'ro', weak_ref => 1, required => 1); has 'print' => (is => 'ro', weak_ref => 1, required => 1);
@ -21,6 +22,7 @@ has '_shifted_copies' => (is => 'rw'); # Slic3r::Point objects in scaled G-co
has 'layers' => (is => 'rw', default => sub { [] }); has 'layers' => (is => 'rw', default => sub { [] });
has 'support_layers' => (is => 'rw', default => sub { [] }); has 'support_layers' => (is => 'rw', default => sub { [] });
has 'fill_maker' => (is => 'lazy'); has 'fill_maker' => (is => 'lazy');
has '_state' => (is => 'ro', default => sub { Slic3r::Print::State->new });
sub BUILD { sub BUILD {
my $self = shift; my $self = shift;
@ -70,6 +72,9 @@ sub _trigger_copies {
$c; $c;
} @{$self->copies}[@{chained_path($self->copies)}] } @{$self->copies}[@{chained_path($self->copies)}]
]); ]);
$self->print->_state->invalidate(STEP_SKIRT);
$self->print->_state->invalidate(STEP_BRIM);
} }
# in unscaled coordinates # in unscaled coordinates

68
lib/Slic3r/Print/State.pm Normal file
View File

@ -0,0 +1,68 @@
package Slic3r::Print::State;
use Moo;
require Exporter;
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(STEP_INIT_EXTRUDERS STEP_SLICE STEP_PERIMETERS STEP_PREPARE_INFILL
STEP_INFILL STEP_SUPPORTMATERIAL STEP_SKIRT STEP_BRIM);
our %EXPORT_TAGS = (steps => \@EXPORT_OK);
has '_started' => (is => 'ro', default => sub {{}}); # { step => 1, ... }
has '_done' => (is => 'ro', default => sub {{}}); # { step => 1, ... }
use constant STEP_INIT_EXTRUDERS => 0;
use constant STEP_SLICE => 1;
use constant STEP_PERIMETERS => 2;
use constant STEP_PREPARE_INFILL => 3;
use constant STEP_INFILL => 4;
use constant STEP_SUPPORTMATERIAL => 5;
use constant STEP_SKIRT => 6;
use constant STEP_BRIM => 7;
our %print_steps = map { $_ => 1 } (
STEP_INIT_EXTRUDERS,
STEP_SKIRT,
STEP_BRIM,
);
our %prereqs = (
STEP_INIT_EXTRUDERS => [],
STEP_SLICE => [],
STEP_PERIMETERS => [STEP_SLICE, STEP_INIT_EXTRUDERS],
STEP_PREPARE_INFILL => [STEP_PERIMETERS],
STEP_INFILL => [STEP_INFILL],
STEP_SUPPORTMATERIAL => [STEP_SLICE, STEP_INIT_EXTRUDERS],
STEP_SKIRT => [STEP_PERIMETERS, STEP_INFILL],
STEP_BRIM => [STEP_PERIMETERS, STEP_INFILL, STEP_SKIRT],
);
sub started {
my ($self, $step) = @_;
return $self->_started->{$step};
}
sub done {
my ($self, $step) = @_;
return $self->_done->{$step};
}
sub set_started {
my ($self, $step) = @_;
$self->_started->{$step} = 1;
delete $self->_done->{$step};
}
sub set_done {
my ($self, $step) = @_;
$self->_done->{$step} = 1;
}
sub invalidate {
my ($self, $step) = @_;
delete $self->_started->{$step};
delete $self->_done->{$step};
}
1;