Merge branch 'master' into lm_sla_supports_auto

src/libslic3r/Channel.hpp

@@ -77,8 +77,7 @@ public:
         }
     }
 
-    // Unlocked observers/hints
-    // Thread unsafe! Keep in mind you need to re-verify the result after locking!
+    // Unlocked observer/hint. Thread unsafe! Keep in mind you need to re-verify the result after locking.
     size_t size_hint() const noexcept { return m_queue.size(); }
 
     LockedConstPtr lock_read() const

src/libslic3r/ModelArrange.cpp

@@ -135,11 +135,6 @@ objfunc(const PointImpl& bincenter,
         const ItemGroup& remaining
         )
 {
-    using Coord = TCoord<PointImpl>;
-
-    static const double ROUNDNESS_RATIO = 0.5;
-    static const double DENSITY_RATIO = 1.0 - ROUNDNESS_RATIO;
-
     // We will treat big items (compared to the print bed) differently
     auto isBig = [bin_area](double a) {
         return a/bin_area > BIG_ITEM_TRESHOLD ;
@@ -629,11 +624,12 @@ BedShapeHint bedShape(const Polyline &bed) {
         avg_dist /= vertex_distances.size();
 
         Circle ret(center, avg_dist);
-        for (auto el: vertex_distances)
+        for(auto el : vertex_distances)
         {
-            if (abs(el - avg_dist) > 10 * SCALED_EPSILON)
+            if (std::abs(el - avg_dist) > 10 * SCALED_EPSILON) {
                 ret = Circle();
-            break;
+                break;
+            }
         }
 
         return ret;
@@ -665,8 +661,6 @@ bool arrange(Model &model,
              std::function<void (unsigned)> progressind,
              std::function<bool ()> stopcondition)
 {
-    using ArrangeResult = _IndexedPackGroup<PolygonImpl>;
-
     bool ret = true;
 
     // Get the 2D projected shapes with their 3D model instance pointers

src/libslic3r/SLA/SLASupportTree.cpp

@@ -722,6 +722,10 @@ public:
         return m_pad;
     }
 
+    void remove_pad() {
+        m_pad = Pad();
+    }
+
     const Pad& pad() const { return m_pad; }
 
     // WITHOUT THE PAD!!!
@@ -1729,6 +1733,11 @@ const TriangleMesh &SLASupportTree::get_pad() const
     return m_impl->pad().tmesh;
 }
 
+void SLASupportTree::remove_pad()
+{
+    m_impl->remove_pad();
+}
+
 SLASupportTree::SLASupportTree(const PointSet &points,
                                const EigenMesh3D& emesh,
                                const SupportConfig &cfg,

src/libslic3r/SLA/SLASupportTree.hpp

@@ -164,6 +164,8 @@ public:
     /// Get the pad geometry
     const TriangleMesh& get_pad() const;
 
+    void remove_pad();
+
 };
 
 }

src/libslic3r/SLA/SLASupportTreeIGL.cpp

@@ -107,7 +107,8 @@ PointSet normals(const PointSet& points, const EigenMesh3D& emesh,
     // structure
     EigenMesh3D  mesh;
     Eigen::VectorXi SVI, SVJ;
-    igl::remove_duplicate_vertices(emesh.V, emesh.F, 1e-6,
+    static const double dEPS = 1e-6;
+    igl::remove_duplicate_vertices(emesh.V, emesh.F, dEPS,
                                    mesh.V, SVI, SVJ, mesh.F);
 
     igl::point_mesh_squared_distance( points, mesh.V, mesh.F, dists, I, C);
@@ -155,6 +156,7 @@ PointSet normals(const PointSet& points, const EigenMesh3D& emesh,
             ia = trindex(0); ib = trindex(2);
         }
 
+        // vector for the neigboring triangles including the detected one.
         std::vector<Vec3i> neigh;
         if(ic >= 0) { // The point is right on a vertex of the triangle
             for(int n = 0; n < mesh.F.rows(); ++n) {
@@ -175,17 +177,32 @@ PointSet normals(const PointSet& points, const EigenMesh3D& emesh,
             }
         }
 
-        if(!neigh.empty()) { // there were neighbors to count with
+        // Calculate the normals for the neighboring triangles
+        std::vector<Vec3d> neighnorms; neighnorms.reserve(neigh.size());
+        for(const Vec3i& tri : neigh) {
+            const Vec3d& pt1 = mesh.V.row(tri(0));
+            const Vec3d& pt2 = mesh.V.row(tri(1));
+            const Vec3d& pt3 = mesh.V.row(tri(2));
+            Eigen::Vector3d U = pt2 - pt1;
+            Eigen::Vector3d V = pt3 - pt1;
+            neighnorms.emplace_back(U.cross(V).normalized());
+        }
+
+        // Throw out duplicates. They would case trouble with summing.
+        auto lend = std::unique(neighnorms.begin(), neighnorms.end(),
+                                [](const Vec3d& n1, const Vec3d& n2) {
+            // Compare normals for equivalence. This is controvers stuff.
+            // We will go for the third significant digit precision.
+            auto deq = [](double a, double b) { return std::abs(a-b) < 1e-3; };
+            return deq(n1(X), n2(X)) && deq(n1(Y), n2(Y)) && deq(n1(Z), n2(Z));
+        });
+
+        if(!neighnorms.empty()) { // there were neighbors to count with
+            // sum up the normals and then normalize the result again.
+            // This unification seems to be enough.
             Vec3d sumnorm(0, 0, 0);
-            for(const Vec3i& tri : neigh) {
-                const Vec3d& pt1 = mesh.V.row(tri(0));
-                const Vec3d& pt2 = mesh.V.row(tri(1));
-                const Vec3d& pt3 = mesh.V.row(tri(2));
-                Eigen::Vector3d U = pt2 - pt1;
-                Eigen::Vector3d V = pt3 - pt1;
-                sumnorm += U.cross(V).normalized();
-            }
-            sumnorm /= neigh.size();
+            sumnorm = std::accumulate(neighnorms.begin(), lend, sumnorm);
+            sumnorm.normalize();
             ret.row(i) = sumnorm;
         }
         else { // point lies safely within its triangle

src/libslic3r/SLAPrint.cpp

@@ -592,9 +592,13 @@ void SLAPrint::process()
         // and before the supports had been sliced. (or the slicing has to be
         // repeated)
 
-        if(po.m_config.pad_enable.getBool() &&
-           po.m_supportdata &&
-           po.m_supportdata->support_tree_ptr)
+        if(!po.m_supportdata || !po.m_supportdata->support_tree_ptr) {
+            BOOST_LOG_TRIVIAL(warning) << "Uninitialized support data at "
+                                       << "pad creation.";
+            return;
+        }
+
+        if(po.m_config.pad_enable.getBool())
         {
             double wt = po.m_config.pad_wall_thickness.getFloat();
             double h =  po.m_config.pad_wall_height.getFloat();
@@ -618,6 +622,8 @@ void SLAPrint::process()
 
             pcfg.throw_on_cancel = thrfn;
             po.m_supportdata->support_tree_ptr->add_pad(bp, pcfg);
+        } else {
+            po.m_supportdata->support_tree_ptr->remove_pad();
         }
 
         po.throw_if_canceled();
@@ -896,6 +902,7 @@ void SLAPrint::process()
             if(po->m_stepmask[currentstep] && po->set_started(currentstep)) {
                 report_status(*this, int(st), OBJ_STEP_LABELS[currentstep]);
                 pobj_program[currentstep](*po);
+                throw_if_canceled();
                 po->set_done(currentstep);
             }
 
@@ -921,6 +928,7 @@ void SLAPrint::process()
         {
             report_status(*this, int(st), PRINT_STEP_LABELS[currentstep]);
             print_program[currentstep]();
+            throw_if_canceled();
             set_done(currentstep);
         }
 

src/libslic3r/Technologies.hpp

@@ -43,7 +43,7 @@
 // Renders a small sphere in the center of the bounding box of the current selection when no gizmo is active
 #define ENABLE_RENDER_SELECTION_CENTER (0 && ENABLE_1_42_0)
 // Show visual hints in the 3D scene when sidebar matrix fields have focus
-#define ENABLE_SIDEBAR_VISUAL_HINTS (0 && ENABLE_1_42_0)
+#define ENABLE_SIDEBAR_VISUAL_HINTS (1 && ENABLE_1_42_0)
 
 #endif // _technologies_h_