3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 12:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Ported diff() and intersection()

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-07-17 01:21:30 +02:00
parent c7b6818ccf
commit 0efea9e442
4 changed files with 72 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,18 +25,6 @@ sub safety_offset_ex {
@{Math::Clipper::ex_int_offset(_convert($polygons), $factor // (scale 1e-05), 100000, JT_MITER, 2)}; @{Math::Clipper::ex_int_offset(_convert($polygons), $factor // (scale 1e-05), 100000, JT_MITER, 2)};
} }
sub diff {
my ($subject, $clip, $safety_offset) = @_;
$clipper->clear;
$clipper->add_subject_polygons(_convert($subject));
$clipper->add_clip_polygons($safety_offset ? _convert(safety_offset($clip)) : _convert($clip));
return [
map Slic3r::Polygon->new(@$_),
@{ $clipper->execute(CT_DIFFERENCE, PFT_NONZERO, PFT_NONZERO) },
];
}
sub union_pt { sub union_pt {
my ($polygons, $jointype, $safety_offset) = @_; my ($polygons, $jointype, $safety_offset) = @_;
$jointype = PFT_NONZERO unless defined $jointype; $jointype = PFT_NONZERO unless defined $jointype;
@ -45,18 +33,6 @@ sub union_pt {
return $clipper->pt_execute(CT_UNION, $jointype, $jointype); return $clipper->pt_execute(CT_UNION, $jointype, $jointype);
} }
sub intersection {
my ($subject, $clip, $jointype, $safety_offset) = @_;
$jointype = PFT_NONZERO unless defined $jointype;
$clipper->clear;
$clipper->add_subject_polygons(_convert($subject));
$clipper->add_clip_polygons($safety_offset ? _convert(safety_offset($clip)) : _convert($clip));
return [
map Slic3r::Polygon->new(@$_),
@{ $clipper->execute(CT_INTERSECTION, $jointype, $jointype) },
];
}
sub collapse_ex { sub collapse_ex {
my ($polygons, $width) = @_; my ($polygons, $width) = @_;
return offset2_ex($polygons, -$width/2, +$width/2); return offset2_ex($polygons, -$width/2, +$width/2);

46
xs/src/ClipperUtils.cpp
View file

@ -192,8 +192,9 @@ offset2_ex(Slic3r::Polygons &polygons, Slic3r::ExPolygons &retval, const float d
delete output; delete output;
} }
inline void _clipper_ex(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, template <class T>
Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset) void _clipper_do(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, T &retval, bool safety_offset)
{ {
// read input // read input
ClipperLib::Polygons* input_subject = new ClipperLib::Polygons(); ClipperLib::Polygons* input_subject = new ClipperLib::Polygons();
@ -220,37 +221,60 @@ inline void _clipper_ex(ClipperLib::ClipType clipType, Slic3r::Polygons &subject
clipper.AddPolygons(*input_clip, ClipperLib::ptClip); clipper.AddPolygons(*input_clip, ClipperLib::ptClip);
delete input_clip; delete input_clip;
// perform operation
clipper.Execute(clipType, retval, ClipperLib::pftNonZero, ClipperLib::pftNonZero);
}
void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset)
{
// perform operation
ClipperLib::Polygons* output = new ClipperLib::Polygons();
_clipper_do<ClipperLib::Polygons>(clipType, subject, clip, *output, safety_offset);
// convert into Polygons
ClipperPolygons_to_Slic3rPolygons(*output, retval);
delete output;
}
void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset)
{
// perform operation // perform operation
ClipperLib::PolyTree* polytree = new ClipperLib::PolyTree(); ClipperLib::PolyTree* polytree = new ClipperLib::PolyTree();
clipper.Execute(clipType, *polytree, ClipperLib::pftNonZero, ClipperLib::pftNonZero); _clipper_do<ClipperLib::PolyTree>(clipType, subject, clip, *polytree, safety_offset);
// convert into ExPolygons // convert into ExPolygons
PolyTreeToExPolygons(*polytree, retval); PolyTreeToExPolygons(*polytree, retval);
delete polytree; delete polytree;
} }
void template <class T>
diff_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset) void diff(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset)
{ {
_clipper_ex(ClipperLib::ctDifference, subject, clip, retval, safety_offset); _clipper(ClipperLib::ctDifference, subject, clip, retval, safety_offset);
} }
template void diff<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset);
template void diff<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset);
void intersection_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, template <class T>
bool safety_offset) void intersection(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset)
{ {
_clipper_ex(ClipperLib::ctIntersection, subject, clip, retval, safety_offset); _clipper(ClipperLib::ctIntersection, subject, clip, retval, safety_offset);
} }
template void intersection<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset);
template void intersection<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset);
void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval,
bool safety_offset) bool safety_offset)
{ {
_clipper_ex(ClipperLib::ctXor, subject, clip, retval, safety_offset); _clipper(ClipperLib::ctXor, subject, clip, retval, safety_offset);
} }
void union_ex(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset) void union_ex(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset)
{ {
Slic3r::Polygons p; Slic3r::Polygons p;
_clipper_ex(ClipperLib::ctUnion, subject, p, retval, safety_offset); _clipper(ClipperLib::ctUnion, subject, p, retval, safety_offset);
} }
} }

21
xs/src/ClipperUtils.hpp
View file

@ -43,14 +43,23 @@ void offset2_ex(Slic3r::Polygons &polygons, Slic3r::ExPolygons &retval, const fl
const float delta2, double scale = 100000, ClipperLib::JoinType joinType = ClipperLib::jtMiter, const float delta2, double scale = 100000, ClipperLib::JoinType joinType = ClipperLib::jtMiter,
double miterLimit = 3); double miterLimit = 3);
inline void _clipper_ex(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, template <class T>
Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, void _clipper_do(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
bool safety_offset); Slic3r::Polygons &clip, T &retval, bool safety_offset);
void diff_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset = false); void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
void intersection_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset);
bool safety_offset = false); void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset);
template <class T>
void diff(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset);
template <class T>
void intersection(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset);
void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval,
bool safety_offset = false); bool safety_offset = false);
void union_ex(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset = false); void union_ex(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset = false);
} }

24
xs/xsp/Clipper.xsp
View file

@ -60,13 +60,33 @@ offset2_ex(polygons, delta1, delta2, scale = 100000, joinType = ClipperLib::jtMi
OUTPUT: OUTPUT:
RETVAL RETVAL
Polygons
diff(subject, clip, safety_offset = false)
Polygons subject
Polygons clip
bool safety_offset
CODE:
diff(subject, clip, RETVAL, safety_offset);
OUTPUT:
RETVAL
ExPolygons ExPolygons
diff_ex(subject, clip, safety_offset = false) diff_ex(subject, clip, safety_offset = false)
Polygons subject Polygons subject
Polygons clip Polygons clip
bool safety_offset bool safety_offset
CODE: CODE:
diff_ex(subject, clip, RETVAL, safety_offset); diff(subject, clip, RETVAL, safety_offset);
OUTPUT:
RETVAL
Polygons
intersection(subject, clip, safety_offset = false)
Polygons subject
Polygons clip
bool safety_offset
CODE:
intersection(subject, clip, RETVAL, safety_offset);
OUTPUT: OUTPUT:
RETVAL RETVAL
@ -76,7 +96,7 @@ intersection_ex(subject, clip, safety_offset = false)
Polygons clip Polygons clip
bool safety_offset bool safety_offset
CODE: CODE:
intersection_ex(subject, clip, RETVAL, safety_offset); intersection(subject, clip, RETVAL, safety_offset);
OUTPUT: OUTPUT:
RETVAL RETVAL