3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 04:31:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Ported same_line() to XS

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-11-06 19:38:10 +01:00
parent b5aaeb9b12
commit d8e098ab0e
5 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Slic3r/ExPolygon.pm
View file

@ -7,7 +7,7 @@ use warnings;
use Boost::Geometry::Utils;
use List::Util qw(first);
use Math::Geometry::Voronoi;
use Slic3r::Geometry qw(X Y A B point_in_polygon same_line epsilon scaled_epsilon);
use Slic3r::Geometry qw(X Y A B point_in_polygon epsilon scaled_epsilon);
use Slic3r::Geometry::Clipper qw(union_ex);
sub wkt {
@ -60,9 +60,9 @@ sub encloses_line {
my $clip = $self->clip_line($line);
if (!defined $tolerance) {
# optimization
return @$clip == 1 && same_line($clip->[0]->pp, $line->pp);
return @$clip == 1 && $clip->[0]->coincides_with($line);
} else {
return @$clip == 1 && abs(Boost::Geometry::Utils::linestring_length($clip->[0]->pp) - $line->length) < $tolerance;
return @$clip == 1 && abs($clip->[0]->length - $line->length) < $tolerance;
}
}

7
lib/Slic3r/Geometry.pm
View file

@ -14,7 +14,7 @@ our @EXPORT_OK = qw(
polygon_has_vertex polyline_length can_connect_points deg2rad rad2deg
rotate_points move_points clip_segment_polygon
sum_vectors multiply_vector subtract_vectors dot perp polygon_points_visibility
line_intersection bounding_box bounding_box_intersect same_point same_line
line_intersection bounding_box bounding_box_intersect same_point
longest_segment angle3points three_points_aligned line_direction
polyline_remove_parallel_continuous_edges polyline_remove_acute_vertices
polygon_remove_acute_vertices polygon_remove_parallel_continuous_edges
@ -112,11 +112,6 @@ sub same_point {
return $p1->[X] == $p2->[X] && $p1->[Y] == $p2->[Y];
}
sub same_line {
my ($line1, $line2) = @_;
return same_point($line1->[A], $line2->[A]) && same_point($line1->[B], $line2->[B]);
}
sub distance_between_points {
my ($p1, $p2) = @_;
return sqrt((($p1->[X] - $p2->[X])**2) + ($p1->[Y] - $p2->[Y])**2);