diff options
Diffstat (limited to 'src/slic3r')
| -rw-r--r-- | src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp | 8 | ||||
| -rw-r--r-- | src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp | 9 | ||||
| -rw-r--r-- | src/slic3r/GUI/Preset.cpp | 2 | ||||
| -rw-r--r-- | src/slic3r/GUI/Tab.cpp | 2 |
4 files changed, 8 insertions, 13 deletions
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp index 7e8ee335d..3f74b1b13 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp @@ -600,7 +600,7 @@ void GLGizmoHollow::hollow_mesh() TriangleMesh cavity = sla::generate_interior(*m_mesh, double(m_offset), double(m_accuracy), - double(m_smoothness)); + double(m_closing_d)); if (cavity.empty()) return; @@ -753,7 +753,6 @@ RENDER_AGAIN: // m_imgui->text(" "); // vertical gap - m_imgui->text("Offset: "); ImGui::SameLine(); ImGui::SliderFloat(" ", &m_offset, 0.f, 10.f, "%.1f"); @@ -763,10 +762,9 @@ RENDER_AGAIN: ImGui::SameLine(); ImGui::SliderFloat(" ", &m_accuracy, 0.f, 1.f, "%.1f"); - // TODO: only in expert mode: - m_imgui->text("Smoothness: "); + m_imgui->text("Closing distance: "); ImGui::SameLine(); - ImGui::SliderFloat(" ", &m_smoothness, 0.f, 1.f, "%.1f"); + ImGui::SliderFloat(" ", &m_closing_d, 0.f, 20.f, "%.1f"); } else { // not in editing mode: m_imgui->text(m_desc.at("minimal_distance")); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp index 0cf1e1ecb..642f7f5a2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp @@ -109,18 +109,15 @@ private: std::vector<sla::SupportPoint> m_normal_cache; // to restore after discarding changes or undo/redo float m_offset = 2.0f; - + float m_accuracy = 0.5f; + float m_closing_d = 2.f; + float m_clipping_plane_distance = 0.f; std::unique_ptr<ClippingPlane> m_clipping_plane; - float m_accuracy = 0.5f; - // This map holds all translated description texts, so they can be easily referenced during layout calculations // etc. When language changes, GUI is recreated and this class constructed again, so the change takes effect. std::map<std::string, wxString> m_desc; - - - float m_smoothness = 0.5f; GLSelectionRectangle m_selection_rectangle; diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp index 6f511fdec..3b5a2f985 100644 --- a/src/slic3r/GUI/Preset.cpp +++ b/src/slic3r/GUI/Preset.cpp @@ -499,7 +499,7 @@ const std::vector<std::string>& Preset::sla_print_options() "hollowing_enable", "hollowing_min_thickness", "hollowing_quality", - "hollowing_flatness", + "hollowing_closing_distance", "output_filename_format", "default_sla_print_profile", "compatible_printers", diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 333384802..6f17abea4 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3569,7 +3569,7 @@ void TabSLAPrint::build() optgroup->append_single_option_line("hollowing_enable"); optgroup->append_single_option_line("hollowing_min_thickness"); optgroup->append_single_option_line("hollowing_quality"); - optgroup->append_single_option_line("hollowing_flatness"); + optgroup->append_single_option_line("hollowing_closing_distance"); page = add_options_page(_(L("Advanced")), "wrench"); optgroup = page->new_optgroup(_(L("Slicing"))); |