3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert 740067c and e645f4a

Browse source 
740067c: "Fixed cut contours in gizmo cut after deleting an object"
e645f4a: "Fixed cut contours after cutting an object in gizmo cut"
This commit is contained in:
Lukas Matena 2021-08-18 11:17:41 +02:00
parent 740067c576
commit 3cf6d1c888
3 changed files with 4 additions and 24 deletions

2
src/slic3r/GUI/3DScene.cpp
View file

@ -306,7 +306,7 @@ void GLVolume::SinkingContours::update()
int object_idx = m_parent.object_idx(); int object_idx = m_parent.object_idx();
Model& model = GUI::wxGetApp().plater()->model(); Model& model = GUI::wxGetApp().plater()->model();
if (0 <= object_idx && object_idx < (int)model.objects.size() && m_parent.is_sinking() && !m_parent.is_below_printbed()) { if (0 <= object_idx && object_idx < model.objects.size() && m_parent.is_sinking() && !m_parent.is_below_printbed()) {
const BoundingBoxf3& box = m_parent.transformed_convex_hull_bounding_box(); const BoundingBoxf3& box = m_parent.transformed_convex_hull_bounding_box();
if (!m_old_box.size().isApprox(box.size()) || m_old_box.min.z() != box.min.z()) { if (!m_old_box.size().isApprox(box.size()) || m_old_box.min.z() != box.min.z()) {
m_old_box = box; m_old_box = box;

16
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View file

@ -55,15 +55,8 @@ std::string GLGizmoCut::on_get_name() const
void GLGizmoCut::on_set_state() void GLGizmoCut::on_set_state()
{ {
// Reset m_cut_z on gizmo activation // Reset m_cut_z on gizmo activation
#if ENABLE_SINKING_CONTOURS
if (get_state() == On) {
m_cut_z = bounding_box().center().z();
m_cut_contours.reset();
}
#else
if (get_state() == On) if (get_state() == On)
m_cut_z = bounding_box().center().z(); m_cut_z = bounding_box().center().z();
#endif // ENABLE_SINKING_CONTOURS
} }
bool GLGizmoCut::on_is_activable() const bool GLGizmoCut::on_is_activable() const
@ -216,12 +209,8 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit)
m_imgui->end(); m_imgui->end();
if (cut_clicked && (m_keep_upper || m_keep_lower)) { if (cut_clicked && (m_keep_upper || m_keep_lower))
perform_cut(m_parent.get_selection()); perform_cut(m_parent.get_selection());
#if ENABLE_SINKING_CONTOURS
m_cut_contours.reset();
#endif // ENABLE_SINKING_CONTOURS
}
} }
void GLGizmoCut::set_cut_z(double cut_z) void GLGizmoCut::set_cut_z(double cut_z)
@ -319,8 +308,9 @@ void GLGizmoCut::update_contours()
m_cut_contours.contours.set_color(-1, { 1.0f, 1.0f, 1.0f, 1.0f }); m_cut_contours.contours.set_color(-1, { 1.0f, 1.0f, 1.0f, 1.0f });
} }
} }
else if (box.center() != m_cut_contours.position) else if (box.center() != m_cut_contours.position) {
m_cut_contours.shift = box.center() - m_cut_contours.position; m_cut_contours.shift = box.center() - m_cut_contours.position;
}
} }
else else
m_cut_contours.contours.reset(); m_cut_contours.contours.reset();

10
src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
View file

@ -35,16 +35,6 @@ class GLGizmoCut : public GLGizmoBase
Vec3d shift{ Vec3d::Zero() }; Vec3d shift{ Vec3d::Zero() };
int object_idx{ -1 }; int object_idx{ -1 };
int instance_idx{ -1 }; int instance_idx{ -1 };
void reset() {
mesh.clear();
contours.reset();
cut_z = 0.0;
position = Vec3d::Zero();
shift = Vec3d::Zero();
object_idx = -1;
instance_idx = -1;
}
}; };
CutContours m_cut_contours; CutContours m_cut_contours;