mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:update calculation method in part render for cut gizmo 

jira: none
Change-Id: I0948f118fbd8c204b5ae0e16d6b14ef094c7da30
This commit is contained in:
zhou.xu 2024-07-15 16:17:53 +08:00 committed by Lane.Wei
parent 85aa6fddfc
commit 85b990e8ad
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
View File

@ -524,7 +524,7 @@ bool GLGizmoAdvancedCut::on_is_activable() const
if (const ModelObject *mo = wxGetApp().plater()->model().objects[object_idx]; mo->is_cut() && mo->volumes.size() == 1) {
const ModelVolume *volume = mo->volumes[0];
if (volume->is_cut_connector() && volume->cut_info.connector_type == CutConnectorType::Dowel)
if (volume->is_cut_connector() && volume->cut_info.connector_type == CutConnectorType::Dowel)
return false;
}
@ -674,9 +674,10 @@ void GLGizmoAdvancedCut::on_render()
if (m_part_selection) {
if (!m_connectors_editing) {
if (m_is_dragging == false) { m_part_selection->part_render(nullptr); }
} else
m_part_selection->part_render(&m_plane_normal);
if (m_is_dragging == false) { m_part_selection->part_render(nullptr,nullptr); }
} else {
m_part_selection->part_render(&m_plane_center, &m_plane_normal);
}
}
if (!m_connectors_editing) {
render_cut_plane_and_grabbers();
@ -2625,18 +2626,27 @@ PartSelection::PartSelection(const ModelObject *object, int instance_idx_in) : m
m_valid = true;
}
void PartSelection::part_render(const Vec3d *normal)
void PartSelection::part_render(const Vec3d *cut_center, const Vec3d *normal)
{
if (!valid())
return;
const Camera &camera = wxGetApp().plater()->get_camera();
const bool is_looking_forward = normal && camera.get_dir_forward().dot(*normal) < 0.05;
glEnable(GL_DEPTH_TEST);
for (size_t id = 0; id < m_cut_parts.size(); ++id) { // m_parts.size() test
if (normal && ((is_looking_forward && m_cut_parts[id].is_up_part) || (!is_looking_forward && !m_cut_parts[id].is_up_part)))
continue;
bool is_looking_forward = true;
auto is_at_normal_dir = false;
if (cut_center && normal) {
auto part_center =m_cut_parts[id].trans * m_cut_parts[id].glmodel.get_bounding_box().center();
is_at_normal_dir=(*cut_center - part_center).normalized().dot(*normal) > 0 ;
Vec3d valid_normal = is_at_normal_dir ? *normal : -*normal;
is_looking_forward = camera.get_dir_forward().dot(valid_normal) < 0.05;
}
if (cut_center) {
if (!is_looking_forward)
continue;
}
GLGizmoBase::render_glmodel(m_cut_parts[id].glmodel, m_cut_parts[id].is_up_part ? UPPER_PART_COLOR.get_data() : LOWER_PART_COLOR.get_data(), m_cut_parts[id].trans);
}
}

2
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp
View File

@ -39,7 +39,7 @@ public:
bool is_up_part;
Transform3d trans;
};
void part_render(const Vec3d *normal);
void part_render(const Vec3d *cut_center, const Vec3d *normal);
void toggle_selection(const Vec2d &mouse_pos);
void toggle_selection(int id);
void turn_over_selection();