From 993fcd918288669fb447ae5eefdc798f12143251 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Fri, 10 May 2013 13:51:28 +0200
Subject: [PATCH] Revert "Smarter ordering of brim loops. #687" until new
 Math::Clipper is out

This reverts commit 4aad2f6243e1a3d0503a048536365492f3bc2e14.
---
 lib/Slic3r/Geometry/Clipper.pm | 10 +--------
 lib/Slic3r/Print.pm            | 37 +++++++---------------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/lib/Slic3r/Geometry/Clipper.pm b/lib/Slic3r/Geometry/Clipper.pm
index fb0fa242e..b1981a3be 100644
--- a/lib/Slic3r/Geometry/Clipper.pm
+++ b/lib/Slic3r/Geometry/Clipper.pm
@@ -6,7 +6,7 @@ require Exporter;
 our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(safety_offset safety_offset_ex offset offset_ex collapse_ex
     diff_ex diff union_ex intersection_ex xor_ex PFT_EVENODD JT_MITER JT_ROUND
-    JT_SQUARE is_counter_clockwise union_pt);
+    JT_SQUARE is_counter_clockwise);
 
 use Math::Clipper 1.17 qw(:cliptypes :polyfilltypes :jointypes is_counter_clockwise area);
 use Slic3r::Geometry qw(scale);
@@ -78,14 +78,6 @@ sub union_ex {
     ];
 }
 
-sub union_pt {
-    my ($polygons, $jointype, $safety_offset) = @_;
-    $jointype = PFT_NONZERO unless defined $jointype;
-    $clipper->clear;
-    $clipper->add_subject_polygons($safety_offset ? safety_offset($polygons) : $polygons);
-    return $clipper->pt_execute(CT_UNION, $jointype, $jointype);
-}
-
 sub intersection_ex {
     my ($subject, $clip, $jointype, $safety_offset) = @_;
     $jointype = PFT_NONZERO unless defined $jointype;
diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index c04e3b28b..5ddfd2ed0 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -6,8 +6,8 @@ use File::Spec;
 use List::Util qw(max first);
 use Math::ConvexHull::MonotoneChain qw(convex_hull);
 use Slic3r::ExtrusionPath ':roles';
-use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN PI scale unscale move_points nearest_point chained_path_items);
-use Slic3r::Geometry::Clipper qw(diff_ex union_ex union_pt intersection_ex offset JT_ROUND JT_SQUARE PFT_EVENODD);
+use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN PI scale unscale move_points nearest_point);
+use Slic3r::Geometry::Clipper qw(diff_ex union_ex intersection_ex offset JT_ROUND JT_SQUARE);
 use Time::HiRes qw(gettimeofday tv_interval);
 
 has 'config'                 => (is => 'rw', default => sub { Slic3r::Config->new_from_defaults }, trigger => 1);
@@ -673,39 +673,16 @@ sub make_brim {
         push @islands, map $_->unpack->split_at_first_point->polyline->grow($grow_distance), @{$self->skirt};
     }
     
-    my @loops = ();
     my $num_loops = sprintf "%.0f", $Slic3r::Config->brim_width / $flow->width;
     for my $i (reverse 1 .. $num_loops) {
         # JT_SQUARE ensures no vertex is outside the given offset distance
-        # -0.5 because islands are not represented by their centerlines
+        push @{$self->brim}, Slic3r::ExtrusionLoop->pack(
+            polygon         => Slic3r::Polygon->new($_),
+            role            => EXTR_ROLE_SKIRT,
+            flow_spacing    => $flow->spacing,
+        ) for Slic3r::Geometry::Clipper::offset(\@islands, ($i - 0.5) * $flow->scaled_spacing, undef, JT_SQUARE); # -0.5 because islands are not represented by their centerlines
         # TODO: we need the offset inwards/offset outwards logic to avoid overlapping extrusions
-        push @loops, offset(\@islands, ($i - 0.5) * $flow->scaled_spacing, undef, JT_SQUARE);
     }
-    
-    # prepare a subroutine to traverse the tree and return inner perimeters first
-    my $traverse;
-    $traverse = sub {
-        my ($loops) = @_;
-        
-        # use a nearest neighbor search to order these children
-        # TODO: supply second argument to chained_path_items() too?
-        @$loops = @{chained_path_items(
-            [ map [ ($_->{outer} ? $_->{outer}[0] : $_->{hole}[0]), $_ ], @$loops ],
-        )};
-        
-        my @polygons = ();
-        foreach my $loop (@$loops) {
-            push @polygons, $traverse->($loop->{children});
-            push @polygons, Slic3r::ExtrusionLoop->pack(
-                polygon         => Slic3r::Polygon->new($loop->{outer} // [ reverse @{$loop->{hole}} ]),
-                role            => EXTR_ROLE_SKIRT,
-                flow_spacing    => $flow->spacing,
-            );
-        }
-        return @polygons;
-    };
-    
-    @{$self->brim} = reverse $traverse->( union_pt(\@loops, PFT_EVENODD) );
 }
 
 sub write_gcode {