Ported some more methods to C++

xs/src/libslic3r/Model.cpp

@@ -158,6 +158,21 @@ Model::has_objects_with_no_instances() const
     return false;
 }
 
+// makes sure all objects have at least one instance
+bool
+Model::add_default_instances()
+{
+    bool added = false;
+    // apply a default position to all objects not having one
+    for (ModelObjectPtrs::const_iterator o = this->objects.begin(); o != this->objects.end(); ++o) {
+        if ((*o)->instances.empty()) {
+            (*o)->add_instance();
+            added = true;
+        }
+    }
+    return true;
+}
+
 #ifdef SLIC3RXS
 REGISTER_CLASS(Model, "Model");
 #endif
@@ -321,6 +336,27 @@ ModelObject::raw_mesh(TriangleMesh* mesh) const
     }
 }
 
+size_t
+ModelObject::facets_count() const
+{
+    size_t num = 0;
+    for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) {
+        if ((*v)->modifier) continue;
+        num += (*v)->mesh.stl.stats.number_of_facets;
+    }
+    return num;
+}
+
+bool
+ModelObject::needed_repair() const
+{
+    for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) {
+        if ((*v)->modifier) continue;
+        if ((*v)->mesh.needed_repair()) return true;
+    }
+    return false;
+}
+
 #ifdef SLIC3RXS
 REGISTER_CLASS(ModelObject, "Model::Object");
 #endif

xs/src/libslic3r/Model.hpp

@@ -53,6 +53,7 @@ class Model
     // void arrange_objects(coordf_t distance, const BoundingBox &bb);
     // void duplicate(size_t copies_num, coordf_t distance, const BoundingBox &bb);
     bool has_objects_with_no_instances() const;
+    bool add_default_instances();
     // void bounding_box(BoundingBox* bb) const;
     // void align_to_origin();
     // void center_instances_around_point(const Pointf &point);
@@ -121,8 +122,8 @@ class ModelObject
     //void translate(coordf_t x, coordf_t y, coordf_t z);
     //size_t materials_count() const;
     //void unique_materials(std::vector<t_model_material_id>* materials) const;
-    //size_t facets_count() const;
-    //bool needed_repair() const;
+    size_t facets_count() const;
+    bool needed_repair() const;
     
     private:
     Model* model;

xs/src/libslic3r/TriangleMesh.cpp

@@ -153,6 +153,17 @@ TriangleMesh::reset_repair_stats() {
     this->stl.stats.normals_fixed       = 0;
 }
 
+bool
+TriangleMesh::needed_repair() const
+{
+    return this->stl.stats.degenerate_facets    > 0
+        || this->stl.stats.edges_fixed          > 0
+        || this->stl.stats.facets_removed       > 0
+        || this->stl.stats.facets_added         > 0
+        || this->stl.stats.facets_reversed      > 0
+        || this->stl.stats.backwards_edges      > 0;
+}
+
 void
 TriangleMesh::WriteOBJFile(char* output_file) {
     stl_generate_shared_vertices(&stl);

xs/src/libslic3r/TriangleMesh.hpp

@@ -45,6 +45,7 @@ class TriangleMesh
     void convex_hull(Polygon* hull);
     void bounding_box(BoundingBoxf3* bb) const;
     void reset_repair_stats();
+    bool needed_repair() const;
     stl_file stl;
     bool repaired;