Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d

xs/src/libslic3r/Format/3mf.cpp

@@ -1738,10 +1738,7 @@ namespace Slic3r {
                 stream << "   </" << COMPONENTS_TAG << ">\n";
             }
 
-            Transform3d t = Transform3d::Identity();
-            t.translate(Vec3d(instance->offset(0), instance->offset(1), 0.0));
-            t.rotate(Eigen::AngleAxisd(instance->rotation, Vec3d::UnitZ()));
-            t.scale(instance->scaling_factor);
+            Transform3d t = instance->world_matrix();
             build_items.emplace_back(instance_id, t);
 
             stream << "  </" << OBJECT_TAG << ">\n";

xs/src/libslic3r/GCode.cpp

@@ -665,6 +665,14 @@ void GCode::_do_export(Print &print, FILE *file, GCodePreviewData *preview_data)
         _write_format(file, "\n");
     }
     
+    // adds tags for time estimators
+    if (print.config.remaining_times.value)
+    {
+        _writeln(file, GCodeTimeEstimator::Normal_First_M73_Output_Placeholder_Tag);
+        if (m_silent_time_estimator_enabled)
+            _writeln(file, GCodeTimeEstimator::Silent_First_M73_Output_Placeholder_Tag);
+    }
+
     // Prepare the helper object for replacing placeholders in custom G-code and output filename.
     m_placeholder_parser = print.placeholder_parser;
     m_placeholder_parser.update_timestamp();
@@ -724,7 +732,6 @@ void GCode::_do_export(Print &print, FILE *file, GCodePreviewData *preview_data)
     m_placeholder_parser.set("has_wipe_tower", has_wipe_tower);
     m_placeholder_parser.set("has_single_extruder_multi_material_priming", has_wipe_tower && print.config.single_extruder_multi_material_priming);
     std::string start_gcode = this->placeholder_parser_process("start_gcode", print.config.start_gcode.value, initial_extruder_id);
-    
     // Set bed temperature if the start G-code does not contain any bed temp control G-codes.
     this->_print_first_layer_bed_temperature(file, print, start_gcode, initial_extruder_id, true);
     // Set extruder(s) temperature before and after start G-code.

xs/src/libslic3r/GCodeTimeEstimator.cpp

@@ -168,6 +168,9 @@ namespace Slic3r {
     }
 #endif // ENABLE_MOVE_STATS
 
+    const std::string GCodeTimeEstimator::Normal_First_M73_Output_Placeholder_Tag = "; NORMAL_FIRST_M73_OUTPUT_PLACEHOLDER";
+    const std::string GCodeTimeEstimator::Silent_First_M73_Output_Placeholder_Tag = "; SILENT_FIRST_M73_OUTPUT_PLACEHOLDER";
+
     GCodeTimeEstimator::GCodeTimeEstimator(EMode mode)
         : _mode(mode)
     {
@@ -294,7 +297,15 @@ namespace Slic3r {
                 throw std::runtime_error(std::string("Remaining times export failed.\nError while reading from file.\n"));
             }
 
-            gcode_line += "\n";
+            // replaces placeholders for initial line M73 with the real lines
+            if (((_mode == Normal) && (gcode_line == Normal_First_M73_Output_Placeholder_Tag)) ||
+                ((_mode == Silent) && (gcode_line == Silent_First_M73_Output_Placeholder_Tag)))
+            {
+                sprintf(time_line, time_mask.c_str(), std::to_string(0), _get_time_minutes(_time).c_str());
+                gcode_line = time_line;
+            }
+            else
+               gcode_line += "\n";
 
             // add remaining time lines where needed
             _parser.parse_line(gcode_line,

xs/src/libslic3r/GCodeTimeEstimator.hpp

@@ -17,6 +17,9 @@ namespace Slic3r {
     class GCodeTimeEstimator
     {
     public:
+        static const std::string Normal_First_M73_Output_Placeholder_Tag;
+        static const std::string Silent_First_M73_Output_Placeholder_Tag;
+
         enum EMode : unsigned char
         {
             Normal,

xs/src/libslic3r/Model.cpp

@@ -237,7 +237,6 @@ BoundingBoxf3 Model::bounding_box() const
 
 void Model::center_instances_around_point(const Vec2d &point)
 {
-//    BoundingBoxf3 bb = this->bounding_box();
     BoundingBoxf3 bb;
     for (ModelObject *o : this->objects)
         for (size_t i = 0; i < o->instances.size(); ++ i)
@@ -670,22 +669,19 @@ void ModelObject::center_around_origin()
         if (! v->modifier)
 			bb.merge(v->mesh.bounding_box());
     
-    // First align to origin on XYZ, then center it on XY.
-    Vec3d size = bb.size();
-    size(2) = 0.;
-    Vec3d shift3 = - bb.min - 0.5 * size;
-    // Unaligned vector, for the Rotation2D to work on Visual Studio 2013.
-    Eigen::Vector2d shift2 = to_2d(shift3);
-    
-    this->translate(shift3);
-    this->origin_translation += shift3;
-    
+    // Shift is the vector from the center of the bottom face of the bounding box to the origin
+    Vec3d shift = -bb.center();
+    shift(2) = -bb.min(2);
+
+    this->translate(shift);
+    this->origin_translation += shift;
+
     if (!this->instances.empty()) {
         for (ModelInstance *i : this->instances) {
             // apply rotation and scaling to vector as well before translating instance,
             // in order to leave final position unaltered
-            Eigen::Rotation2Dd rot(i->rotation);
-            i->offset -= rot * shift2 * i->scaling_factor;
+            Vec3d i_shift = i->world_matrix(true) * shift;
+            i->offset -= to_2d(i_shift);
         }
         this->invalidate_bounding_box();
     }
@@ -861,12 +857,7 @@ void ModelObject::check_instances_print_volume_state(const BoundingBoxf3& print_
         {
             for (ModelInstance* inst : this->instances)
             {
-                Transform3d m = Transform3d::Identity();
-                m.translate(Vec3d(inst->offset(0), inst->offset(1), 0.0));
-                m.rotate(Eigen::AngleAxisd(inst->rotation, Vec3d::UnitZ()));
-                m.scale(inst->scaling_factor);
-
-                BoundingBoxf3 bb = vol->get_convex_hull().transformed_bounding_box(m);
+                BoundingBoxf3 bb = vol->get_convex_hull().transformed_bounding_box(inst->world_matrix());
 
                 if (print_volume.contains(bb))
                     inst->print_volume_state = ModelInstance::PVS_Inside;
@@ -995,26 +986,17 @@ size_t ModelVolume::split(unsigned int max_extruders)
 
 void ModelInstance::transform_mesh(TriangleMesh* mesh, bool dont_translate) const
 {
-    mesh->rotate_z(this->rotation);                 // rotate around mesh origin
-    mesh->scale(this->scaling_factor);              // scale around mesh origin
-    if (!dont_translate)
-        mesh->translate(this->offset(0), this->offset(1), 0);
+    mesh->transform(world_matrix(dont_translate).cast<float>());
 }
 
 BoundingBoxf3 ModelInstance::transform_mesh_bounding_box(const TriangleMesh* mesh, bool dont_translate) const
 {
     // Rotate around mesh origin.
-    double c = cos(this->rotation);
-    double s = sin(this->rotation);
-    BoundingBoxf3 bbox;
-    for (int i = 0; i < mesh->stl.stats.number_of_facets; ++ i) {
-        const stl_facet &facet = mesh->stl.facet_start[i];
-        for (int j = 0; j < 3; ++ j) {
-            const stl_vertex &v = facet.vertex[j];
-			bbox.merge(Vec3d(c * v(0) - s * v(1), s * v(0) + c * v(1), v(2)));
-        }
-    }
-    if (! empty(bbox)) {
+    TriangleMesh copy(*mesh);
+    copy.transform(world_matrix(true, false, true).cast<float>());
+    BoundingBoxf3 bbox = copy.bounding_box();
+
+    if (!empty(bbox)) {
         // Scale the bounding box uniformly.
         if (std::abs(this->scaling_factor - 1.) > EPSILON) {
             bbox.min *= this->scaling_factor;
@@ -1031,13 +1013,12 @@ BoundingBoxf3 ModelInstance::transform_mesh_bounding_box(const TriangleMesh* mes
 
 BoundingBoxf3 ModelInstance::transform_bounding_box(const BoundingBoxf3 &bbox, bool dont_translate) const
 {
-    Transform3d matrix = Transform3d::Identity();
-    if (!dont_translate)
-        matrix.translate(Vec3d(offset(0), offset(1), 0.0));
+    return bbox.transformed(world_matrix(dont_translate));
+}
 
-    matrix.rotate(Eigen::AngleAxisd(rotation, Vec3d::UnitZ()));
-    matrix.scale(scaling_factor);
-    return bbox.transformed(matrix);
+Vec3d ModelInstance::transform_vector(const Vec3d& v, bool dont_translate) const
+{
+    return world_matrix(dont_translate) * v;
 }
 
 void ModelInstance::transform_polygon(Polygon* polygon) const
@@ -1046,4 +1027,20 @@ void ModelInstance::transform_polygon(Polygon* polygon) const
     polygon->scale(this->scaling_factor);           // scale around polygon origin
 }
 
+Transform3d ModelInstance::world_matrix(bool dont_translate, bool dont_rotate, bool dont_scale) const
+{
+    Transform3d m = Transform3d::Identity();
+
+    if (!dont_translate)
+        m.translate(Vec3d(offset(0), offset(1), 0.0));
+
+    if (!dont_rotate)
+        m.rotate(Eigen::AngleAxisd(rotation, Vec3d::UnitZ()));
+
+    if (!dont_scale)
+        m.scale(scaling_factor);
+
+    return m;
+}
+
 }

xs/src/libslic3r/Model.hpp

@@ -224,7 +224,6 @@ public:
 
     friend class ModelObject;
 
-//    Transform3d     transform;
     double rotation;            // Rotation around the Z axis, in radians around mesh center point
     double scaling_factor;
     Vec2d offset;              // in unscaled coordinates
@@ -240,9 +239,13 @@ public:
     BoundingBoxf3 transform_mesh_bounding_box(const TriangleMesh* mesh, bool dont_translate = false) const;
     // Transform an external bounding box.
     BoundingBoxf3 transform_bounding_box(const BoundingBoxf3 &bbox, bool dont_translate = false) const;
+    // Transform an external vector.
+    Vec3d transform_vector(const Vec3d& v, bool dont_translate = false) const;
     // To be called on an external polygon. It does not translate the polygon, only rotates and scales.
     void transform_polygon(Polygon* polygon) const;
 
+    Transform3d world_matrix(bool dont_translate = false, bool dont_rotate = false, bool dont_scale = false) const;
+
     bool is_printable() const { return print_volume_state == PVS_Inside; }
 
 private:

xs/src/libslic3r/TriangleMesh.cpp

@@ -264,7 +264,7 @@ void TriangleMesh::rotate(float angle, const Vec3d& axis)
     Vec3f axis_norm = axis.cast<float>().normalized();
     Transform3f m = Transform3f::Identity();
     m.rotate(Eigen::AngleAxisf(angle, axis_norm));
-    stl_transform(&stl, (float*)m.data());
+    stl_transform(&stl, m);
 }
 
 void TriangleMesh::mirror(const Axis &axis)
@@ -279,6 +279,11 @@ void TriangleMesh::mirror(const Axis &axis)
     stl_invalidate_shared_vertices(&this->stl);
 }
 
+void TriangleMesh::transform(const Transform3f& t)
+{
+    stl_transform(&stl, t);
+}
+
 void TriangleMesh::align_to_origin()
 {
     this->translate(
@@ -523,9 +528,9 @@ BoundingBoxf3 TriangleMesh::transformed_bounding_box(const Transform3d& t) const
                 src_vertices(0, v_id) = (double)facet_ptr->vertex[i](0);
                 src_vertices(1, v_id) = (double)facet_ptr->vertex[i](1);
                 src_vertices(2, v_id) = (double)facet_ptr->vertex[i](2);
+                ++v_id;
             }
             facet_ptr += 1;
-            ++v_id;
         }
     }
 

xs/src/libslic3r/TriangleMesh.hpp

@@ -48,6 +48,7 @@ public:
     void mirror_x() { this->mirror(X); }
     void mirror_y() { this->mirror(Y); }
     void mirror_z() { this->mirror(Z); }
+    void transform(const Transform3f& t);
     void align_to_origin();
     void rotate(double angle, Point* center);
     TriangleMeshPtrs split() const;

xs/src/libslic3r/Utils.hpp

@@ -97,8 +97,9 @@ public:
     void call(int i) const;
     void call(int i, int j) const;
     void call(const std::vector<int>& ints) const;
-    void call(double d) const;
+    void call(double a) const;
     void call(double a, double b) const;
+    void call(double a, double b, double c) const;
     void call(double a, double b, double c, double d) const;
     void call(bool b) const;
 private:

xs/src/libslic3r/libslic3r.h

@@ -14,7 +14,7 @@
 #include <boost/thread.hpp>
 
 #define SLIC3R_FORK_NAME "Slic3r Prusa Edition"
-#define SLIC3R_VERSION "1.41.0-beta2"
+#define SLIC3R_VERSION "1.41.0"
 #define SLIC3R_BUILD "UNKNOWN"
 
 typedef int32_t coord_t;

xs/src/libslic3r/utils.cpp

@@ -251,7 +251,7 @@ void PerlCallback::call(const std::vector<int>& ints) const
     LEAVE;
 }
 
-void PerlCallback::call(double d) const
+void PerlCallback::call(double a) const
 {
     if (!m_callback)
         return;
@@ -259,7 +259,7 @@ void PerlCallback::call(double d) const
     ENTER;
     SAVETMPS;
     PUSHMARK(SP);
-    XPUSHs(sv_2mortal(newSVnv(d)));
+    XPUSHs(sv_2mortal(newSVnv(a)));
     PUTBACK;
     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD);
     FREETMPS;
@@ -282,6 +282,23 @@ void PerlCallback::call(double a, double b) const
     LEAVE;
 }
 
+void PerlCallback::call(double a, double b, double c) const
+{
+    if (!m_callback)
+        return;
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    XPUSHs(sv_2mortal(newSVnv(a)));
+    XPUSHs(sv_2mortal(newSVnv(b)));
+    XPUSHs(sv_2mortal(newSVnv(c)));
+    PUTBACK;
+    perl_call_sv(SvRV((SV*)m_callback), G_DISCARD);
+    FREETMPS;
+    LEAVE;
+}
+
 void PerlCallback::call(double a, double b, double c, double d) const
 {
     if (!m_callback)