GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-13 19:31:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create AABB tree on demand

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2022-08-02 07:22:53 +02:00
parent b26dec03e5
commit a8f87bde22
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libslic3r/CutSurface.cpp
View File

@ -350,7 +350,6 @@ public:
/// Differenciate other models /// Differenciate other models
/// </summary> /// </summary>
/// <param name="cuts">Patches from meshes</param> /// <param name="cuts">Patches from meshes</param>
/// <param name="m2i">Convert model_index and cut_index into one index</param>
/// <param name="cut_models">Source points for Cutted AOIs /// <param name="cut_models">Source points for Cutted AOIs
/// NOTE: Create Reduction map as mesh property - clean on end</param> /// NOTE: Create Reduction map as mesh property - clean on end</param>
/// <param name="models">Original models without cut modifications /// <param name="models">Original models without cut modifications
@ -359,7 +358,6 @@ public:
/// <param name="projection">Define projection direction</param> /// <param name="projection">Define projection direction</param>
/// <returns>Cuts differenciate by models - Patch</returns> /// <returns>Cuts differenciate by models - Patch</returns>
SurfacePatches diff_models(VCutAOIs &cuts, SurfacePatches diff_models(VCutAOIs &cuts,
const ModelCut2index &m2i,
/*const*/ CutMeshes &cut_models, /*const*/ CutMeshes &cut_models,
/*const*/ CutMeshes &models, /*const*/ CutMeshes &models,
const Project3f &projection); const Project3f &projection);
@ -526,8 +524,7 @@ SurfaceCut Slic3r::cut_surface(const ExPolygons &shapes,
model_cuts.push_back(std::move(cutAOIs)); model_cuts.push_back(std::move(cutAOIs));
} }
priv::ModelCut2index m2i(model_cuts); priv::SurfacePatches patches = priv::diff_models(model_cuts, cgal_models, cgal_neg_models, projection);
priv::SurfacePatches patches = priv::diff_models(model_cuts, m2i, cgal_models, cgal_neg_models, projection);
#ifdef DEBUG_OUTPUT_DIR #ifdef DEBUG_OUTPUT_DIR
priv::store(patches, DEBUG_OUTPUT_DIR + "patches/"); priv::store(patches, DEBUG_OUTPUT_DIR + "patches/");
#endif // DEBUG_OUTPUT_DIR #endif // DEBUG_OUTPUT_DIR
@ -2874,16 +2871,19 @@ void priv::collect_open_edges(SurfacePatches &patches) {
} }
priv::SurfacePatches priv::diff_models(VCutAOIs &cuts, priv::SurfacePatches priv::diff_models(VCutAOIs &cuts,
const ModelCut2index &m2i,
/*const*/ CutMeshes &cut_models, /*const*/ CutMeshes &cut_models,
/*const*/ CutMeshes &models, /*const*/ CutMeshes &models,
const Project3f &projection) const Project3f &projection)
{ {
// IMPROVE: when models contain ONE mesh. It is only about convert cuts to patches
// and reduce unneccessary triangles on contour
//Convert model_index and cut_index into one index
priv::ModelCut2index m2i(cuts);
// create bounding boxes for cuts // create bounding boxes for cuts
std::vector<BoundingBoxf3> bbs = create_bbs(cuts, cut_models); std::vector<BoundingBoxf3> bbs = create_bbs(cuts, cut_models);
Trees trees(models.size());
// IMPROVE: Do not make Tree twice, when exist out of cut function
Trees trees = create_trees(models);
SurfacePatches patches; SurfacePatches patches;
// queue of patches for one AOI (permanent with respect to for loop) // queue of patches for one AOI (permanent with respect to for loop)
@ -2914,9 +2914,20 @@ priv::SurfacePatches priv::diff_models(VCutAOIs &cuts,
if (has_bb_intersection(patch.bb, model_index2, bbs, m2i) && if (has_bb_intersection(patch.bb, model_index2, bbs, m2i) &&
clip_cut(patch, models[model_index2])){ clip_cut(patch, models[model_index2])){
patch.just_cliped = true; patch.just_cliped = true;
} else if (is_patch_inside_of_model(patch, trees[model_index2], projection)) } else {
// build tree on demand
// NOTE: it is possible not neccessary: e.g. one model
Tree &tree = trees[model_index2];
if (tree.empty()) {
const CutMesh &model = models[model_index2];
auto f_range = faces(model);
tree.insert(f_range.first, f_range.second, model);
tree.build();
}
if (is_patch_inside_of_model(patch, tree, projection))
patch.full_inside = true; patch.full_inside = true;
} }
}
// erase full inside // erase full inside
for (size_t i = aoi_patches.size(); i != 0; --i) { for (size_t i = aoi_patches.size(); i != 0; --i) {
auto it = aoi_patches.begin() + (i - 1); auto it = aoi_patches.begin() + (i - 1);