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

Make compile time support tree conf params constexpr

Browse source
This commit is contained in:
tamasmeszaros 2020-06-19 09:49:50 +02:00
parent f19b3a2344
commit 645fbed88b
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libslic3r/SLA/SupportTree.cpp
View file

@ -28,20 +28,6 @@
namespace Slic3r { namespace Slic3r {
namespace sla { namespace sla {
// Compile time configuration value definitions:
// The max Z angle for a normal at which it will get completely ignored.
const double SupportConfig::normal_cutoff_angle = 150.0 * M_PI / 180.0;
// The shortest distance of any support structure from the model surface
const double SupportConfig::safety_distance_mm = 0.5;
const double SupportConfig::max_solo_pillar_height_mm = 15.0;
const double SupportConfig::max_dual_pillar_height_mm = 35.0;
const double SupportConfig::optimizer_rel_score_diff = 1e-6;
const unsigned SupportConfig::optimizer_max_iterations = 1000;
const unsigned SupportConfig::pillar_cascade_neighbors = 3;
void SupportTree::retrieve_full_mesh(TriangleMesh &outmesh) const { void SupportTree::retrieve_full_mesh(TriangleMesh &outmesh) const {
outmesh.merge(retrieve_mesh(MeshType::Support)); outmesh.merge(retrieve_mesh(MeshType::Support));
outmesh.merge(retrieve_mesh(MeshType::Pad)); outmesh.merge(retrieve_mesh(MeshType::Pad));

14
src/libslic3r/SLA/SupportTree.hpp
View file

@ -94,16 +94,16 @@ struct SupportConfig
// ///////////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////////////
// The max Z angle for a normal at which it will get completely ignored. // The max Z angle for a normal at which it will get completely ignored.
static const double normal_cutoff_angle; static const double constexpr normal_cutoff_angle = 150.0 * M_PI / 180.0;
// The shortest distance of any support structure from the model surface // The shortest distance of any support structure from the model surface
static const double safety_distance_mm; static const double constexpr safety_distance_mm = 0.5;
static const double max_solo_pillar_height_mm; static const double constexpr max_solo_pillar_height_mm = 15.0;
static const double max_dual_pillar_height_mm; static const double constexpr max_dual_pillar_height_mm = 35.0;
static const double optimizer_rel_score_diff; static const double constexpr optimizer_rel_score_diff = 1e-6;
static const unsigned optimizer_max_iterations; static const unsigned constexpr optimizer_max_iterations = 1000;
static const unsigned pillar_cascade_neighbors; static const unsigned constexpr pillar_cascade_neighbors = 3;
}; };