diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm index 72280be06..958fb4411 100644 --- a/lib/Slic3r/GCode.pm +++ b/lib/Slic3r/GCode.pm @@ -5,7 +5,7 @@ use List::Util qw(min max first); use Slic3r::ExtrusionLoop ':roles'; use Slic3r::ExtrusionPath ':roles'; use Slic3r::Flow ':roles'; -use Slic3r::Geometry qw(epsilon scale unscale scaled_epsilon points_coincide PI X Y B); +use Slic3r::Geometry qw(epsilon scale unscale PI X Y B); use Slic3r::Geometry::Clipper qw(union_ex offset_ex); use Slic3r::Surface ':types'; diff --git a/lib/Slic3r/Geometry.pm b/lib/Slic3r/Geometry.pm index 18c05dfa5..8be03162f 100644 --- a/lib/Slic3r/Geometry.pm +++ b/lib/Slic3r/Geometry.pm @@ -13,7 +13,7 @@ our @EXPORT_OK = qw( point_along_segment polygon_segment_having_point polygon_has_subsegment deg2rad rad2deg rotate_points move_points - dot perp polygon_points_visibility + dot perp line_intersection bounding_box bounding_box_intersect angle3points chained_path chained_path_from collinear scale unscale @@ -291,19 +291,6 @@ sub perp { return $u->[X] * $v->[Y] - $u->[Y] * $v->[X]; } -sub polygon_points_visibility { - my ($polygon, $p1, $p2) = @_; - - my $our_line = [ $p1, $p2 ]; - foreach my $line (polygon_lines($polygon)) { - my $intersection = line_intersection($our_line, $line, 1) // next; - next if grep points_coincide($intersection, $_), $p1, $p2; - return 0; - } - - return 1; -} - sub line_intersects_any { my ($line, $lines) = @_; for (@$lines) { diff --git a/lib/Slic3r/Layer.pm b/lib/Slic3r/Layer.pm index 694f7050d..463413b55 100644 --- a/lib/Slic3r/Layer.pm +++ b/lib/Slic3r/Layer.pm @@ -3,7 +3,6 @@ use strict; use warnings; use List::Util qw(first); -use Slic3r::Geometry qw(scale chained_path); use Slic3r::Geometry::Clipper qw(union_ex intersection_ex); # the following two were previously generated by Moo diff --git a/lib/Slic3r/Layer/Region.pm b/lib/Slic3r/Layer/Region.pm index 1c7838219..357f63645 100644 --- a/lib/Slic3r/Layer/Region.pm +++ b/lib/Slic3r/Layer/Region.pm @@ -6,7 +6,7 @@ use List::Util qw(sum first); use Slic3r::ExtrusionLoop ':roles'; use Slic3r::ExtrusionPath ':roles'; use Slic3r::Flow ':roles'; -use Slic3r::Geometry qw(PI A B scale unscale chained_path points_coincide); +use Slic3r::Geometry qw(PI A B scale unscale chained_path); use Slic3r::Geometry::Clipper qw(union_ex diff_ex intersection_ex offset offset_ex offset2 offset2_ex union_pt diff intersection union diff intersection_ppl diff_ppl); diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm index b4510220a..08d4a449c 100644 --- a/lib/Slic3r/Print.pm +++ b/lib/Slic3r/Print.pm @@ -7,9 +7,9 @@ use File::Spec; use List::Util qw(min max first sum); use Slic3r::ExtrusionPath ':roles'; use Slic3r::Flow ':roles'; -use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN MAX PI scale unscale move_points chained_path +use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN MAX PI scale unscale chained_path convex_hull); -use Slic3r::Geometry::Clipper qw(diff_ex union_ex union_pt intersection_ex intersection offset +use Slic3r::Geometry::Clipper qw(diff_ex union_ex intersection_ex intersection offset offset2 union union_pt_chained JT_ROUND JT_SQUARE); use Slic3r::Print::State ':steps'; diff --git a/lib/Slic3r/Print/Object.pm b/lib/Slic3r/Print/Object.pm index a1aaff307..d7878e25a 100644 --- a/lib/Slic3r/Print/Object.pm +++ b/lib/Slic3r/Print/Object.pm @@ -4,7 +4,7 @@ use warnings; use List::Util qw(min max sum first); use Slic3r::Flow ':roles'; -use Slic3r::Geometry qw(X Y Z PI scale unscale deg2rad rad2deg scaled_epsilon chained_path); +use Slic3r::Geometry qw(X Y Z PI scale unscale chained_path); use Slic3r::Geometry::Clipper qw(diff diff_ex intersection intersection_ex union union_ex offset offset_ex offset2 offset2_ex CLIPPER_OFFSET_SCALE JT_MITER); use Slic3r::Print::State ':steps';