From bc0b9e1b7291ce9565c1843f987ea6ddf24b8a59 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sun, 13 Oct 2013 16:20:01 +0200
Subject: [PATCH] Don't combine retract and travel anymore when using G0. #1289

---
 lib/Slic3r/GCode.pm | 72 +++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 45 deletions(-)

diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm
index 0b57b4258..76e606828 100644
--- a/lib/Slic3r/GCode.pm
+++ b/lib/Slic3r/GCode.pm
@@ -404,7 +404,7 @@ sub travel_to {
         $gcode .= $self->G0($point, undef, 0, $comment || "");
     } elsif (!$self->config->avoid_crossing_perimeters || $self->straight_once) {
         $self->straight_once(0);
-        $gcode .= $self->retract(travel_to => $point);
+        $gcode .= $self->retract;
         $self->speed('travel');
         $gcode .= $self->G0($point, undef, 0, $comment || "");
     } else {
@@ -448,7 +448,7 @@ sub _plan {
     }
     
     # do the retract (the travel_to argument is broken)
-    $gcode .= $self->retract(travel_to => $point) if $need_retract;
+    $gcode .= $self->retract if $need_retract;
     
     # append the actual path and return
     $self->speed('travel');
@@ -484,52 +484,34 @@ sub retract {
         ? undef
         : [undef, $self->z + $self->extruder->retract_lift, 0, 'lift plate during travel'];
     
-    if (($self->config->g0 || $self->config->gcode_flavor eq 'mach3') && $params{travel_to}) {
+    # check that we have a positive wipe length
+    if ($wipe_path && (my $total_wipe_length = $wipe_path->length)) {
         $self->speed('travel');
-        if ($lift) {
-            # combine lift and retract
-            $lift->[2] = $retract->[2];
-            $gcode .= $self->G0(@$lift);
-        } else {
-            # combine travel and retract
-            my $travel = [$params{travel_to}, undef, $retract->[2], "travel and $comment"];
-            $gcode .= $self->G0(@$travel);
+        
+        # subdivide the retraction
+        my $retracted = 0;
+        for (1 .. $#$wipe_path) {
+            my $segment_length = $wipe_path->[$_-1]->distance_to($wipe_path->[$_]);
+            $retracted += my $e = $retract->[2] * ($segment_length / $total_wipe_length);
+            $gcode .= $self->G1($wipe_path->[$_], undef, $e, $retract->[3] . ";_WIPE");
+        }
+        if ($retracted > $retract->[2]) {
+            # if we retracted less than we had to, retract the remainder
+            # TODO: add regression test
+            $gcode .= $self->G1(undef, undef, $retract->[2] - $retracted, $comment);
         }
-    } elsif (($self->config->g0 || $self->config->gcode_flavor eq 'mach3') && defined $params{move_z}) {
-        # combine Z change and retraction
-        $self->speed('travel');
-        my $travel = [undef, $params{move_z}, $retract->[2], "change layer and $comment"];
-        $gcode .= $self->G0(@$travel);
     } else {
-        # check that we have a positive wipe length
-        if ($wipe_path && (my $total_wipe_length = $wipe_path->length)) {
-            $self->speed('travel');
-            
-            # subdivide the retraction
-            my $retracted = 0;
-            for (1 .. $#$wipe_path) {
-                my $segment_length = $wipe_path->[$_-1]->distance_to($wipe_path->[$_]);
-                $retracted += my $e = $retract->[2] * ($segment_length / $total_wipe_length);
-                $gcode .= $self->G1($wipe_path->[$_], undef, $e, $retract->[3] . ";_WIPE");
-            }
-            if ($retracted > $retract->[2]) {
-                # if we retracted less than we had to, retract the remainder
-                # TODO: add regression test
-                $gcode .= $self->G1(undef, undef, $retract->[2] - $retracted, $comment);
-            }
-        } else {
-            $self->speed('retract');
-            $gcode .= $self->G1(@$retract);
-        }
-        if (!$self->lifted) {
-            $self->speed('travel');
-            if (defined $params{move_z} && $self->extruder->retract_lift > 0) {
-                my $travel = [undef, $params{move_z} + $self->extruder->retract_lift, 0, 'move to next layer (' . $self->layer->id . ') and lift'];
-                $gcode .= $self->G0(@$travel);
-                $self->lifted($self->extruder->retract_lift);
-            } elsif ($lift) {
-                $gcode .= $self->G1(@$lift);
-            }
+        $self->speed('retract');
+        $gcode .= $self->G1(@$retract);
+    }
+    if (!$self->lifted) {
+        $self->speed('travel');
+        if (defined $params{move_z} && $self->extruder->retract_lift > 0) {
+            my $travel = [undef, $params{move_z} + $self->extruder->retract_lift, 0, 'move to next layer (' . $self->layer->id . ') and lift'];
+            $gcode .= $self->G0(@$travel);
+            $self->lifted($self->extruder->retract_lift);
+        } elsif ($lift) {
+            $gcode .= $self->G1(@$lift);
         }
     }
     $self->extruder->retracted($self->extruder->retracted + $length);