juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

More constants, less strings => ess memory usage

Browse Source
This commit is contained in:
Alessandro Ranellucci
2012-05-19 15:40:11 +02:00
parent 8fe5d11624
commit aa9563f00b
10 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Slic3r/Extruder.pm
View File

@@ -1,6 +1,7 @@
package Slic3r::Extruder;
use Moo;
use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(scale unscale);
has 'layer' => (is => 'rw');
@@ -33,6 +34,16 @@ 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',
);
use Slic3r::Geometry qw(points_coincide PI X Y);
sub change_layer {
@@ -126,7 +137,7 @@ sub extrude_path {
my $w = ($s - $Slic3r::min_flow_spacing * $Slic3r::overlap_factor) / (1 - $Slic3r::overlap_factor);
my $area;
if ($path->role eq 'bridge') {
if ($path->role == EXTR_ROLE_BRIDGE) {
$area = ($s**2) * PI/4;
} elsif ($w >= ($Slic3r::nozzle_diameter + $h)) {
# rectangle with semicircles at the ends
@@ -142,14 +153,7 @@ sub extrude_path {
* (4 / (($Slic3r::filament_diameter ** 2) * PI));
# extrude arc or line
$self->speed(
$path->role =~ /^(perimeter|skirt|support-material)$/o ? 'perimeter'
: $path->role eq 'small-perimeter' ? 'small_perimeter'
: $path->role eq 'fill' ? 'infill'
: $path->role eq 'solid-fill' ? 'solid_infill'
: $path->role eq 'bridge' ? 'bridge'
: die "Unknown role: " . $path->role
);
$self->speed( $role_speeds{$path->role} || die "Unknown role: " . $path->role );
my $path_length = 0;
if ($path->isa('Slic3r::ExtrusionPath::Arc')) {
$path_length = $path->length;