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

FIX:height range cut = volume_count * 2 

Jira: none
Change-Id: I539c2f9cda7985b4b3c318ca8aa1eb7c52fdce82
This commit is contained in:
zhou.xu 2024-04-02 17:46:05 +08:00 committed by Lane.Wei
parent c11d3c5110
commit 5a63200c02
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
View File

@ -349,6 +349,12 @@ void GLGizmoPainterBase::render_cursor_height_range(const Transform3d& trafo) co
const Selection& selection = m_parent.get_selection(); const Selection& selection = m_parent.get_selection();
const ModelObject* model_object = wxGetApp().model().objects[selection.get_object_idx()]; const ModelObject* model_object = wxGetApp().model().objects[selection.get_object_idx()];
const ModelInstance* mi = model_object->instances[selection.get_instance_idx()]; const ModelInstance* mi = model_object->instances[selection.get_instance_idx()];
int volumes_count = model_object->volumes.size();
if (m_cut_contours.size() != volumes_count * 2) {
m_cut_contours.resize(volumes_count * 2);
}
m_volumes_index = 0;
for (const ModelVolume* mv : model_object->volumes) { for (const ModelVolume* mv : model_object->volumes) {
TriangleMesh vol_mesh = mv->mesh(); TriangleMesh vol_mesh = mv->mesh();
if (m_parent.get_canvas_type() == GLCanvas3D::CanvasAssembleView) { if (m_parent.get_canvas_type() == GLCanvas3D::CanvasAssembleView) {
@ -359,17 +365,16 @@ void GLGizmoPainterBase::render_cursor_height_range(const Transform3d& trafo) co
else { else {
vol_mesh.transform(mi->get_transformation().get_matrix() * mv->get_matrix()); vol_mesh.transform(mi->get_transformation().get_matrix() * mv->get_matrix());
} }
if (m_cut_contours.size() != zs.size()) {
m_cut_contours.resize(zs.size());
}
for (int i = 0; i < zs.size(); i++) { for (int i = 0; i < zs.size(); i++) {
update_contours(i, vol_mesh, zs[i], max_z, min_z, m_is_cursor_in_imgui? false:(i == 0 ? true : false)); update_contours(m_volumes_index, vol_mesh, zs[i], max_z, min_z, m_is_cursor_in_imgui ? false : (i == 0 ? true : false));
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(m_cut_contours[i].shift.x(), m_cut_contours[i].shift.y(), m_cut_contours[i].shift.z())); glsafe(::glTranslated(m_cut_contours[m_volumes_index].shift.x(), m_cut_contours[m_volumes_index].shift.y(), m_cut_contours[m_volumes_index].shift.z()));
glsafe(::glLineWidth(2.0f)); glsafe(::glLineWidth(2.0f));
m_cut_contours[i].contours.render(); m_cut_contours[m_volumes_index].contours.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
m_volumes_index++;
} }
} }

1
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
View File

@ -373,6 +373,7 @@ protected:
int instance_idx{ -1 }; int instance_idx{ -1 };
}; };
mutable std::vector<CutContours> m_cut_contours; mutable std::vector<CutContours> m_cut_contours;
mutable int m_volumes_index = 0;
mutable float m_cursor_z{0}; mutable float m_cursor_z{0};
mutable double m_height_start_z_in_imgui{0}; mutable double m_height_start_z_in_imgui{0};
mutable bool m_is_set_height_start_z_by_imgui{false}; mutable bool m_is_set_height_start_z_by_imgui{false};