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

Organic supports: Little polishing of includes

Browse Source
This commit is contained in:
Vojtech Bubnik 2023-05-23 16:35:50 +02:00
parent 7445780358
commit 80b59ef769
6 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libslic3r/Support/OrganicSupport.cpp
View File

@ -1,13 +1,12 @@
#include "OrganicSupport.hpp" #include "OrganicSupport.hpp"
#include "SupportCommon.hpp"
#include "AABBTreeLines.hpp" #include "../AABBTreeLines.hpp"
#include "ClipperUtils.hpp" #include "../ClipperUtils.hpp"
#include "Polygon.hpp" #include "../Polygon.hpp"
#include "Polyline.hpp" #include "../Polyline.hpp"
#include "MutablePolygon.hpp" #include "../MutablePolygon.hpp"
#include "TriangleMeshSlicer.hpp" #include "../TriangleMeshSlicer.hpp"
#include "Support/SupportCommon.hpp"
#include <cassert> #include <cassert>
@ -17,7 +16,7 @@
#ifndef TREE_SUPPORT_ORGANIC_NUDGE_NEW #ifndef TREE_SUPPORT_ORGANIC_NUDGE_NEW
// Old version using OpenVDB, works but it is extremely slow for complex meshes. // Old version using OpenVDB, works but it is extremely slow for complex meshes.
#include "OpenVDBUtilsLegacy.hpp" #include "../OpenVDBUtilsLegacy.hpp"
#include <openvdb/tools/VolumeToSpheres.h> #include <openvdb/tools/VolumeToSpheres.h>
#endif // TREE_SUPPORT_ORGANIC_NUDGE_NEW #endif // TREE_SUPPORT_ORGANIC_NUDGE_NEW

4
src/libslic3r/Support/SupportLayer.hpp
View File

@ -5,8 +5,8 @@
#include <oneapi/tbb/spin_mutex.h> #include <oneapi/tbb/spin_mutex.h>
// for Slic3r::deque // for Slic3r::deque
#include "../libslic3r.h" #include "../libslic3r.h"
#include "ClipperUtils.hpp" #include "../ClipperUtils.hpp"
#include "Polygon.hpp" #include "../Polygon.hpp"
namespace Slic3r::FFFSupport { namespace Slic3r::FFFSupport {

2
src/libslic3r/Support/TreeModelVolumes.cpp
View File

@ -7,7 +7,7 @@
// CuraEngine is released under the terms of the AGPLv3 or higher. // CuraEngine is released under the terms of the AGPLv3 or higher.
#include "TreeModelVolumes.hpp" #include "TreeModelVolumes.hpp"
#include "TreeSupport.hpp" #include "TreeSupportCommon.hpp"
#include "../BuildVolume.hpp" #include "../BuildVolume.hpp"
#include "../ClipperUtils.hpp" #include "../ClipperUtils.hpp"

5
src/libslic3r/Support/TreeModelVolumes.hpp
View File

@ -29,6 +29,11 @@ class PrintObject;
namespace FFFTreeSupport namespace FFFTreeSupport
{ {
static constexpr const double SUPPORT_TREE_EXPONENTIAL_FACTOR = 1.5;
static constexpr const coord_t SUPPORT_TREE_EXPONENTIAL_THRESHOLD = scaled<coord_t>(1. * SUPPORT_TREE_EXPONENTIAL_FACTOR);
static constexpr const coord_t SUPPORT_TREE_COLLISION_RESOLUTION = scaled<coord_t>(0.5);
static constexpr const bool SUPPORT_TREE_AVOID_SUPPORT_BLOCKER = true;
class TreeModelVolumes class TreeModelVolumes
{ {
public: public:

31
src/libslic3r/Support/TreeSupport.cpp
View File

@ -7,23 +7,21 @@
// CuraEngine is released under the terms of the AGPLv3 or higher. // CuraEngine is released under the terms of the AGPLv3 or higher.
#include "TreeSupport.hpp" #include "TreeSupport.hpp"
#include "AABBTreeIndirect.hpp" #include "TreeSupportCommon.hpp"
#include "AABBTreeLines.hpp" #include "SupportCommon.hpp"
#include "BuildVolume.hpp" #include "OrganicSupport.hpp"
#include "ClipperUtils.hpp"
#include "EdgeGrid.hpp"
#include "Fill/Fill.hpp"
#include "Layer.hpp"
#include "Print.hpp"
#include "MultiPoint.hpp"
#include "Polygon.hpp"
#include "Polyline.hpp"
#include "MutablePolygon.hpp"
#include "TriangleMeshSlicer.hpp"
#include "Support/SupportCommon.hpp" #include "../AABBTreeIndirect.hpp"
#include "Support/TreeSupportCommon.hpp" #include "../BuildVolume.hpp"
#include "Support/OrganicSupport.hpp" #include "../ClipperUtils.hpp"
#include "../EdgeGrid.hpp"
#include "../Fill/Fill.hpp"
#include "../Layer.hpp"
#include "../Print.hpp"
#include "../MultiPoint.hpp"
#include "../Polygon.hpp"
#include "../Polyline.hpp"
#include "../MutablePolygon.hpp"
#include <cassert> #include <cassert>
#include <chrono> #include <chrono>
@ -35,7 +33,6 @@
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <tbb/global_control.h>
#include <tbb/parallel_for.h> #include <tbb/parallel_for.h>
// #define TREESUPPORT_DEBUG_SVG // #define TREESUPPORT_DEBUG_SVG

5
src/libslic3r/Support/TreeSupport.hpp
View File

@ -47,13 +47,8 @@ struct SlicingParameters;
namespace FFFTreeSupport namespace FFFTreeSupport
{ {
static constexpr const double SUPPORT_TREE_EXPONENTIAL_FACTOR = 1.5;
static constexpr const coord_t SUPPORT_TREE_EXPONENTIAL_THRESHOLD = scaled<coord_t>(1. * SUPPORT_TREE_EXPONENTIAL_FACTOR);
static constexpr const coord_t SUPPORT_TREE_COLLISION_RESOLUTION = scaled<coord_t>(0.5);
// The number of vertices in each circle. // The number of vertices in each circle.
static constexpr const size_t SUPPORT_TREE_CIRCLE_RESOLUTION = 25; static constexpr const size_t SUPPORT_TREE_CIRCLE_RESOLUTION = 25;
static constexpr const bool SUPPORT_TREE_AVOID_SUPPORT_BLOCKER = true;
struct AreaIncreaseSettings struct AreaIncreaseSettings
{ {