mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-11-01 21:21:10 -06:00
Merge branch 'better-brim'
Conflicts: lib/Slic3r/Geometry/Clipper.pm lib/Slic3r/Print.pm
This commit is contained in:
commit
7953dcfb12
5 changed files with 73 additions and 29 deletions
12
t/clipper.t
12
t/clipper.t
|
|
@ -30,21 +30,22 @@ use Math::Clipper ':all';
|
|||
$clipper->add_subject_polygons([ $square, $hole_in_square ]);
|
||||
$clipper->add_clip_polygons([ $square2 ]);
|
||||
my $intersection = $clipper->ex_execute(CT_INTERSECTION, PFT_NONZERO, PFT_NONZERO);
|
||||
|
||||
is_deeply $intersection, [
|
||||
{
|
||||
holes => [
|
||||
[
|
||||
[14, 14],
|
||||
[14, 16],
|
||||
[16, 16],
|
||||
[16, 14],
|
||||
[14, 14],
|
||||
],
|
||||
],
|
||||
outer => [
|
||||
[10, 18],
|
||||
[10, 12],
|
||||
[20, 12],
|
||||
[20, 18],
|
||||
[10, 18],
|
||||
[10, 12],
|
||||
],
|
||||
},
|
||||
], 'hole is preserved after intersection';
|
||||
|
|
@ -60,14 +61,15 @@ use Math::Clipper ':all';
|
|||
my $clipper = Math::Clipper->new;
|
||||
$clipper->add_subject_polygons([ $contour1, $contour2, $hole ]);
|
||||
my $union = $clipper->ex_execute(CT_UNION, PFT_NONZERO, PFT_NONZERO);
|
||||
is_deeply $union, [{ holes => [], outer => [ [0,40], [0,0], [40,0], [40,40] ] }],
|
||||
|
||||
is_deeply $union, [{ holes => [], outer => [ [40,0], [40,40], [0,40], [0,0] ] }],
|
||||
'union of two ccw and one cw is a contour with no holes';
|
||||
|
||||
$clipper->clear;
|
||||
$clipper->add_subject_polygons([ $contour1, $contour2 ]);
|
||||
$clipper->add_clip_polygons([ $hole ]);
|
||||
my $diff = $clipper->ex_execute(CT_DIFFERENCE, PFT_NONZERO, PFT_NONZERO);
|
||||
is_deeply $diff, [{ holes => [[ [15,25], [25,25], [25,15], [15,15] ]], outer => [ [0,40], [0,0], [40,0], [40,40] ] }],
|
||||
is_deeply $diff, [{ holes => [[ [15,15], [15,25], [25,25], [25,15] ]], outer => [ [40,0], [40,40], [0,40], [0,0] ] }],
|
||||
'difference of a cw from two ccw is a contour with one hole';
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue