From 56a118986ff55fc5d3b68c10276edbc66b040e28 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Thu, 23 Aug 2012 21:19:10 +0200
Subject: [PATCH] External motion was crossing still too much

---
 lib/Slic3r/GCode/MotionPlanner.pm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/Slic3r/GCode/MotionPlanner.pm b/lib/Slic3r/GCode/MotionPlanner.pm
index ef55f16cc9..4957f43450 100644
--- a/lib/Slic3r/GCode/MotionPlanner.pm
+++ b/lib/Slic3r/GCode/MotionPlanner.pm
@@ -12,7 +12,7 @@ has '_edges'        => (is => 'rw', default => sub { {} });  # node_idx => { nod
 has '_crossing_edges' => (is => 'rw', default => sub { {} });  # edge_idx => bool
 
 use List::Util qw(first);
-use Slic3r::Geometry qw(scale epsilon nearest_point);
+use Slic3r::Geometry qw(A B scale epsilon nearest_point);
 use Slic3r::Geometry::Clipper qw(diff_ex JT_MITER);
 
 # clearance (in mm) from the perimeters
@@ -98,9 +98,19 @@ sub BUILD {
         )} > 0;
     };
     
-    # lines connecting outer polygons are visible
     {
         my @outer = (map @$_, @{$self->_outer});
+        
+        # lines of outer polygons connect visible points
+        for my $i (0 .. $#outer) {
+            foreach my $line ($outer[$i]->lines) {
+                my $dist = $line->length;
+                $edges->{$line->[A]}{$line->[B]} = $dist;
+                $edges->{$line->[B]}{$line->[A]} = $dist;
+            }
+        }
+        
+        # lines connecting outer polygons are visible
         for my $i (0 .. $#outer) {
             for my $j (($i+1) .. $#outer) {
                 for my $m (0 .. $#{$outer[$i]}) {
@@ -163,7 +173,7 @@ sub BUILD {
             lines           => \@lines,
             points          => [ values %{$self->_pointmap} ],
             no_arrows       => 1,
-            #polygons        => [ map @$_, @{$self->islands} ],
+            polygons        => [ map @$_, @{$self->islands} ],
             #red_polygons    => [ map $_->holes, map @$_, @{$self->_inner} ],
             #white_polygons    => [ map @$_, @{$self->_outer} ],
         );