GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-08 19:29:01 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

ENH:render normal offset face and upgrade one button

Browse Source 
upgrade assembly ui
jira: none

Change-Id: I76a2dbab1083a042fe95a027b7990e256327445b
This commit is contained in:
zhou.xu 2024-04-24 15:01:50 +08:00 committed by Lane.Wei
parent 1be7b9f48e
commit a5fb3ce6c6
5 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/GLModel.cpp
View File

@ -1400,7 +1400,7 @@ GLModel::Geometry smooth_torus(unsigned int primary_resolution, unsigned int sec
return data; return data;
} }
std::shared_ptr<GLModel> init_plane_data(const indexed_triangle_set &its, const std::vector<int> &triangle_indices) std::shared_ptr<GLModel> init_plane_data(const indexed_triangle_set &its, const std::vector<int> &triangle_indices, float normal_offset)
{ {
GLModel::Geometry init_data; GLModel::Geometry init_data;
init_data.format = {GUI::GLModel::PrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3}; init_data.format = {GUI::GLModel::PrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3};
@ -1408,11 +1408,15 @@ std::shared_ptr<GLModel> init_plane_data(const indexed_triangle_set &its, const
init_data.reserve_vertices(3 * triangle_indices.size()); init_data.reserve_vertices(3 * triangle_indices.size());
unsigned int i = 0; unsigned int i = 0;
for (int idx : triangle_indices) { for (int idx : triangle_indices) {
const Vec3f &v0 = its.vertices[its.indices[idx][0]]; Vec3f v0 = its.vertices[its.indices[idx][0]];
const Vec3f &v1 = its.vertices[its.indices[idx][1]]; Vec3f v1 = its.vertices[its.indices[idx][1]];
const Vec3f &v2 = its.vertices[its.indices[idx][2]]; Vec3f v2 = its.vertices[its.indices[idx][2]];
const Vec3f n = (v1 - v0).cross(v2 - v0).normalized(); const Vec3f n = (v1 - v0).cross(v2 - v0).normalized();
if (std::abs(normal_offset) > 0.0) {
v0 = v0 + n * normal_offset;
v1 = v1 + n * normal_offset;
v2 = v2 + n * normal_offset;
}
init_data.add_vertex(v0, n); init_data.add_vertex(v0, n);
init_data.add_vertex(v1, n); init_data.add_vertex(v1, n);
init_data.add_vertex(v2, n); init_data.add_vertex(v2, n);

2
src/slic3r/GUI/GLModel.hpp
View File

@ -225,7 +225,7 @@ namespace GUI {
// the origin of the torus is in its center // the origin of the torus is in its center
GLModel::Geometry smooth_torus(unsigned int primary_resolution, unsigned int secondary_resolution, float radius, float thickness); GLModel::Geometry smooth_torus(unsigned int primary_resolution, unsigned int secondary_resolution, float radius, float thickness);
std::shared_ptr<GLModel> init_plane_data(const indexed_triangle_set &its, const std::vector<int> &triangle_indices); std::shared_ptr<GLModel> init_plane_data(const indexed_triangle_set &its, const std::vector<int> &triangle_indices,float normal_offset = 0.0f);
std::shared_ptr<GLModel> init_torus_data(unsigned int primary_resolution, std::shared_ptr<GLModel> init_torus_data(unsigned int primary_resolution,
unsigned int secondary_resolution, unsigned int secondary_resolution,
const Vec3f & center, const Vec3f & center,

4
src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
View File

@ -91,10 +91,10 @@ void GLGizmoAssembly::on_render_input_window(float x, float y, float bottom_limi
; ;
} }
show_selection_ui(); show_selection_ui();
show_face_face_assembly_common();
ImGui::Separator(); ImGui::Separator();
show_face_face_assembly_senior();
show_distance_xyz_ui(); show_distance_xyz_ui();
show_face_face_assembly();
render_input_window_warning(m_same_model_object); render_input_window_warning(m_same_model_object);
ImGui::Separator(); ImGui::Separator();

84
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -526,7 +526,7 @@ void GLGizmoMeasure::init_circle_glmodel(GripperType gripper_type, const Measure
circle_gl_model.inv_zoom = inv_zoom; circle_gl_model.inv_zoom = inv_zoom;
} }
} }
const float MEASURE_PLNE_NORMAL_OFFSET = 0.05;
void GLGizmoMeasure::init_plane_glmodel(GripperType gripper_type, const Measure::SurfaceFeature &feature, PlaneGLModel &plane_gl_model) void GLGizmoMeasure::init_plane_glmodel(GripperType gripper_type, const Measure::SurfaceFeature &feature, PlaneGLModel &plane_gl_model)
{ {
if (!feature.volume) { return; } if (!feature.volume) { return; }
@ -539,7 +539,7 @@ void GLGizmoMeasure::init_plane_glmodel(GripperType gripper_type, const Measure:
if (!plane_gl_model.plane) { if (!plane_gl_model.plane) {
plane_gl_model.plane_idx = idx; plane_gl_model.plane_idx = idx;
reset_gripper_pick(gripper_type); reset_gripper_pick(gripper_type);
plane_gl_model.plane = init_plane_data(mesh->its, *feature.plane_indices); plane_gl_model.plane = init_plane_data(mesh->its, *feature.plane_indices, MEASURE_PLNE_NORMAL_OFFSET);
if (plane_gl_model.plane) { if (plane_gl_model.plane) {
if (auto mesh = plane_gl_model.plane->mesh) { if (auto mesh = plane_gl_model.plane->mesh) {
m_gripper_id_raycast_map[gripper_type] = std::make_shared<PickRaycaster>(mesh, PLANE_ID); m_gripper_id_raycast_map[gripper_type] = std::make_shared<PickRaycaster>(mesh, PLANE_ID);
@ -802,14 +802,10 @@ void GLGizmoMeasure::on_render()
if (!m_curr_feature.has_value() && !m_selected_features.first.feature.has_value()) { if (!m_curr_feature.has_value() && !m_selected_features.first.feature.has_value()) {
return; return;
} }
const bool old_cullface = ::glIsEnabled(GL_CULL_FACE);
glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
glsafe(::glDisable(GL_CULL_FACE)); glDisable(GL_BLEND);
auto render_feature =
auto render_feature = [this](const Measure::SurfaceFeature& feature, const std::vector<ColorRGBA>& colors, [this](const Measure::SurfaceFeature &feature, const std::vector<ColorRGBA> &colors,
float inv_zoom, bool hover, bool update_raycasters_transform,int featura_index = -1) { float inv_zoom, bool hover, bool update_raycasters_transform,int featura_index = -1) {
switch (feature.get_type()) switch (feature.get_type())
{ {
@ -1051,10 +1047,6 @@ void GLGizmoMeasure::on_render()
render_glmodel(*m_sphere, color.get_data(), tran.get_matrix(), false, 0.5f); render_glmodel(*m_sphere, color.get_data(), tran.get_matrix(), false, 0.5f);
} }
} }
if (old_cullface)
glsafe(::glEnable(GL_CULL_FACE));
render_dimensioning(); render_dimensioning();
} }
@ -1862,12 +1854,12 @@ void GLGizmoMeasure::show_selection_ui()
ImGui::PopStyleColor(); ImGui::PopStyleColor();
} }
m_imgui->disabled_begin(!m_selected_features.first.feature.has_value()); /*m_imgui->disabled_begin(!m_selected_features.first.feature.has_value());
if (m_imgui->button(_L("Restart selection"))) { if (m_imgui->button(_L("Restart selection"))) {
reset_all_feature(); reset_all_feature();
m_imgui->set_requires_extra_frame(); m_imgui->set_requires_extra_frame();
} }
m_imgui->disabled_end(); m_imgui->disabled_end();*/
if (m_show_reset_first_tip) { if (m_show_reset_first_tip) {
m_imgui->text(_L("Feature 1 has been reset, \nfeature 2 has been feature 1")); m_imgui->text(_L("Feature 1 has been reset, \nfeature 2 has been feature 1"));
@ -2016,64 +2008,52 @@ void GLGizmoMeasure::show_point_point_assembly()
{ {
} }
void GLGizmoMeasure::show_face_face_assembly() void GLGizmoMeasure::show_face_face_assembly_common() {
{
if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && m_hit_different_volumes.size() == 2 && if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && m_hit_different_volumes.size() == 2 &&
m_selected_features.first.feature->get_type() == Measure::SurfaceFeatureType::Plane && m_selected_features.first.feature->get_type() == Measure::SurfaceFeatureType::Plane &&
m_selected_features.second.feature->get_type() == Measure::SurfaceFeatureType::Plane) { m_selected_features.second.feature->get_type() == Measure::SurfaceFeatureType::Plane) {
auto &action = m_assembly_action; auto &action = m_assembly_action;
auto set_to_parallel_size = m_imgui->calc_button_size(_L("Parallel")).x; auto set_to_parallel_size = m_imgui->calc_button_size(_L("Parallel")).x;
auto set_to_center_coincidence_size = m_imgui->calc_button_size(_L("Center coincidence")).x; auto set_to_center_coincidence_size = m_imgui->calc_button_size(_L("Center coincidence")).x;
auto feature_text_size = m_imgui->calc_button_size(_L("Featue 1")).x + m_imgui->calc_button_size(":").x;
auto set_to_reverse_rotation_size = m_imgui->calc_button_size(_L("Reverse rotation")).x;
auto rotate_around_center_size = m_imgui->calc_button_size(_L("Rotate around center:")).x;
auto parallel_distance_size = m_imgui->calc_button_size(_L("Parallel_distance:")).x;
// set_feature_1//keep code
//if (action.can_set_feature_1_reverse_rotation) {
// m_imgui->text(_L("Featue 1") + ":");
// {
// ImGui::SameLine(feature_text_size + m_space_size);
// ImGui::PushItemWidth(set_to_reverse_rotation_size);
// if (m_imgui->button(_L("Reverse rotation"))) {
// set_to_reverse_rotation(m_same_model_object, 0);
// }
// // ImGui::SameLine(set_to_reverse1_rotation_size + 2 * space_size);
// }
// ImGui::Separator();
//}
//m_imgui->text(_L("Featue 2") + ":");
m_imgui->disabled_begin(!(action.can_set_to_center_coincidence)); m_imgui->disabled_begin(!(action.can_set_to_center_coincidence));
{ {
ImGui::PushItemWidth(set_to_center_coincidence_size); ImGui::PushItemWidth(set_to_center_coincidence_size);
if (m_imgui->button(_L("Center coincidence"))) { ImGui::PushStyleColor(ImGuiCol_Button, m_is_dark_mode ? ImVec4(0 / 255.0, 174 / 255.0, 66 / 255.0, 1.0) : ImVec4(0 / 255.0, 174 / 255.0, 66 / 255.0, 1.0));
set_to_center_coincidence(m_same_model_object); ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
} m_is_dark_mode ? ImVec4(50 / 255.0f, 238 / 255.0f, 61 / 255.0f, 1.00f) : ImVec4(50 / 255.0f, 238 / 255.0f, 61 / 255.0f, 1.00f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive,
m_is_dark_mode ? ImVec4(206 / 255.0f, 206 / 255.0f, 206 / 255.0f, 1.00f) : ImVec4(206 / 255.0f, 206 / 255.0f, 206 / 255.0f, 1.00f));
ImGui::PushStyleColor(ImGuiCol_Text,
m_is_dark_mode ? ImVec4(255 / 255.0f, 255 / 255.0f, 255 / 255.0f, 1.00f) : ImVec4(255 / 255.0f, 255 / 255.0f, 255 / 255.0f, 1.00f));
if (m_imgui->button(_L("Center coincidence"))) { set_to_center_coincidence(m_same_model_object); }
ImGui::PopStyleColor(4);
ImGui::SameLine(set_to_center_coincidence_size + m_space_size * 2); ImGui::SameLine(set_to_center_coincidence_size + m_space_size * 2);
} }
m_imgui->disabled_end(); m_imgui->disabled_end();
m_imgui->disabled_begin(!action.can_set_to_parallel); m_imgui->disabled_begin(!action.can_set_to_parallel);
{ {
if (m_imgui->button(_L("Parallel"))) { if (m_imgui->button(_L("Parallel"))) { set_to_parallel(m_same_model_object); }
set_to_parallel(m_same_model_object);
}
} }
m_imgui->disabled_end(); m_imgui->disabled_end();
}
}
void GLGizmoMeasure::show_face_face_assembly_senior()
{
if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && m_hit_different_volumes.size() == 2 &&
m_selected_features.first.feature->get_type() == Measure::SurfaceFeatureType::Plane &&
m_selected_features.second.feature->get_type() == Measure::SurfaceFeatureType::Plane) {
auto &action = m_assembly_action;
auto feature_text_size = m_imgui->calc_button_size(_L("Featue 1")).x + m_imgui->calc_button_size(":").x;
auto set_to_reverse_rotation_size = m_imgui->calc_button_size(_L("Reverse rotation")).x;
auto rotate_around_center_size = m_imgui->calc_button_size(_L("Rotate around center:")).x;
auto parallel_distance_size = m_imgui->calc_button_size(_L("Parallel_distance:")).x;
if (m_imgui->bbl_checkbox(_L("Flip by Face 2"), m_flip_volume_2)) { if (m_imgui->bbl_checkbox(_L("Flip by Face 2"), m_flip_volume_2)) {
set_to_reverse_rotation(m_same_model_object, 1); set_to_reverse_rotation(m_same_model_object, 1);
} }
/*ImGui::SameLine(feature_text_size + m_space_size);
m_imgui->disabled_begin(!action.can_set_feature_2_reverse_rotation);
{
ImGui::PushItemWidth(set_to_reverse_rotation_size);
ImGui::PushID("Featue2");
if (m_imgui->button(_L("Reverse rotation"))) {
set_to_reverse_rotation(m_same_model_object, 1);
}
ImGui::PopID();
}
m_imgui->disabled_end();*/
if (action.has_parallel_distance) { if (action.has_parallel_distance) {
m_imgui->text(_u8L("Parallel_distance:")); m_imgui->text(_u8L("Parallel_distance:"));

3
src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
View File

@ -245,7 +245,8 @@ protected:
void show_selection_ui(); void show_selection_ui();
void show_distance_xyz_ui(); void show_distance_xyz_ui();
void show_point_point_assembly(); void show_point_point_assembly();
void show_face_face_assembly(); void show_face_face_assembly_common();
void show_face_face_assembly_senior();
void init_render_input_window(); void init_render_input_window();
virtual void on_render_input_window(float x, float y, float bottom_limit) override; virtual void on_render_input_window(float x, float y, float bottom_limit) override;