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

csg voxelization speedup with additional parallelism

Browse Source
This commit is contained in:
tamasmeszaros 2022-12-15 13:05:02 +01:00
parent fa2fef9283
commit 6323e27cdc
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libslic3r/CSGMesh/VoxelizeCSGMesh.hpp
View File

@ -5,6 +5,7 @@
#include "CSGMesh.hpp" #include "CSGMesh.hpp"
#include "libslic3r/OpenVDBUtils.hpp" #include "libslic3r/OpenVDBUtils.hpp"
#include "libslic3r/Execution/ExecutionTBB.hpp"
namespace Slic3r { namespace csg { namespace Slic3r { namespace csg {
@ -32,11 +33,24 @@ VoxelGridPtr voxelize_csgmesh(const Range<It> &csgrange,
{ {
VoxelGridPtr ret; VoxelGridPtr ret;
std::vector<VoxelGridPtr> grids (csgrange.size());
execution::for_each(ex_tbb, size_t(0), csgrange.size(), [&](size_t csgidx) {
if (params.statusfn() && params.statusfn()(-1))
return;
auto it = csgrange.begin();
std::advance(it, csgidx);
auto &csgpart = *it;
grids[csgidx] = get_voxelgrid(csgpart, params);
}, execution::max_concurrency(ex_tbb));
size_t csgidx = 0;
for (auto &csgpart : csgrange) { for (auto &csgpart : csgrange) {
if (params.statusfn() && params.statusfn()(-1)) if (params.statusfn() && params.statusfn()(-1))
break; break;
VoxelGridPtr partgrid = get_voxelgrid(csgpart, params); auto &partgrid = grids[csgidx++];
if (!ret && get_operation(csgpart) == CSGType::Union) { if (!ret && get_operation(csgpart) == CSGType::Union) {
ret = std::move(partgrid); ret = std::move(partgrid);