Add volume transformation into Update volume data - which is used only for style change at the moment

It will be fine to unify filnal volume transformation when it is used together with use surface

src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp

@@ -1351,8 +1351,7 @@ namespace {
 bool is_text_empty(std::string_view text) { return text.empty() || text.find_first_not_of(" \n\t\r") == std::string::npos; }
 } // namespace
 
-bool GLGizmoEmboss::process(bool make_snapshot)
+bool GLGizmoEmboss::process(bool make_snapshot, std::optional<Transform3d> volume_transformation) {
-{
     // no volume is selected -> selection from right panel
     assert(m_volume != nullptr);
     if (m_volume == nullptr) return false;
@@ -1365,7 +1364,7 @@ bool GLGizmoEmboss::process(bool make_snapshot)
 
     const Selection& selection = m_parent.get_selection();
     DataBasePtr base = create_emboss_data_base(m_text, m_style_manager, m_text_lines, selection, m_volume->type(), m_job_cancel);
-    DataUpdate  data{std::move(base), m_volume->id(), make_snapshot};
+    DataUpdate data{std::move(base), m_volume->id(), make_snapshot, volume_transformation};
 
     // check valid count of text lines
     assert(data.base->text_lines.empty() || data.base->text_lines.size() == get_count_lines(m_text));
@@ -2201,8 +2200,11 @@ void GLGizmoEmboss::draw_delete_style_button() {
 }
 
 namespace {
-// FIX IT: It should not change volume position before successfull change volume by process
+// When during change style is need to change transformation it calculate it
-void fix_transformation(const StyleManager::Style &from, const StyleManager::Style &to, GLCanvas3D &canvas) {
+std::optional<Transform3d> fix_transformation(
+    const StyleManager::Style &from, const StyleManager::Style &to, GLCanvas3D &canvas
+) {
+    bool exist_transformation = false;
     // fix Z rotation when exists difference in styles
     const std::optional<float> &f_angle_opt = from.angle;
     const std::optional<float> &t_angle_opt = to.angle;
@@ -2210,9 +2212,9 @@ void fix_transformation(const StyleManager::Style &from, const StyleManager::Sty
         // fix rotation
         float f_angle = f_angle_opt.value_or(.0f);
         float t_angle = t_angle_opt.value_or(.0f);
+        // Rotate only UI
         do_local_z_rotate(canvas.get_selection(), t_angle - f_angle);
-        std::string no_snapshot;
+        exist_transformation = true;
-        canvas.do_rotate(no_snapshot);
     }
 
     // fix distance (Z move) when exists difference in styles
@@ -2221,10 +2223,33 @@ void fix_transformation(const StyleManager::Style &from, const StyleManager::Sty
     if (!is_approx(f_move_opt, t_move_opt)) {
         float f_move = f_move_opt.value_or(.0f);
         float t_move = t_move_opt.value_or(.0f);
+        // Move only UI
         do_local_z_move(canvas.get_selection(), t_move - f_move);
-        std::string no_snapshot;
+        exist_transformation = true;
-        canvas.do_move(no_snapshot);
     }
+
+    if (!exist_transformation)
+        return std::nullopt;
+
+    const GLVolume* gl_volume = canvas.get_selection().get_first_volume();
+    assert(gl_volume != nullptr);
+    if (gl_volume == nullptr)
+        return std::nullopt;
+
+    const Transform3d &tr = gl_volume->get_volume_transformation().get_matrix();
+
+    // exist fix matrix made by store to .3mf
+    const ModelVolume* volume = get_model_volume(*gl_volume, canvas.get_model()->objects);
+    assert(volume != nullptr);
+    if (volume == nullptr)
+        return tr;
+    const std::optional<EmbossShape> &emboss_shape = volume->emboss_shape;
+    assert(emboss_shape.has_value());
+    if (emboss_shape.has_value() && emboss_shape->fix_3mf_tr.has_value())
+        return tr * emboss_shape->fix_3mf_tr->inverse();
+
+    // no fix matrix just return transformation
+    return tr;
 }
 } // namesapce
 
@@ -2332,8 +2357,7 @@ void GLGizmoEmboss::draw_style_list() {
         StyleManager::Style cur_s = current_style;  // copy
         StyleManager::Style new_s = style;    // copy
         if (m_style_manager.load_style(*selected_style_index)) {
-            ::fix_transformation(cur_s, new_s, m_parent);
+            process(true, ::fix_transformation(cur_s, new_s, m_parent));
-            process();
         } else {
             wxString title   = _L("Not valid style.");
             wxString message = GUI::format_wxstr(_L("Style \"%1%\" can't be used and will be removed from a list."), style.name);

src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp

@@ -116,7 +116,7 @@ private:
     void reset_volume();
 
     // create volume from text - main functionality
-    bool process(bool make_snapshot = true);
+    bool process(bool make_snapshot = true, std::optional<Transform3d> volume_transformation = std::nullopt);
     void close();
     void draw_window();
     void draw_text_input();

src/slic3r/GUI/Jobs/EmbossJob.cpp

@@ -197,7 +197,7 @@ TriangleMesh create_default_mesh();
 /// <param name="mesh">New mesh data</param>
 /// <param name="data">Text configuration, ...</param>
 /// <param name="mesh">Transformation of volume</param>
-void update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3d *tr = nullptr);
+void final_update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3d *tr = nullptr);
 
 /// <summary>
 /// Update name in right panel
@@ -414,7 +414,7 @@ void UpdateJob::finalize(bool canceled, std::exception_ptr &eptr)
 {
     if (!::finalize(canceled, eptr, *m_input.base))
         return;
-    ::update_volume(std::move(m_result), m_input);
+    ::final_update_volume(std::move(m_result), m_input);
 }
 
 void UpdateJob::update_volume(ModelVolume *volume, TriangleMesh &&mesh, const DataBase &base)
@@ -496,7 +496,7 @@ void UpdateSurfaceVolumeJob::finalize(bool canceled, std::exception_ptr &eptr)
 
     // when start using surface it is wanted to move text origin on surface of model
     // also when repeteadly move above surface result position should match
-    ::update_volume(std::move(m_result), m_input, &m_input.transform);
+    ::final_update_volume(std::move(m_result), m_input, &m_input.transform);
 }
 
 namespace {
@@ -1015,7 +1015,7 @@ void update_name_in_list(const ObjectList& object_list, const ModelVolume& volum
     object_list.update_name_in_list(object_index, volume_index);
 }
 
-void update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3d *tr)
+void final_update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3d *tr)
 {
     // for sure that some object will be created
     if (mesh.its.empty())
@@ -1039,7 +1039,12 @@ void update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3
     if (volume == nullptr)
         return;
 
-    if (tr) {
+    if (data.trmat.has_value()) {
+        assert(tr == nullptr);
+        tr = &(*data.trmat);
+    }
+
+    if (tr != nullptr) {
         volume->set_transformation(*tr);
     } else {
         // apply fix matrix made by store to .3mf
@@ -1048,7 +1053,6 @@ void update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3
         if (emboss_shape.has_value() && emboss_shape->fix_3mf_tr.has_value())
             volume->set_transformation(volume->get_matrix() * emboss_shape->fix_3mf_tr->inverse());
     }
-
     UpdateJob::update_volume(volume, std::move(mesh), *data.base);
 }
 

src/slic3r/GUI/Jobs/EmbossJob.hpp

@@ -124,6 +124,10 @@ struct DataUpdate
 
     // Used for prevent flooding Undo/Redo stack on slider.
     bool make_snapshot;
+
+    // Transformation of volume after update volume shape
+    // NOTE: Add for style change, because it change rotation and distance from surface
+    std::optional<Transform3d> trmat;
 };
 
 /// <summary>