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

Optimizing manual unification.

Browse source
This commit is contained in:
tamasmeszaros 2019-03-26 15:05:57 +01:00
parent 221a4836fd
commit 1c6b25c053
2 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/ClipperUtils.hpp
View file

@ -28,8 +28,8 @@ namespace Slic3r {
//----------------------------------------------------------- //-----------------------------------------------------------
// legacy code from Clipper documentation // legacy code from Clipper documentation
void AddOuterPolyNodeToExPolygons(ClipperLib::PolyNode& polynode, Slic3r::ExPolygons& expolygons); void AddOuterPolyNodeToExPolygons(ClipperLib::PolyNode& polynode, Slic3r::ExPolygons *expolygons);
void PolyTreeToExPolygons(ClipperLib::PolyTree& polytree, Slic3r::ExPolygons& expolygons); Slic3r::ExPolygons PolyTreeToExPolygons(ClipperLib::PolyTree& polytree);
//----------------------------------------------------------- //-----------------------------------------------------------
ClipperLib::Path Slic3rMultiPoint_to_ClipperPath(const Slic3r::MultiPoint &input); ClipperLib::Path Slic3rMultiPoint_to_ClipperPath(const Slic3r::MultiPoint &input);
@ -228,4 +228,4 @@ Polygons top_level_islands(const Slic3r::Polygons &polygons);
} }
#endif #endif

65
src/libslic3r/SLAPrint.cpp
View file

@ -1676,17 +1676,26 @@ const ExPolygons &SLAPrint::PrintLayer::transformed_slice(SLADisplayOrientation
{ {
if (! m_trcache.empty()) return m_trcache; if (! m_trcache.empty()) return m_trcache;
size_t cap = 0; ClipperLib::Clipper clipper;
for (const SliceRecord& sr : m_slices) {
if(sr.print_obj()) {
size_t insts = sr.print_obj()->instances().size();
cap += insts * (sr.get_slice(soModel).size() +
sr.get_slice(soSupport).size());
}
}
Polygons allpolys; bool valid = true;
allpolys.reserve(cap); bool closed = true;
auto rotate = [](ClipperLib::Path& path, double rads) {
auto cosa = std::cos(rads);
auto sina = std::sin(rads);
for(auto& p : path) {
p.X = ClipperLib::cInt(p.X * cosa - p.Y * sina);
p.Y = ClipperLib::cInt(p.X * sina + p.Y * cosa);
}
};
auto translate = [](ClipperLib::Path& path, coord_t dx, coord_t dy)
{
for(auto& p : path) { p.X += dx; p.Y += dy; }
};
for (const SliceRecord& sr : m_slices) { for (const SliceRecord& sr : m_slices) {
const ExPolygons& objsl = sr.get_slice(soModel); const ExPolygons& objsl = sr.get_slice(soModel);
@ -1696,34 +1705,40 @@ const ExPolygons &SLAPrint::PrintLayer::transformed_slice(SLADisplayOrientation
for(const SLAPrintObject::Instance& tr : sr.print_obj()->instances()) for(const SLAPrintObject::Instance& tr : sr.print_obj()->instances())
{ {
Polygons polys; ClipperLib::Paths polys;
size_t polyscap = 0; size_t polyscap = 0;
for(const ExPolygon &p : objsl) polyscap += p.holes.size() + 1; for(const ExPolygon &p : objsl) polyscap += p.holes.size() + 1;
for(const ExPolygon &p : supsl) polyscap += p.holes.size() + 1; for(const ExPolygon &p : supsl) polyscap += p.holes.size() + 1;
polys.reserve(polyscap); polys.reserve(polyscap);
for(const ExPolygon &p : objsl) { auto cpyfn = [&polys](const ExPolygon &p) {
polys.emplace_back(p.contour); polys.emplace_back(Slic3rMultiPoint_to_ClipperPath(p.contour));
for(auto& h : p.holes) polys.emplace_back(h); for(auto& h : p.holes)
} polys.emplace_back(Slic3rMultiPoint_to_ClipperPath(h));
};
for(const ExPolygon &p : supsl) { for(const ExPolygon &p : objsl) cpyfn(p);
polys.emplace_back(p.contour); for(const ExPolygon &p : supsl) cpyfn(p);
for(auto& h : p.holes) polys.emplace_back(h);
} for(ClipperLib::Path& poly : polys) {
rotate(poly, double(tr.rotation));
translate(poly, tr.shift(X), tr.shift(Y));
for(Polygon& poly : polys) {
poly.rotate(double(tr.rotation));
poly.translate(tr.shift(X), tr.shift(Y));
if(o == SLADisplayOrientation::sladoPortrait) if(o == SLADisplayOrientation::sladoPortrait)
for(auto& p : poly.points) std::swap(p(X), p(Y)); for(ClipperLib::IntPoint& p : poly) std::swap(p.X, p.Y);
allpolys.emplace_back(std::move(poly)); if(!poly.empty())
valid &= clipper.AddPath(poly, ClipperLib::ptSubject, closed);
} }
} }
} }
m_trcache = union_ex(allpolys); if(!valid) BOOST_LOG_TRIVIAL(warning) << "Unification of invalid shapes!";
ClipperLib::PolyTree result;
clipper.Execute(ClipperLib::ctUnion, result, ClipperLib::pftNonZero);
m_trcache = PolyTreeToExPolygons(result);
return m_trcache; return m_trcache;
} }