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

Tree supports: Switched to new Organic smoothing & collision avoidance.

Browse source 
Follow-up to 3d9f39e258
which had the new smoothing & collision avoidance disabled by mistake.
This commit is contained in:
Vojtech Bubnik 2023-01-26 13:59:22 +01:00
parent 7fd5fa3aa6
commit 6a9bcf8405
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libslic3r/TreeSupport.cpp
View file

@ -21,8 +21,6 @@
#include "MutablePolygon.hpp" #include "MutablePolygon.hpp"
#include "SupportMaterial.hpp" #include "SupportMaterial.hpp"
#include "TriangleMeshSlicer.hpp" #include "TriangleMeshSlicer.hpp"
#include "OpenVDBUtilsLegacy.hpp"
#include <openvdb/tools/VolumeToSpheres.h>
#include <cassert> #include <cassert>
#include <chrono> #include <chrono>
@ -45,6 +43,14 @@
#define TREE_SUPPORT_SHOW_ERRORS_WIN32 #define TREE_SUPPORT_SHOW_ERRORS_WIN32
#endif #endif
// #define TREE_SUPPORT_ORGANIC_NUDGE_NEW 1
#ifndef TREE_SUPPORT_ORGANIC_NUDGE_NEW
// Old version using OpenVDB, works but it is extremely slow for complex meshes.
#include "OpenVDBUtilsLegacy.hpp"
#include <openvdb/tools/VolumeToSpheres.h>
#endif // TREE_SUPPORT_ORGANIC_NUDGE_NEW
namespace Slic3r namespace Slic3r
{ {
@ -3389,8 +3395,6 @@ static void extrude_branch(
} }
#endif #endif
// #define TREE_SUPPORT_ORGANIC_NUDGE_NEW 1
#ifdef TREE_SUPPORT_ORGANIC_NUDGE_NEW #ifdef TREE_SUPPORT_ORGANIC_NUDGE_NEW
// New version using per layer AABB trees of lines for nudging spheres away from an object. // New version using per layer AABB trees of lines for nudging spheres away from an object.
static void organic_smooth_branches_avoid_collisions( static void organic_smooth_branches_avoid_collisions(