From 576c5b78e992f839d96abdc06863ef0830b1acea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= Date: Tue, 27 Apr 2021 06:48:09 +0200 Subject: [PATCH] Added seed fill for MMU segmentation --- src/libslic3r/TriangleSelector.cpp | 68 +++++- src/libslic3r/TriangleSelector.hpp | 32 ++- .../GUI/Gizmos/GLGizmoMmuSegmentation.cpp | 204 ++++++------------ .../GUI/Gizmos/GLGizmoMmuSegmentation.hpp | 3 - src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp | 82 ++++++- src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp | 4 + src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp | 3 +- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 6 +- 8 files changed, 228 insertions(+), 174 deletions(-) diff --git a/src/libslic3r/TriangleSelector.cpp b/src/libslic3r/TriangleSelector.cpp index 911dede4cb..f5907511bd 100644 --- a/src/libslic3r/TriangleSelector.cpp +++ b/src/libslic3r/TriangleSelector.cpp @@ -36,7 +36,7 @@ void TriangleSelector::Triangle::set_division(int sides_to_split, int special_si void TriangleSelector::select_patch(const Vec3f& hit, int facet_start, const Vec3f& source, float radius, CursorType cursor_type, EnforcerBlockerType new_state, - const Transform3d& trafo) + const Transform3d& trafo, bool triangle_splitting) { assert(facet_start < m_orig_size_indices); @@ -59,7 +59,7 @@ void TriangleSelector::select_patch(const Vec3f& hit, int facet_start, while (facet_idx < int(facets_to_check.size())) { int facet = facets_to_check[facet_idx]; if (! visited[facet]) { - if (select_triangle(facet, new_state)) { + if (select_triangle(facet, new_state, false, triangle_splitting)) { // add neighboring facets to list to be proccessed later for (int n=0; n<3; ++n) { int neighbor_idx = m_mesh->stl.neighbors_start[facet].neighbor[n]; @@ -73,13 +73,56 @@ void TriangleSelector::select_patch(const Vec3f& hit, int facet_start, } } +void TriangleSelector::seed_fill_select_triangles(const Vec3f& hit, int facet_start, float seed_fill_angle) +{ + this->seed_fill_unselect_all_triangles(); + std::vector visited(m_triangles.size(), false); + std::queue facet_queue; + facet_queue.push(facet_start); + + // Check if neighbour_facet_idx is satisfies angle in seed_fill_angle and append it to facet_queue if it do. + auto check_angle_and_append = [this, &facet_queue](const size_t facet_idx, const size_t neighbour_facet_idx, const float seed_fill_angle) -> void { + double dot_product = m_triangles[neighbour_facet_idx].normal.dot(m_triangles[facet_idx].normal); + dot_product = std::clamp(dot_product, 0., 1.); + double facet_angle_limit = cos(Geometry::deg2rad(seed_fill_angle)); + if ((dot_product + EPSILON) >= facet_angle_limit) + facet_queue.push(neighbour_facet_idx); + }; + + while(!facet_queue.empty()) { + size_t current_facet = facet_queue.front(); + facet_queue.pop(); + + if (!visited[current_facet]) { + if (!m_triangles[current_facet].is_split()) + m_triangles[current_facet].select_by_seed_fill(); + + if (m_triangles[current_facet].is_split()) + for (int split_triangle_idx = 0; split_triangle_idx <= m_triangles[current_facet].number_of_split_sides(); ++split_triangle_idx) { + assert(split_triangle_idx < int(m_triangles[current_facet].children.size())); + assert(m_triangles[current_facet].children[split_triangle_idx] < int(m_triangles.size())); + + if (!visited[m_triangles[current_facet].children[split_triangle_idx]]) + check_angle_and_append(current_facet, m_triangles[current_facet].children[split_triangle_idx], seed_fill_angle); + } + + if (int(current_facet) < m_orig_size_indices) + for (int neighbor_idx : m_mesh->stl.neighbors_start[current_facet].neighbor) { + assert(neighbor_idx >= 0); + if (neighbor_idx >= 0 && !visited[neighbor_idx]) + check_angle_and_append(current_facet, neighbor_idx, seed_fill_angle); + } + } + visited[current_facet] = true; + } +} // Selects either the whole triangle (discarding any children it had), or divides // the triangle recursively, selecting just subtriangles truly inside the circle. // This is done by an actual recursive call. Returns false if the triangle is // outside the cursor. -bool TriangleSelector::select_triangle(int facet_idx, EnforcerBlockerType type, bool recursive_call) +bool TriangleSelector::select_triangle(int facet_idx, EnforcerBlockerType type, bool recursive_call, bool triangle_splitting) { assert(facet_idx < int(m_triangles.size())); @@ -108,7 +151,10 @@ bool TriangleSelector::select_triangle(int facet_idx, EnforcerBlockerType type, return true; } - split_triangle(facet_idx); + if(triangle_splitting) + split_triangle(facet_idx); + else if(!m_triangles[facet_idx].is_split()) + m_triangles[facet_idx].set_state(type); tr = &m_triangles[facet_idx]; // might have been invalidated @@ -118,7 +164,7 @@ bool TriangleSelector::select_triangle(int facet_idx, EnforcerBlockerType type, assert(i < int(tr->children.size())); assert(tr->children[i] < int(m_triangles.size())); - select_triangle(tr->children[i], type, true); + select_triangle(tr->children[i], type, true, triangle_splitting); tr = &m_triangles[facet_idx]; // might have been invalidated } } @@ -710,6 +756,18 @@ void TriangleSelector::deserialize(const std::map> data) } } +void TriangleSelector::seed_fill_unselect_all_triangles() { + for (Triangle &triangle : m_triangles) + if (!triangle.is_split()) + triangle.unselect_by_seed_fill(); +} + +void TriangleSelector::seed_fill_apply_on_triangles(EnforcerBlockerType new_state) +{ + for (Triangle &triangle : m_triangles) + if (!triangle.is_split() && triangle.is_selected_by_seed_fill()) + triangle.set_state(new_state); +} TriangleSelector::Cursor::Cursor( const Vec3f& center_, const Vec3f& source_, float radius_world, diff --git a/src/libslic3r/TriangleSelector.hpp b/src/libslic3r/TriangleSelector.hpp index 9d15900704..1a420c547b 100644 --- a/src/libslic3r/TriangleSelector.hpp +++ b/src/libslic3r/TriangleSelector.hpp @@ -29,13 +29,18 @@ public: explicit TriangleSelector(const TriangleMesh& mesh); // Select all triangles fully inside the circle, subdivide where needed. - void select_patch(const Vec3f& hit, // point where to start - int facet_start, // facet that point belongs to - const Vec3f& source, // camera position (mesh coords) - float radius, // radius of the cursor - CursorType type, // current type of cursor + void select_patch(const Vec3f &hit, // point where to start + int facet_start, // facet that point belongs to + const Vec3f &source, // camera position (mesh coords) + float radius, // radius of the cursor + CursorType type, // current type of cursor EnforcerBlockerType new_state, // enforcer or blocker? - const Transform3d& trafo); // matrix to get from mesh to world + const Transform3d &trafo, // matrix to get from mesh to world + bool triangle_splitting); // If triangles will be split base on the cursor or not + + void seed_fill_select_triangles(const Vec3f &hit, // point where to start + int facet_start, // facet that point belongs to + float seed_fill_angle); // the maximal angle between two facets to be painted by the same color // Get facets currently in the given state. indexed_triangle_set get_facets(EnforcerBlockerType state) const; @@ -56,6 +61,11 @@ public: // Load serialized data. Assumes that correct mesh is loaded. void deserialize(const std::map> data); + // For all triangles, remove the flag indicating that the triangle was selected by seed fill. + void seed_fill_unselect_all_triangles(); + + // For all triangles selected by seed fill, set new EnforcerBlockerType and remove flag indicating that triangle was selected by seed fill. + void seed_fill_apply_on_triangles(EnforcerBlockerType new_state); protected: // Triangle and info about how it's split. @@ -90,6 +100,12 @@ protected: void set_state(EnforcerBlockerType type) { assert(! is_split()); state = type; } EnforcerBlockerType get_state() const { assert(! is_split()); return state; } + // Set if the triangle has been selected or unselected by seed fill. + void select_by_seed_fill() { assert(! is_split()); m_selected_by_seed_fill = true; } + void unselect_by_seed_fill() { assert(! is_split()); m_selected_by_seed_fill = false; } + // Get if the triangle has been selected or not by seed fill. + bool is_selected_by_seed_fill() const { assert(! is_split()); return m_selected_by_seed_fill; } + // Get info on how it's split. bool is_split() const { return number_of_split_sides() != 0; } int number_of_split_sides() const { return number_of_splits; } @@ -101,6 +117,7 @@ protected: int number_of_splits; int special_side_idx; EnforcerBlockerType state; + bool m_selected_by_seed_fill = false; // How many children were spawned during last split? // Is not reset on remerging the triangle. @@ -153,8 +170,7 @@ protected: float m_old_cursor_radius_sqr; // Private functions: - bool select_triangle(int facet_idx, EnforcerBlockerType type, - bool recursive_call = false); + bool select_triangle(int facet_idx, EnforcerBlockerType type, bool recursive_call = false, bool triangle_splitting = true); int vertices_inside(int facet_idx) const; bool faces_camera(int facet) const; void undivide_triangle(int facet_idx); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 6b23e76237..cc5d672bb6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -13,20 +13,15 @@ #include -namespace Slic3r { - -namespace GUI { - - +namespace Slic3r::GUI { void GLGizmoMmuSegmentation::on_shutdown() { - m_angle_threshold_deg = 0.f; +// m_seed_fill_angle = 0.f; +// m_seed_fill_enabled = false; m_parent.use_slope(false); } - - std::string GLGizmoMmuSegmentation::on_get_name() const { // FIXME Lukas H.: Discuss and change shortcut @@ -44,28 +39,24 @@ bool GLGizmoMmuSegmentation::on_init() // FIXME Lukas H.: Discuss and change shortcut m_shortcut_key = WXK_CONTROL_N; - m_desc["clipping_of_view"] = _L("Clipping of view") + ": "; - m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size"] = _L("Brush size") + ": "; - m_desc["cursor_type"] = _L("Brush shape") + ": "; - m_desc["enforce_caption"] = _L("Left mouse button") + ": "; - m_desc["enforce"] = _L("Enforce supports"); - m_desc["block_caption"] = _L("Right mouse button") + ": "; - m_desc["block"] = _L("Block supports"); - m_desc["remove_caption"] = _L("Shift + Left mouse button") + ": "; - m_desc["remove"] = _L("Remove selection"); - m_desc["remove_all"] = _L("Remove all selection"); - m_desc["circle"] = _L("Circle"); - m_desc["sphere"] = _L("Sphere"); - m_desc["highlight_by_angle"] = _L("Highlight by angle"); - m_desc["enforce_button"] = _L("Enforce"); - m_desc["cancel"] = _L("Cancel"); + m_desc["reset_direction"] = _L("Reset direction"); + m_desc["clipping_of_view"] = _L("Clipping of view") + ": "; + m_desc["cursor_size"] = _L("Brush size") + ": "; + m_desc["cursor_type"] = _L("Brush shape") + ": "; + m_desc["first_color_caption"] = _L("Left mouse button") + ": "; + m_desc["first_color"] = _L("First color"); + m_desc["second_color_caption"] = _L("Right mouse button") + ": "; + m_desc["second_color"] = _L("Second color"); + m_desc["remove_caption"] = _L("Shift + Left mouse button") + ": "; + m_desc["remove"] = _L("Remove painted color"); + m_desc["remove_all"] = _L("Remove all painted colors"); + m_desc["circle"] = _L("Circle"); + m_desc["sphere"] = _L("Sphere"); + m_desc["seed_fill_angle"] = _L("Seed fill angle"); return true; } - - void GLGizmoMmuSegmentation::render_painter_gizmo() const { const Selection& selection = m_parent.get_selection(); @@ -81,99 +72,81 @@ void GLGizmoMmuSegmentation::render_painter_gizmo() const glsafe(::glDisable(GL_BLEND)); } - - void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bottom_limit) { - if (! m_c->selection_info()->model_object()) + if (!m_c->selection_info()->model_object()) return; - const float approx_height = m_imgui->scaled(17.0f); - y = std::min(y, bottom_limit - approx_height); + const float approx_height = m_imgui->scaled(23.0f); + y = std::min(y, bottom_limit - approx_height); m_imgui->set_next_window_pos(x, y, ImGuiCond_Always); m_imgui->begin(on_get_name(), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse); // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that: const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x, - m_imgui->calc_text_size(m_desc.at("reset_direction")).x) - + m_imgui->scaled(1.5f); - const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.f); - const float autoset_slider_left = m_imgui->calc_text_size(m_desc.at("highlight_by_angle")).x + m_imgui->scaled(1.f); - const float cursor_type_radio_left = m_imgui->calc_text_size(m_desc.at("cursor_type")).x + m_imgui->scaled(1.f); - const float cursor_type_radio_width1 = m_imgui->calc_text_size(m_desc["circle"]).x - + m_imgui->scaled(2.5f); - const float cursor_type_radio_width2 = m_imgui->calc_text_size(m_desc["sphere"]).x - + m_imgui->scaled(2.5f); - const float button_width = m_imgui->calc_text_size(m_desc.at("remove_all")).x + m_imgui->scaled(1.f); - const float button_enforce_width = m_imgui->calc_text_size(m_desc.at("enforce_button")).x; - const float button_cancel_width = m_imgui->calc_text_size(m_desc.at("cancel")).x; - const float buttons_width = std::max(button_enforce_width, button_cancel_width) + m_imgui->scaled(0.5f); - const float minimal_slider_width = m_imgui->scaled(4.f); + m_imgui->calc_text_size(m_desc.at("reset_direction")).x) + m_imgui->scaled(1.5f); + const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.f); + const float autoset_slider_left = m_imgui->calc_text_size(m_desc.at("seed_fill_angle")).x + m_imgui->scaled(1.f); + const float cursor_type_radio_left = m_imgui->calc_text_size(m_desc.at("cursor_type")).x + m_imgui->scaled(1.f); + const float cursor_type_radio_width1 = m_imgui->calc_text_size(m_desc["circle"]).x + m_imgui->scaled(2.5f); + const float cursor_type_radio_width2 = m_imgui->calc_text_size(m_desc["sphere"]).x + m_imgui->scaled(2.5f); + const float button_width = m_imgui->calc_text_size(m_desc.at("remove_all")).x + m_imgui->scaled(1.f); + const float buttons_width = m_imgui->scaled(0.5f); + const float minimal_slider_width = m_imgui->scaled(4.f); - float caption_max = 0.f; + float caption_max = 0.f; float total_text_max = 0.; - for (const std::string& t : {"enforce", "block", "remove"}) { - caption_max = std::max(caption_max, m_imgui->calc_text_size(m_desc.at(t+"_caption")).x); + for (const std::string &t : {"first_color", "second_color", "remove"}) { + caption_max = std::max(caption_max, m_imgui->calc_text_size(m_desc.at(t + "_caption")).x); total_text_max = std::max(total_text_max, caption_max + m_imgui->calc_text_size(m_desc.at(t)).x); } caption_max += m_imgui->scaled(1.f); total_text_max += m_imgui->scaled(1.f); float window_width = minimal_slider_width + std::max(autoset_slider_left, std::max(cursor_slider_left, clipping_slider_left)); - window_width = std::max(window_width, total_text_max); - window_width = std::max(window_width, button_width); - window_width = std::max(window_width, cursor_type_radio_left + cursor_type_radio_width1 + cursor_type_radio_width2); - window_width = std::max(window_width, 2.f * buttons_width + m_imgui->scaled(1.f)); + window_width = std::max(window_width, total_text_max); + window_width = std::max(window_width, button_width); + window_width = std::max(window_width, cursor_type_radio_left + cursor_type_radio_width1 + cursor_type_radio_width2); + window_width = std::max(window_width, 2.f * buttons_width + m_imgui->scaled(1.f)); - auto draw_text_with_caption = [this, &caption_max](const wxString& caption, const wxString& text) { + auto draw_text_with_caption = [this, &caption_max](const wxString &caption, const wxString &text) { m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, caption); ImGui::SameLine(caption_max); m_imgui->text(text); }; - for (const std::string& t : {"enforce", "block", "remove"}) + for (const std::string &t : {"first_color", "second_color", "remove"}) draw_text_with_caption(m_desc.at(t + "_caption"), m_desc.at(t)); m_imgui->text(""); ImGui::Separator(); - m_imgui->text(m_desc["highlight_by_angle"] + ":"); + if (m_imgui->checkbox(_L("Seed fill"), m_seed_fill_enabled)) + if (!m_seed_fill_enabled) + for (auto &triangle_selector : m_triangle_selectors) + triangle_selector->seed_fill_unselect_all_triangles(); + + m_imgui->text(m_desc["seed_fill_angle"] + ":"); ImGui::AlignTextToFramePadding(); - std::string format_str = std::string("%.f") + I18N::translate_utf8("°", - "Degree sign to use in the respective slider in FDM supports gizmo," - "placed after the number with no whitespace in between."); + std::string format_str = std::string("%.f") + I18N::translate_utf8("°", "Degree sign to use in the respective slider in FDM supports gizmo," + "placed after the number with no whitespace in between."); ImGui::SameLine(autoset_slider_left); ImGui::PushItemWidth(window_width - autoset_slider_left); - if (m_imgui->slider_float("", &m_angle_threshold_deg, 0.f, 90.f, format_str.data())) { - m_parent.set_slope_normal_angle(90.f - m_angle_threshold_deg); - if (! m_parent.is_using_slope()) { - m_parent.use_slope(true); - m_parent.set_as_dirty(); - } - } - - m_imgui->disabled_begin(m_angle_threshold_deg == 0.f); - ImGui::NewLine(); - ImGui::SameLine(window_width - 2.f*buttons_width - m_imgui->scaled(0.5f)); - if (m_imgui->button(m_desc["enforce_button"], buttons_width, 0.f)) { - select_facets_by_angle(m_angle_threshold_deg, false); - m_angle_threshold_deg = 0.f; - } - ImGui::SameLine(window_width - buttons_width); - if (m_imgui->button(m_desc["cancel"], buttons_width, 0.f)) { - m_angle_threshold_deg = 0.f; - m_parent.use_slope(false); - } + m_imgui->disabled_begin(!m_seed_fill_enabled); + m_imgui->slider_float("", &m_seed_fill_angle, 0.f, 90.f, format_str.data()); m_imgui->disabled_end(); + ImGui::NewLine(); + ImGui::SameLine(window_width - 2.f * buttons_width - m_imgui->scaled(0.5f)); + ImGui::Separator(); if (m_imgui->button(m_desc.at("remove_all"))) { Plater::TakeSnapshot(wxGetApp().plater(), wxString(_L("Reset selection"))); - ModelObject* mo = m_c->selection_info()->model_object(); - int idx = -1; - for (ModelVolume* mv : mo->volumes) { + ModelObject *mo = m_c->selection_info()->model_object(); + int idx = -1; + for (ModelVolume *mv : mo->volumes) { if (mv->is_model_part()) { ++idx; m_triangle_selectors[idx]->reset(); @@ -184,7 +157,6 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott m_parent.set_as_dirty(); } - const float max_tooltip_width = ImGui::GetFontSize() * 20.0f; ImGui::AlignTextToFramePadding(); @@ -200,7 +172,6 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott ImGui::EndTooltip(); } - ImGui::AlignTextToFramePadding(); m_imgui->text(m_desc.at("cursor_type")); ImGui::SameLine(cursor_type_radio_left + m_imgui->scaled(0.f)); @@ -221,7 +192,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott ImGui::SameLine(cursor_type_radio_left + cursor_type_radio_width2 + m_imgui->scaled(0.f)); ImGui::PushItemWidth(cursor_type_radio_width2); - if (m_imgui->radio_button(m_desc["circle"], ! sphere_sel)) + if (m_imgui->radio_button(m_desc["circle"], !sphere_sel)) sphere_sel = false; if (ImGui::IsItemHovered()) { @@ -232,23 +203,17 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott ImGui::EndTooltip(); } - m_cursor_type = sphere_sel - ? TriangleSelector::CursorType::SPHERE - : TriangleSelector::CursorType::CIRCLE; - - + m_cursor_type = sphere_sel ? TriangleSelector::CursorType::SPHERE : TriangleSelector::CursorType::CIRCLE; + m_imgui->checkbox(_L("Split triangles"), m_triangle_splitting_enabled); ImGui::Separator(); if (m_c->object_clipper()->get_position() == 0.f) { ImGui::AlignTextToFramePadding(); m_imgui->text(m_desc.at("clipping_of_view")); - } - else { + } else { if (m_imgui->button(m_desc.at("reset_direction"))) { - wxGetApp().CallAfter([this](){ - m_c->object_clipper()->set_position(-1., false); - }); + wxGetApp().CallAfter([this]() { m_c->object_clipper()->set_position(-1., false); }); } } @@ -256,7 +221,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott ImGui::PushItemWidth(window_width - clipping_slider_left); float clp_dist = m_c->object_clipper()->get_position(); if (ImGui::SliderFloat(" ", &clp_dist, 0.f, 1.f, "%.2f")) - m_c->object_clipper()->set_position(clp_dist, true); + m_c->object_clipper()->set_position(clp_dist, true); if (ImGui::IsItemHovered()) { ImGui::BeginTooltip(); ImGui::PushTextWrapPos(max_tooltip_width); @@ -267,50 +232,6 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott m_imgui->end(); } - - -void GLGizmoMmuSegmentation::select_facets_by_angle(float threshold_deg, bool block) -{ - float threshold = (M_PI/180.)*threshold_deg; - const Selection& selection = m_parent.get_selection(); - const ModelObject* mo = m_c->selection_info()->model_object(); - const ModelInstance* mi = mo->instances[selection.get_instance_idx()]; - - int mesh_id = -1; - for (const ModelVolume* mv : mo->volumes) { - if (! mv->is_model_part()) - continue; - - ++mesh_id; - - const Transform3d trafo_matrix = mi->get_matrix(true) * mv->get_matrix(true); - Vec3f down = (trafo_matrix.inverse() * (-Vec3d::UnitZ())).cast().normalized(); - Vec3f limit = (trafo_matrix.inverse() * Vec3d(std::sin(threshold), 0, -std::cos(threshold))).cast().normalized(); - - float dot_limit = limit.dot(down); - - // Now calculate dot product of vert_direction and facets' normals. - int idx = -1; - for (const stl_facet& facet : mv->mesh().stl.facet_start) { - ++idx; - if (facet.normal.dot(down) > dot_limit) - m_triangle_selectors[mesh_id]->set_facet(idx, - block - ? EnforcerBlockerType::BLOCKER - : EnforcerBlockerType::ENFORCER); - } - } - - activate_internal_undo_redo_stack(true); - - Plater::TakeSnapshot(wxGetApp().plater(), block ? _L("Block supports by angle") - : _L("Add supports by angle")); - update_model_object(); - m_parent.set_as_dirty(); -} - - - void GLGizmoMmuSegmentation::update_model_object() const { bool updated = false; @@ -327,8 +248,6 @@ void GLGizmoMmuSegmentation::update_model_object() const m_parent.post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS)); } - - void GLGizmoMmuSegmentation::update_from_model_object() { wxBusyCursor wait; @@ -351,13 +270,10 @@ void GLGizmoMmuSegmentation::update_from_model_object() } } - - PainterGizmoType GLGizmoMmuSegmentation::get_painter_type() const { return PainterGizmoType::MMU_SEGMENTATION; } -} // namespace GUI } // namespace Slic3r diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp index 2833a35eba..b0bfdf65a2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp @@ -31,9 +31,6 @@ private: void on_shutdown() override; PainterGizmoType get_painter_type() const override; - void select_facets_by_angle(float threshold, bool block); - float m_angle_threshold_deg = 0.f; - // 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 m_desc; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp index c6b5bbc8e6..56f33afdd6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp @@ -143,11 +143,12 @@ void GLGizmoPainterBase::render_cursor() const if (m_rr.mesh_id == -1) return; - - if (m_cursor_type == TriangleSelector::SPHERE) - render_cursor_sphere(trafo_matrices[m_rr.mesh_id]); - else - render_cursor_circle(); + if (!m_seed_fill_enabled) { + if (m_cursor_type == TriangleSelector::SPHERE) + render_cursor_sphere(trafo_matrices[m_rr.mesh_id]); + else + render_cursor_circle(); + } } @@ -351,14 +352,50 @@ bool GLGizmoPainterBase::gizmo_event(SLAGizmoEventType action, const Vec2d& mous Vec3f camera_pos = (trafo_matrix.inverse() * camera.get_position()).cast(); assert(m_rr.mesh_id < int(m_triangle_selectors.size())); - m_triangle_selectors[m_rr.mesh_id]->select_patch(m_rr.hit, m_rr.facet, camera_pos, - m_cursor_radius, m_cursor_type, new_state, trafo_matrix); + if (m_seed_fill_enabled) + m_triangle_selectors[m_rr.mesh_id]->seed_fill_apply_on_triangles(new_state); + else + m_triangle_selectors[m_rr.mesh_id]->select_patch(m_rr.hit, m_rr.facet, camera_pos, m_cursor_radius, m_cursor_type, + new_state, trafo_matrix, m_triangle_splitting_enabled); m_last_mouse_click = mouse_position; } return true; } + if (action == SLAGizmoEventType::Moving && m_seed_fill_enabled) { + if (m_triangle_selectors.empty()) + return false; + + const Camera & camera = wxGetApp().plater()->get_camera(); + const Selection & selection = m_parent.get_selection(); + const ModelObject * mo = m_c->selection_info()->model_object(); + const ModelInstance *mi = mo->instances[selection.get_instance_idx()]; + const Transform3d & instance_trafo = mi->get_transformation().get_matrix(); + + // Precalculate transformations of individual meshes. + std::vector trafo_matrices; + for (const ModelVolume *mv : mo->volumes) + if (mv->is_model_part()) + trafo_matrices.emplace_back(instance_trafo * mv->get_matrix()); + + // Now "click" into all the prepared points and spill paint around them. + update_raycast_cache(mouse_position, camera, trafo_matrices); + + if (m_rr.mesh_id == -1) { + // Clean selected by seed fill for all triangles + for (auto &triangle_selector : m_triangle_selectors) + triangle_selector->seed_fill_unselect_all_triangles(); + + // In case we have no valid hit, we can return. + return false; + } + + assert(m_rr.mesh_id < int(m_triangle_selectors.size())); + m_triangle_selectors[m_rr.mesh_id]->seed_fill_select_triangles(m_rr.hit, m_rr.facet, m_seed_fill_angle); + return true; + } + if ((action == SLAGizmoEventType::LeftUp || action == SLAGizmoEventType::RightUp) && m_button_down != Button::None) { // Take snapshot and update ModelVolume data. @@ -521,12 +558,14 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui) { int enf_cnt = 0; int blc_cnt = 0; + int seed_fill_cnt = 0; m_iva_enforcers.release_geometry(); m_iva_blockers.release_geometry(); + m_iva_seed_fill.release_geometry(); for (const Triangle& tr : m_triangles) { - if (! tr.valid || tr.is_split() || tr.get_state() == EnforcerBlockerType::NONE) + if (!tr.valid || tr.is_split() || tr.get_state() == EnforcerBlockerType::NONE || tr.is_selected_by_seed_fill()) continue; GLIndexedVertexArray& va = tr.get_state() == EnforcerBlockerType::ENFORCER @@ -543,17 +582,32 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui) double(tr.normal[0]), double(tr.normal[1]), double(tr.normal[2])); - va.push_triangle(cnt, - cnt+1, - cnt+2); + va.push_triangle(cnt, cnt + 1, cnt + 2); cnt += 3; } + for (const Triangle &tr : m_triangles) { + if (!tr.valid || tr.is_split() || !tr.is_selected_by_seed_fill()) + continue; + + for (int i = 0; i < 3; ++i) + m_iva_seed_fill.push_geometry(double(m_vertices[tr.verts_idxs[i]].v[0]), + double(m_vertices[tr.verts_idxs[i]].v[1]), + double(m_vertices[tr.verts_idxs[i]].v[2]), + double(tr.normal[0]), + double(tr.normal[1]), + double(tr.normal[2])); + m_iva_seed_fill.push_triangle(seed_fill_cnt, seed_fill_cnt + 1, seed_fill_cnt + 2); + seed_fill_cnt += 3; + } + m_iva_enforcers.finalize_geometry(true); m_iva_blockers.finalize_geometry(true); + m_iva_seed_fill.finalize_geometry(true); bool render_enf = m_iva_enforcers.has_VBOs(); bool render_blc = m_iva_blockers.has_VBOs(); + bool render_seed_fill = m_iva_seed_fill.has_VBOs(); auto* shader = wxGetApp().get_shader("gouraud"); if (! shader) @@ -575,6 +629,12 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui) m_iva_blockers.render(); } + if (render_seed_fill) { + std::array color = { 0.f, 1.00f, 0.44f, 1.f }; + shader->set_uniform("uniform_color", color); + m_iva_seed_fill.render(); + } + #ifdef PRUSASLICER_TRIANGLE_SELECTOR_DEBUG if (imgui) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp index 400934ca34..214ebed592 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp @@ -48,6 +48,7 @@ public: private: GLIndexedVertexArray m_iva_enforcers; GLIndexedVertexArray m_iva_blockers; + GLIndexedVertexArray m_iva_seed_fill; std::array m_varrays; }; @@ -95,6 +96,9 @@ protected: TriangleSelector::CursorType m_cursor_type = TriangleSelector::SPHERE; + bool m_triangle_splitting_enabled = true; + bool m_seed_fill_enabled = false; + float m_seed_fill_angle = 0.f; private: bool is_mesh_point_clipped(const Vec3d& point, const Transform3d& trafo) const; diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp index 28be1b97f2..6f59dc95ed 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp @@ -32,7 +32,8 @@ enum class SLAGizmoEventType : unsigned char { ManualEditing, MouseWheelUp, MouseWheelDown, - ResetClippingPlane + ResetClippingPlane, + Moving }; diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index b1f38d309b..0bcc1b26be 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -522,9 +522,11 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) bool control_down = evt.CmdDown(); // mouse anywhere - if (evt.Moving()) + if (evt.Moving()) { m_tooltip = update_hover_state(mouse_pos); - else if (evt.LeftUp()) { + if (m_current == MmuSegmentation) + gizmo_event(SLAGizmoEventType::Moving, mouse_pos, evt.ShiftDown(), evt.AltDown()); + } else if (evt.LeftUp()) { if (m_mouse_capture.left) { processed = true; m_mouse_capture.left = false;