3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use remove_coinciding_points before convex_hull

Browse source 
convex_hull returns polygons with sharp concaves sometimes when
duplicate points are present
This commit is contained in:
Mike Sheldrake 2012-09-27 06:47:38 -07:00
parent 02b11fb49a
commit 4b91496edd
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Slic3r/GUI/Plater.pm
View file

@ -999,7 +999,7 @@ package Slic3r::GUI::Plater::Object;
use Moo; use Moo;
use Math::ConvexHull qw(convex_hull); use Math::ConvexHull qw(convex_hull);
use Slic3r::Geometry qw(X Y); use Slic3r::Geometry qw(X Y remove_coinciding_points);
has 'name' => (is => 'rw', required => 1); has 'name' => (is => 'rw', required => 1);
has 'input_file' => (is => 'rw', required => 1); has 'input_file' => (is => 'rw', required => 1);
@ -1034,6 +1034,7 @@ sub make_thumbnail {
my %params = @_; my %params = @_;
my @points = map [ @$_[X,Y] ], @{$self->mesh->vertices}; my @points = map [ @$_[X,Y] ], @{$self->mesh->vertices};
remove_coinciding_points(\@points);
my $convex_hull = Slic3r::Polygon->new(convex_hull(\@points)); my $convex_hull = Slic3r::Polygon->new(convex_hull(\@points));
for (@$convex_hull) { for (@$convex_hull) {
@$_ = map $_ * $params{scaling_factor}, @$_; @$_ = map $_ * $params{scaling_factor}, @$_;

4
lib/Slic3r/Print.pm
View file

@ -6,7 +6,7 @@ use File::Spec;
use List::Util qw(max); use List::Util qw(max);
use Math::ConvexHull 1.0.4 qw(convex_hull); use Math::ConvexHull 1.0.4 qw(convex_hull);
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN PI scale unscale move_points nearest_point); use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN PI scale unscale move_points nearest_point remove_coinciding_points);
use Slic3r::Geometry::Clipper qw(diff_ex union_ex intersection_ex offset JT_ROUND JT_SQUARE); use Slic3r::Geometry::Clipper qw(diff_ex union_ex intersection_ex offset JT_ROUND JT_SQUARE);
use Time::HiRes qw(gettimeofday tv_interval); use Time::HiRes qw(gettimeofday tv_interval);
@ -139,6 +139,7 @@ sub validate {
my $clearance; my $clearance;
{ {
my @points = map [ @$_[X,Y] ], map @{$_->vertices}, @{$self->objects->[$obj_idx]->meshes}; my @points = map [ @$_[X,Y] ], map @{$_->vertices}, @{$self->objects->[$obj_idx]->meshes};
remove_coinciding_points(\@points);
my $convex_hull = Slic3r::Polygon->new(convex_hull(\@points)); my $convex_hull = Slic3r::Polygon->new(convex_hull(\@points));
$clearance = +($convex_hull->offset(scale $Slic3r::Config->extruder_clearance_radius / 2, 1, JT_ROUND))[0]; $clearance = +($convex_hull->offset(scale $Slic3r::Config->extruder_clearance_radius / 2, 1, JT_ROUND))[0];
} }
@ -552,6 +553,7 @@ sub make_skirt {
return if @points < 3; # at least three points required for a convex hull return if @points < 3; # at least three points required for a convex hull
# find out convex hull # find out convex hull
remove_coinciding_points(\@points);
my $convex_hull = convex_hull(\@points); my $convex_hull = convex_hull(\@points);
# draw outlines from outside to inside # draw outlines from outside to inside