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

Some Clipper optimizations

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-03-31 19:40:25 +02:00
parent 0d6ff22e19
commit 1187f4846d
3 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,9 +5,9 @@ use utf8;
use File::Basename qw(basename dirname); use File::Basename qw(basename dirname);
use List::Util qw(max sum first); use List::Util qw(max sum first);
use Math::Clipper qw(offset JT_ROUND);
use Math::ConvexHull::MonotoneChain qw(convex_hull); use Math::ConvexHull::MonotoneChain qw(convex_hull);
use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN MAX); use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 MIN MAX);
use Slic3r::Geometry::Clipper qw(offset JT_ROUND);
use threads::shared qw(shared_clone); use threads::shared qw(shared_clone);
use Wx qw(:bitmap :brush :button :cursor :dialog :filedialog :font :keycode :icon :id :listctrl :misc :panel :pen :sizer :toolbar :window); use Wx qw(:bitmap :brush :button :cursor :dialog :filedialog :font :keycode :icon :id :listctrl :misc :panel :pen :sizer :toolbar :window);
use Wx::Event qw(EVT_BUTTON EVT_COMMAND EVT_KEY_DOWN EVT_LIST_ITEM_ACTIVATED EVT_LIST_ITEM_DESELECTED EVT_LIST_ITEM_SELECTED EVT_MOUSE_EVENTS EVT_PAINT EVT_TOOL EVT_CHOICE); use Wx::Event qw(EVT_BUTTON EVT_COMMAND EVT_KEY_DOWN EVT_LIST_ITEM_ACTIVATED EVT_LIST_ITEM_DESELECTED EVT_LIST_ITEM_SELECTED EVT_MOUSE_EVENTS EVT_PAINT EVT_TOOL EVT_CHOICE);

34
lib/Slic3r/Geometry/Clipper.pm
View file

@ -14,12 +14,13 @@ our $clipper = Math::Clipper->new;
sub safety_offset { sub safety_offset {
my ($polygons, $factor) = @_; my ($polygons, $factor) = @_;
return Math::Clipper::offset($polygons, $factor // (scale 1e-05), 100000, JT_MITER, 2); return Math::Clipper::int_offset($polygons, $factor // (scale 1e-05), 100000, JT_MITER, 2);
} }
sub safety_offset_ex { sub safety_offset_ex {
# offset polygons and then apply holes to the right contours my ($polygons, $factor) = @_;
return @{ union_ex([ safety_offset(@_) ]) }; return map Slic3r::ExPolygon->new($_),
@{Math::Clipper::ex_int_offset($polygons, $factor // (scale 1e-05), 100000, JT_MITER, 2)};
} }
sub offset { sub offset {
@ -28,13 +29,18 @@ sub offset {
$joinType //= JT_MITER; $joinType //= JT_MITER;
$miterLimit //= 3; $miterLimit //= 3;
my $offsets = Math::Clipper::offset($polygons, $distance, $scale, $joinType, $miterLimit); my $offsets = Math::Clipper::int_offset($polygons, $distance, $scale, $joinType, $miterLimit);
return @$offsets; return @$offsets;
} }
sub offset_ex { sub offset_ex {
# offset polygons and then apply holes to the right contours my ($polygons, $distance, $scale, $joinType, $miterLimit) = @_;
return @{ union_ex([ offset(@_) ]) }; $scale ||= 100000;
$joinType //= JT_MITER;
$miterLimit //= 3;
my $offsets = Math::Clipper::ex_int_offset($polygons, $distance, $scale, $joinType, $miterLimit);
return map Slic3r::ExPolygon->new($_), @$offsets;
} }
sub diff_ex { sub diff_ex {
@ -96,13 +102,19 @@ sub xor_ex {
]; ];
} }
sub ex_int_offset2 {
my ($polygons, $delta1, $delta2, $scale, $joinType, $miterLimit) = @_;
$scale ||= 100000;
$joinType //= JT_MITER;
$miterLimit //= 3;
my $offsets = Math::Clipper::ex_int_offset2($polygons, $delta1, $delta2, $scale, $joinType, $miterLimit);
return map Slic3r::ExPolygon->new($_), @$offsets;
}
sub collapse_ex { sub collapse_ex {
my ($polygons, $width) = @_; my ($polygons, $width) = @_;
my @result = offset( return ex_int_offset2($polygons, -$width/2, +$width/2);
[ offset($polygons, -$width/2,) ],
+$width/2,
);
return union_ex([@result]);
} }
sub simplify_polygon { sub simplify_polygon {

16
lib/Slic3r/Layer/Region.pm
View file

@ -96,12 +96,9 @@ sub make_surfaces {
# detect thin walls by offsetting slices by half extrusion inwards # detect thin walls by offsetting slices by half extrusion inwards
{ {
my $width = $self->perimeter_flow->scaled_width; my $width = $self->perimeter_flow->scaled_width;
my $outgrown = union_ex([ my $outgrown = [
Slic3r::Geometry::Clipper::offset( Slic3r::Geometry::Clipper::ex_int_offset2([ map @$_, map $_->expolygon, @{$self->slices} ], -$width, +$width),
[Slic3r::Geometry::Clipper::offset([ map @$_, map $_->expolygon, @{$self->slices} ], -$width)], ];
+$width,
),
]);
my $diff = diff_ex( my $diff = diff_ex(
[ map $_->p, @{$self->slices} ], [ map $_->p, @{$self->slices} ],
[ map @$_, @$outgrown ], [ map @$_, @$outgrown ],
@ -230,12 +227,7 @@ sub make_perimeters {
# offsetting a polygon can result in one or many offset polygons # offsetting a polygon can result in one or many offset polygons
my @new_offsets = (); my @new_offsets = ();
foreach my $expolygon (@last_offsets) { foreach my $expolygon (@last_offsets) {
my @offsets = @{union_ex([ my @offsets = Slic3r::Geometry::Clipper::ex_int_offset2($expolygon, -1.5*$spacing, +0.5*$spacing);
Slic3r::Geometry::Clipper::offset(
[Slic3r::Geometry::Clipper::offset($expolygon, -1.5*$spacing)],
+0.5*$spacing,
),
])};
push @new_offsets, @offsets; push @new_offsets, @offsets;
# where the above check collapses the expolygon, then there's no room for an inner loop # where the above check collapses the expolygon, then there's no room for an inner loop