Merge branch 'master' into dynamic-flow

Conflicts:
	lib/Slic3r/Flow.pm
	lib/Slic3r/Layer.pm
This commit is contained in:
Alessandro Ranellucci 2012-10-04 15:23:08 +02:00
commit b92642459f
32 changed files with 1469 additions and 1147 deletions

View file

@ -1,13 +1,15 @@
package Slic3r::Flow;
use Moo;
use Slic3r::Geometry qw(PI);
use Slic3r::Geometry qw(PI scale);
has 'nozzle_diameter' => (is => 'ro', required => 1);
has 'layer_height' => (is => 'ro', default => sub { $Slic3r::Config->layer_height });
has 'width' => (is => 'rwp', builder => 1);
has 'spacing' => (is => 'lazy');
has 'scaled_width' => (is => 'lazy');
has 'scaled_spacing' => (is => 'lazy');
sub BUILD {
my $self = shift;
@ -65,4 +67,14 @@ sub clone {
);
}
sub _build_scaled_width {
my $self = shift;
return scale $self->width;
}
sub _build_scaled_spacing {
my $self = shift;
return scale $self->spacing;
}
1;