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

Fix of the last clipperutil safety_offset modification. Handle safety

Browse source 
offset of holes separately, don't forget to reverse them before / after.
This commit is contained in:
bubnikv 2016-11-29 19:26:26 +01:00
parent 792856a505
commit 85aa802d4b
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xs/src/libslic3r/ClipperUtils.cpp
View file

@ -1062,8 +1062,12 @@ void safety_offset(ClipperLib::Paths* paths)
#endif /* CLIPPER_UTILS_DEBUG */ #endif /* CLIPPER_UTILS_DEBUG */
ClipperLib::Paths out; ClipperLib::Paths out;
for (size_t i = 0; i < paths->size(); ++ i) { for (size_t i = 0; i < paths->size(); ++ i) {
ClipperLib::Path &path = (*paths)[i];
co.Clear(); co.Clear();
co.MiterLimit = 2; co.MiterLimit = 2;
bool ccw = ClipperLib::Orientation(path);
if (! ccw)
std::reverse(path.begin(), path.end());
{ {
PROFILE_BLOCK(safety_offset_AddPaths); PROFILE_BLOCK(safety_offset_AddPaths);
co.AddPath((*paths)[i], ClipperLib::jtMiter, ClipperLib::etClosedPolygon); co.AddPath((*paths)[i], ClipperLib::jtMiter, ClipperLib::etClosedPolygon);
@ -1072,7 +1076,12 @@ void safety_offset(ClipperLib::Paths* paths)
PROFILE_BLOCK(safety_offset_Execute); PROFILE_BLOCK(safety_offset_Execute);
// offset outside by 10um // offset outside by 10um
ClipperLib::Paths out_this; ClipperLib::Paths out_this;
co.Execute(out_this, 10.f * float(CLIPPER_OFFSET_SCALE)); co.Execute(out_this, ccw ? 10.f * float(CLIPPER_OFFSET_SCALE) : -10.f * float(CLIPPER_OFFSET_SCALE));
if (! ccw) {
// Reverse the resulting contours once again.
for (ClipperLib::Paths::iterator it = out_this.begin(); it != out_this.end(); ++ it)
std::reverse(it->begin(), it->end());
}
if (out.empty()) if (out.empty())
out = std::move(out_this); out = std::move(out_this);
else else