mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-06 13:34:05 -06:00
Merge pull request #1911 from sapir/speed
Rewriting the extrusion path gcode generation in C++
This commit is contained in:
commit
1c020eda78
4 changed files with 79 additions and 25 deletions
|
@ -340,32 +340,14 @@ sub extrude_path {
|
|||
|
||||
# extrude arc or line
|
||||
$gcode .= ";_BRIDGE_FAN_START\n" if $path->is_bridge;
|
||||
my $path_length = 0;
|
||||
my $path_length = unscale $path->length;
|
||||
{
|
||||
my $local_F = $F;
|
||||
foreach my $line (@{$path->lines}) {
|
||||
$path_length += my $line_length = unscale $line->length;
|
||||
|
||||
# calculate extrusion length for this line
|
||||
my $E = 0;
|
||||
$E = $self->extruder->extrude($e * $line_length) if $e;
|
||||
|
||||
# compose G-code line
|
||||
my $point = $line->b;
|
||||
$gcode .= sprintf "G1 X%.3f Y%.3f",
|
||||
($point->x * &Slic3r::SCALING_FACTOR) + $self->shift_x - $self->extruder->extruder_offset->[X],
|
||||
($point->y * &Slic3r::SCALING_FACTOR) + $self->shift_y - $self->extruder->extruder_offset->[Y]; #**
|
||||
$gcode .= sprintf(" %s%.5f", $self->_extrusion_axis, $E)
|
||||
if $E;
|
||||
$gcode .= " F$local_F"
|
||||
if $local_F;
|
||||
$gcode .= " ; $description"
|
||||
if $self->print_config->gcode_comments;
|
||||
$gcode .= "\n";
|
||||
|
||||
# only include F in the first line
|
||||
$local_F = 0;
|
||||
}
|
||||
$gcode .= $path->gcode($self->extruder, $e, $F,
|
||||
$self->shift_x - $self->extruder->extruder_offset->[X],
|
||||
$self->shift_y - $self->extruder->extruder_offset->[Y],
|
||||
$self->_extrusion_axis,
|
||||
$self->print_config->gcode_comments ? " ; $description" : "");
|
||||
|
||||
if ($self->enable_wipe) {
|
||||
$self->wipe_path($path->polyline->clone);
|
||||
$self->wipe_path->reverse;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue