mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-31 04:31:15 -06:00 
			
		
		
		
	Convert Extruder object (mostly) to C++ with lots of fields.
This commit is contained in:
		
							parent
							
								
									2738a304e8
								
							
						
					
					
						commit
						66d23a2416
					
				
					 9 changed files with 237 additions and 35 deletions
				
			
		|  | @ -1,5 +1,6 @@ | |||
| package Slic3r::Extruder; | ||||
| use Moo; | ||||
| use strict; | ||||
| use warnings; | ||||
| 
 | ||||
| require Exporter; | ||||
| our @ISA = qw(Exporter); | ||||
|  | @ -16,16 +17,8 @@ use constant OPTIONS => [qw( | |||
|     retract_layer_change retract_length_toolchange retract_restart_extra_toolchange wipe | ||||
| )]; | ||||
| 
 | ||||
| has 'id'    => (is => 'rw', required => 1); | ||||
| has $_      => (is => 'ro', required => 1) for @{&OPTIONS}; | ||||
| has 'use_relative_e_distances'  => (is => 'ro', default => sub {0}); | ||||
| 
 | ||||
| has 'E'                         => (is => 'rw', default => sub {0} ); | ||||
| has 'absolute_E'                => (is => 'rw', default => sub {0} ); | ||||
| has 'retracted'                 => (is => 'rw', default => sub {0} ); | ||||
| has 'restart_extra'             => (is => 'rw', default => sub {0} ); | ||||
| has 'e_per_mm3'                 => (is => 'lazy'); | ||||
| has 'retract_speed_mm_min'      => (is => 'lazy'); | ||||
| # has 'e_per_mm3'                 => (is => 'lazy'); | ||||
| # has 'retract_speed_mm_min'      => (is => 'lazy'); | ||||
| 
 | ||||
| use constant EXTRUDER_ROLE_PERIMETER                    => 1; | ||||
| use constant EXTRUDER_ROLE_INFILL                       => 2; | ||||
|  | @ -45,25 +38,16 @@ sub new_from_config { | |||
|     return $class->new(%conf); | ||||
| } | ||||
| 
 | ||||
| sub _build_e_per_mm3 { | ||||
| sub e_per_mm3 { | ||||
|     my $self = shift; | ||||
|     return $self->extrusion_multiplier * (4 / (($self->filament_diameter ** 2) * PI)); | ||||
| } | ||||
| 
 | ||||
| sub _build_retract_speed_mm_min { | ||||
| sub retract_speed_mm_min { | ||||
|     my $self = shift; | ||||
|     return $self->retract_speed * 60; | ||||
| } | ||||
| 
 | ||||
| sub reset { | ||||
|     my ($self) = @_; | ||||
|      | ||||
|     $self->E(0); | ||||
|     $self->absolute_E(0); | ||||
|     $self->retracted(0); | ||||
|     $self->restart_extra(0); | ||||
| } | ||||
| 
 | ||||
| sub scaled_wipe_distance { | ||||
|     my ($self, $travel_speed) = @_; | ||||
|      | ||||
|  | @ -74,14 +58,6 @@ sub scaled_wipe_distance { | |||
|     return scale($self->retract_length / $self->retract_speed * $travel_speed * 0.8); | ||||
| } | ||||
| 
 | ||||
| sub extrude { | ||||
|     my ($self, $E) = @_; | ||||
|      | ||||
|     $self->E(0) if $self->use_relative_e_distances; | ||||
|     $self->absolute_E($self->absolute_E + $E); | ||||
|     return $self->E($self->E + $E); | ||||
| } | ||||
| 
 | ||||
| sub extruded_volume { | ||||
|     my ($self, $E) = @_; | ||||
|     return $E * ($self->filament_diameter**2) * PI/4; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Y. Sapir
						Y. Sapir