SPE-742: Parameter layer for zero elevation feature.

src/libslic3r/SLA/SLABasePool.hpp

@@ -42,7 +42,14 @@ struct PoolConfig {
     double max_merge_distance_mm = 50;
     double edge_radius_mm = 1;
     double wall_slope = std::atan(1.0);          // Universal constant for Pi/4
-    bool   embed_object = false;
+    struct EmbedObject {
+        double object_gap_mm = 0.5;
+        double stick_stride_mm = 10;
+        double stick_width_mm = 0.3;
+        double stick_penetration_mm = 0.1;
+        bool enabled = false;
+        operator bool() const { return enabled; }
+    } embed_object;
 
     ThrowOnCancel throw_on_cancel = [](){};
 
@@ -61,11 +68,7 @@ void create_base_pool(const Polygons& base_plate,
                       const ExPolygons& holes,
                       const PoolConfig& = PoolConfig());
 
-/// TODO: Currently the base plate of the pool will have half the height of the
-/// whole pool. So the carved out space has also half the height. This is not
-/// a particularly elegant solution, the thickness should be exactly
-/// min_wall_thickness and it should be corrected in the future. This method
-/// will return the correct value for further processing.
+/// Returns the elevation needed for compensating the pad.
 inline double get_pad_elevation(const PoolConfig& cfg) {
     return cfg.min_wall_thickness_mm;
 }

src/libslic3r/SLA/SLACommon.hpp

@@ -60,7 +60,7 @@ class EigenMesh3D {
 
     Eigen::MatrixXd m_V;
     Eigen::MatrixXi m_F;
-    double m_ground_level = 0;
+    double m_ground_level = 0, m_gnd_offset = 0;
 
     std::unique_ptr<AABBImpl> m_aabb;
 public:
@@ -71,8 +71,8 @@ public:
 
     ~EigenMesh3D();
 
-    inline double ground_level() const { return m_ground_level; }
-    inline double& ground_level() { return m_ground_level; }
+    inline double ground_level() const { return m_ground_level + m_gnd_offset; }
+    inline void ground_level_offset(double o) { m_gnd_offset = o; }
 
     inline const Eigen::MatrixXd& V() const { return m_V; }
     inline const Eigen::MatrixXi& F() const { return m_F; }

src/libslic3r/SLA/SLASupportTree.cpp

@@ -72,8 +72,6 @@ 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::pillar_base_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;
@@ -590,10 +588,10 @@ struct Pad {
             for(auto& poly : modelbase_sticks)
                 sla::offset_with_breakstick_holes(
                     poly,
-                    SupportConfig::pillar_base_safety_distance_mm, // padding
-                    10,     // stride (mm)
-                    0.3,    // stick_width (mm)
-                    0.1);   // penetration (mm)
+                    pcfg.embed_object.object_gap_mm,   // padding
+                    pcfg.embed_object.stick_stride_mm,
+                    pcfg.embed_object.stick_width_mm,
+                    pcfg.embed_object.stick_penetration_mm);
 
             create_base_pool(basep, tmesh, modelbase_sticks, cfg);
         } else {
@@ -1407,7 +1405,7 @@ class SLASupportTree::Algorithm {
 
         double gndlvl       = m_result.ground_level;
         Vec3d  endp         = {jp(X), jp(Y), gndlvl};
-        double sd           = SupportConfig::pillar_base_safety_distance_mm;
+        double sd           = m_cfg.pillar_base_safety_distance_mm;
         int    pillar_id    = -1;
         double min_dist     = sd + m_cfg.base_radius_mm + EPSILON;
         double dist         = 0;
@@ -2160,7 +2158,7 @@ public:
             std::vector<Vec3d> spts(needpillars); // vector of starting points
 
             double gnd      = m_result.ground_level;
-            double min_dist = SupportConfig::pillar_base_safety_distance_mm +
+            double min_dist = m_cfg.pillar_base_safety_distance_mm +
                               m_cfg.base_radius_mm + EPSILON;
             
             while(!found && alpha < 2*PI) {

src/libslic3r/SLA/SLASupportTree.hpp

@@ -81,6 +81,10 @@ struct SupportConfig {
     // The elevation in Z direction upwards. This is the space between the pad
     // and the model object's bounding box bottom.
     double object_elevation_mm = 10;
+    
+    // The shortest distance between a pillar base perimeter from the model
+    // body. This is only useful when elevation is set to zero.
+    const double pillar_base_safety_distance_mm = 0.5;
 
     // /////////////////////////////////////////////////////////////////////////
     // Compile time configuration values (candidates for runtime)
@@ -91,10 +95,6 @@ struct SupportConfig {
 
     // The shortest distance of any support structure from the model surface
     static const double safety_distance_mm;
-    
-    // The shortest distance between a pillar base perimeter from the model
-    // body. This is only useful when elevation is set to zero.
-    static const double pillar_base_safety_distance_mm;
 
     static const double max_solo_pillar_height_mm;
     static const double max_dual_pillar_height_mm;
@@ -186,7 +186,8 @@ public:
     /// Get the sliced 2d layers of the support geometry.
     std::vector<ExPolygons> slice(float layerh, float init_layerh = -1.0) const;
 
-    std::vector<ExPolygons> slice(const std::vector<float>&, float closing_radius) const;
+    std::vector<ExPolygons> slice(const std::vector<float> &,
+                                  float closing_radius) const;
 
     /// Adding the "pad" (base pool) under the supports
     /// modelbase will be used according to the embed_object flag in PoolConfig.