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

Custom supports projection now runs in parallel

Browse source
This commit is contained in:
Lukas Matena 2020-04-22 16:08:36 +02:00
parent a40d60ce08
commit 61e5eab35d
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/libslic3r/PrintObject.cpp
View file

@ -2650,22 +2650,32 @@ void PrintObject::project_and_append_custom_supports(
FacetSupportType type, std::vector<ExPolygons>& expolys) const FacetSupportType type, std::vector<ExPolygons>& expolys) const
{ {
for (const ModelVolume* mv : this->model_object()->volumes) { for (const ModelVolume* mv : this->model_object()->volumes) {
const auto& custom_facets = mv->m_supported_facets.get_facets(type); const std::vector<int>& custom_facets = mv->m_supported_facets.get_facets(type);
const TriangleMesh& mesh = mv->mesh(); const TriangleMesh& mesh = mv->mesh();
const Transform3f& tr1 = mv->get_matrix().cast<float>(); const Transform3f& tr1 = mv->get_matrix().cast<float>();
const Transform3f& tr2 = this->trafo().cast<float>(); const Transform3f& tr2 = this->trafo().cast<float>();
// Structure to collect projected polygons. One element for each triangle.
// Saves list of (layer_id, polygon) pair.
std::vector<std::vector<std::pair<int, ExPolygon>>> layer_polygon_pairs_per_triangle(custom_facets.size());
// Make sure that the output vector can be used. // Make sure that the output vector can be used.
if (! custom_facets.empty()) if (custom_facets.empty())
continue;
else
expolys.resize(layers().size()); expolys.resize(layers().size());
// Iterate over all triangles. // Iterate over all triangles.
for (int facet_idx : custom_facets) { tbb::parallel_for(
tbb::blocked_range<size_t>(0, custom_facets.size() - 1),
[&](const tbb::blocked_range<size_t>& range) {
for (size_t idx = range.begin(); idx < range.end(); ++ idx) {
std::array<Vec3f, 3> facet; std::array<Vec3f, 3> facet;
// Transform the triangle into worlds coords. // Transform the triangle into worlds coords.
for (int i=0; i<3; ++i) for (int i=0; i<3; ++i)
facet[i] = tr2 * tr1 * mesh.its.vertices[mesh.its.indices[facet_idx](i)]; facet[i] = tr2 * tr1 * mesh.its.vertices[mesh.its.indices[custom_facets[idx]](i)];
// Ignore triangles with upward-pointing normal. // Ignore triangles with upward-pointing normal.
if ((facet[1]-facet[0]).cross(facet[2]-facet[0]).z() > 0.) if ((facet[1]-facet[0]).cross(facet[2]-facet[0]).z() > 0.)
@ -2739,10 +2749,10 @@ void PrintObject::project_and_append_custom_supports(
} }
if (it != layers().begin()) { if (it != layers().begin()) {
Points pts; ExPolygon explg;
for (const Vec2f& pt : proj) for (const Vec2f& pt : proj)
pts.emplace_back(scale_(pt.x()), scale_(pt.y())); explg.contour.points.emplace_back(scale_(pt.x()), scale_(pt.y()));
expolys[it-layers().begin()-1].emplace_back(pts); layer_polygon_pairs_per_triangle[idx].emplace_back(int(it-layers().begin()-1), std::move(explg));
} }
if (stop) if (stop)
@ -2757,7 +2767,16 @@ void PrintObject::project_and_append_custom_supports(
++it; ++it;
} }
} }
} }); // end of parallel_for
// Now append the collected polygons to respective layers.
for (auto& trg : layer_polygon_pairs_per_triangle) {
for (auto& [layer_id, expolygon] : trg) {
expolys[layer_id].emplace_back(std::move(expolygon));
}
}
} // loop over ModelVolumes
} }
} // namespace Slic3r } // namespace Slic3r