Open emboss gizmo after create new volume(no need to redraw gizmo window position)

Fix enters in volume name in object list by change to space
Fix lightning when dragging

src/slic3r/GUI/GUI_Factories.cpp

@@ -503,20 +503,20 @@ void MenuFactory::append_menu_item_add_text(wxMenu* menu, ModelVolumeType type,
     auto add_text = [type](wxCommandEvent& evt) {
         GLCanvas3D* canvas = plater()->canvas3D();
         GLGizmosManager& mng = canvas->get_gizmos_manager();
-        if ((mng.get_current_type() == GLGizmosManager::Emboss ||
+        GLGizmoBase* gizmo = mng.get_gizmo(GLGizmosManager::Emboss);
-            mng.open_gizmo(GLGizmosManager::Emboss))) {
+        GLGizmoEmboss* emboss = dynamic_cast<GLGizmoEmboss *>(gizmo);
-            GLGizmoEmboss *emboss = dynamic_cast<GLGizmoEmboss *>(mng.get_current());
+        assert(emboss != nullptr);
-            assert(emboss != nullptr);
+        if (emboss == nullptr) return;
-            if (emboss == nullptr) return;
+        
-            auto screen_position = canvas->get_popup_menu_position();
+        auto screen_position = canvas->get_popup_menu_position();
-            assert(screen_position.has_value());
+        assert(screen_position.has_value());
-            if (!screen_position.has_value()) return;
+        if (!screen_position.has_value()) return;
-            ModelVolumeType volume_type = type;
+
-            // no selected object means create new object
+        ModelVolumeType volume_type = type;
-            if (volume_type == ModelVolumeType::INVALID)
+        // no selected object means create new object
-                volume_type = ModelVolumeType::MODEL_PART;
+        if (volume_type == ModelVolumeType::INVALID)
-            emboss->create_volume(volume_type, *screen_position);
+            volume_type = ModelVolumeType::MODEL_PART;
-        }
+        emboss->create_volume(volume_type, *screen_position);        
     };
 
     if (   type == ModelVolumeType::MODEL_PART

src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp

@@ -241,7 +241,37 @@ bool GLGizmoEmboss::on_mouse_for_rotation(const wxMouseEvent &mouse_event)
     return used;
 }
 
-static Vec2d calc_mouse_to_center_text_offset(const Vec2d& mouse, const ModelVolume& mv) {
+namespace priv {
+
+/// <summary>
+/// Access to model from gl_volume
+/// TODO: it is more general function --> move to utils
+/// </summary>
+/// <param name="gl_volume">Volume to model belongs to</param>
+/// <param name="objects">All objects</param>
+/// <returns>Model for volume</returns>
+static ModelVolume *get_model_volume(const GLVolume *gl_volume, const ModelObjectPtrs &objects);
+
+/// <summary>
+/// Access to model by selection
+/// TODO: it is more general function --> move to select utils
+/// </summary>
+/// <param name="selection">Actual selection</param>
+/// <param name="objects">All objects</param>
+/// <returns>Model from selection</returns>
+static ModelVolume *get_selected_volume(const Selection &selection, const ModelObjectPtrs &objects);
+
+/// <summary>
+/// Calculate offset from mouse position to center of text
+/// </summary>
+/// <param name="mouse">Screan mouse position</param>
+/// <param name="mv">Selected volume(text)</param>
+/// <returns>Offset in screan coordinate</returns>
+static Vec2d calc_mouse_to_center_text_offset(const Vec2d &mouse, const ModelVolume &mv);
+
+} // namespace priv
+
+Vec2d priv::calc_mouse_to_center_text_offset(const Vec2d& mouse, const ModelVolume& mv) {
     const Transform3d &volume_tr   = mv.get_matrix();
     const Camera      &camera      = wxGetApp().plater()->get_camera();
     assert(mv.text_configuration.has_value());
@@ -295,7 +325,7 @@ bool GLGizmoEmboss::on_mouse_for_translate(const wxMouseEvent &mouse_event)
 
     GLVolume *gl_volume = m_parent.get_volumes().volumes[hovered_id];
     const ModelObjectPtrs &objects = wxGetApp().plater()->model().objects;
-    ModelVolume *act_model_volume = get_model_volume(gl_volume, objects);
+    ModelVolume *act_model_volume = priv::get_model_volume(gl_volume, objects);
 
     // hovered object must be actual text volume
     if (m_volume != act_model_volume) return false;
@@ -322,7 +352,7 @@ bool GLGizmoEmboss::on_mouse_for_translate(const wxMouseEvent &mouse_event)
         // IMPROVE: move to job, for big scene it slows down 
         ModelObject *act_model_object = act_model_volume->get_object();
         m_raycast_manager.actualize(act_model_object, &condition);
-        m_dragging_mouse_offset = calc_mouse_to_center_text_offset(mouse_pos, *m_volume);
+        m_dragging_mouse_offset = priv::calc_mouse_to_center_text_offset(mouse_pos, *m_volume);
         // Cancel job to prevent interuption of dragging (duplicit result)
         if (m_update_job_cancel != nullptr) m_update_job_cancel->store(true);
         return false;
@@ -440,7 +470,7 @@ void GLGizmoEmboss::on_render() {
         const Transform3d matrix = camera.get_view_matrix() * (*m_temp_transformation);
         shader->set_uniform("view_model_matrix", matrix);
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
-        shader->set_uniform("normal_matrix", (Matrix3d)matrix.matrix().block(0, 0, 3, 3).inverse().transpose());
+        shader->set_uniform("view_normal_matrix", (Matrix3d) (*m_temp_transformation).matrix().block(0, 0, 3, 3).inverse().transpose());
 #endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // dragging object must be selected so draw it with correct color
@@ -558,6 +588,13 @@ void GLGizmoEmboss::on_render_input_window(float x, float y, float bottom_limit)
     if (!m_gui_cfg.has_value()) initialize();
     check_selection();
 
+    // Do not render window for not selected text volume
+    if (m_volume == nullptr ||
+        !m_volume->text_configuration.has_value()) {
+        close();
+        return;
+    } 
+
     // TODO: fix width - showing scroll in first draw of advanced.
     const ImVec2 &min_window_size = get_minimal_window_size();
     ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, min_window_size);
@@ -859,30 +896,18 @@ void GLGizmoEmboss::check_selection()
     set_default_text();
 }
 
-ModelVolume *GLGizmoEmboss::get_selected_volume()
+ModelVolume *priv::get_model_volume(const GLVolume *gl_volume, const ModelObjectPtrs &objects)
-{
-    return get_selected_volume(m_parent.get_selection(),
-                               wxGetApp().plater()->model().objects);
-}
-
-ModelVolume *GLGizmoEmboss::get_model_volume(const GLVolume *      gl_volume,
-                                             const ModelObjectPtrs& objects)
 {
     const GLVolume::CompositeID &id = gl_volume->composite_id;
 
-    if (id.object_id < 0 ||
+    if (id.object_id < 0 || static_cast<size_t>(id.object_id) >= objects.size()) return nullptr;
-        static_cast<size_t>(id.object_id) >= objects.size())
-        return nullptr;
     ModelObject *object = objects[id.object_id];
 
-    if (id.volume_id < 0 ||
+    if (id.volume_id < 0 || static_cast<size_t>(id.volume_id) >= object->volumes.size()) return nullptr;
-        static_cast<size_t>(id.volume_id) >= object->volumes.size())
-        return nullptr;
     return object->volumes[id.volume_id];
 }
 
-ModelVolume *GLGizmoEmboss::get_selected_volume(const Selection &selection,
+ModelVolume *priv::get_selected_volume(const Selection &selection, const ModelObjectPtrs &objects)
-                                                const ModelObjectPtrs& objects)
 {
     int object_idx = selection.get_object_idx();
     // is more object selected?
@@ -891,11 +916,17 @@ ModelVolume *GLGizmoEmboss::get_selected_volume(const Selection &selection,
     auto volume_idxs = selection.get_volume_idxs();
     // is more volumes selected?
     if (volume_idxs.size() != 1) return nullptr;
-    unsigned int                 vol_id_gl = *volume_idxs.begin();
+    unsigned int    vol_id_gl = *volume_idxs.begin();
-    const GLVolume *             vol_gl    = selection.get_volume(vol_id_gl);
+    const GLVolume *vol_gl    = selection.get_volume(vol_id_gl);
     return get_model_volume(vol_gl, objects);
 }
 
+ModelVolume *GLGizmoEmboss::get_selected_volume()
+{
+    return priv::get_selected_volume(m_parent.get_selection(),
+        wxGetApp().plater()->model().objects);
+}
+
 // Run Job on main thread (blocking) - ONLY DEBUG
 static inline void execute_job(std::shared_ptr<Job> j)
 {
@@ -2944,13 +2975,14 @@ bool GLGizmoEmboss::choose_svg_file()
 
 EmbossDataBase GLGizmoEmboss::create_emboss_data_base() {
     auto create_volume_name = [&]() {
-        const size_t &max_len = m_gui_cfg->max_count_char_in_volume_name;
+        bool contain_enter = m_text.find('\n') != std::string::npos;
-        // m_text is UTF8 and can't be cutted in the middle of letter
+        std::string text_fixed;
-        std::wstring w_text = boost::nowide::widen(m_text);
+        if (contain_enter) {
-        return _u8L("Text") + " - " +
+            // change enters to space
-               ((w_text.size() > max_len) ?
+            text_fixed = m_text; // copy
-                    (boost::nowide::narrow(w_text.substr(0, max_len - 3)) + " ..") :
+            std::replace(text_fixed.begin(), text_fixed.end(), '\n', ' ');        
-                    m_text);
+        }
+        return _u8L("Text") + " - " + ((contain_enter) ? text_fixed : m_text);
     };
     
     auto create_configuration = [&]() -> TextConfiguration {

src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp

@@ -96,10 +96,7 @@ private:
     bool start_volume_creation(ModelVolumeType volume_type, const Vec2d &screen_coor);
 
     void check_selection();
-    // more general function --> move to select
     ModelVolume *get_selected_volume();
-    static ModelVolume *get_model_volume(const GLVolume *gl_volume, const ModelObjectPtrs& objects);
-    static ModelVolume *get_selected_volume(const Selection &selection, const ModelObjectPtrs& objects);
     // create volume from text - main functionality
     bool process();
     void close();
@@ -174,7 +171,6 @@ private:
     // so the change takes effect. (info by GLGizmoFdmSupports.hpp)
     struct GuiCfg
     {
-        size_t max_count_char_in_volume_name = 20;
         // Zero means it is calculated in init function
         ImVec2 minimal_window_size              = ImVec2(0, 0);
         ImVec2 minimal_window_size_with_advance = ImVec2(0, 0);

src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp

@@ -114,7 +114,10 @@ void CreateFontImageJob::finalize(bool canceled, std::exception_ptr &)
 
     // Exist result bitmap with preview?
     // (not valid input. e.g. not loadable font)
-    if (m_result.empty()) return;
+    if (m_result.empty()) {
+        // TODO: write text cannot load into texture
+        m_result = std::vector<unsigned char>(m_tex_size.x() * m_tex_size.y() * 4, {255});
+    }
 
     // upload texture on GPU
     const GLenum target = GL_TEXTURE_2D;

src/slic3r/GUI/Jobs/EmbossJob.cpp

@@ -190,6 +190,11 @@ void EmbossCreateVolumeJob::finalize(bool canceled, std::exception_ptr &eptr) {
 
     obj_list->selection_changed();
 
+    // Now is valid text volume selected open emboss gizmo
+    GLGizmosManager &manager = canvas->get_gizmos_manager();
+    if (manager.get_current_type() != GLGizmosManager::Emboss) 
+        manager.open_gizmo(GLGizmosManager::Emboss);
+
     // redraw scene
     canvas->reload_scene(true);
 }