From 0addb3b9e7f5ed77b5be5f89176a983546617dd8 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 19 Dec 2022 13:11:38 +0100 Subject: [PATCH] Cut: Hide Debug window, leave rectangle mode for the cut plane + Fixed CameraUtils::ray_from_persp_screen_pos() to return a correct value of the point --- src/slic3r/GUI/CameraUtils.cpp | 8 ++------ src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 1 + src/slic3r/GUI/Gizmos/GLGizmoCut.hpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/CameraUtils.cpp b/src/slic3r/GUI/CameraUtils.cpp index 41425dd23..99d022e4b 100644 --- a/src/slic3r/GUI/CameraUtils.cpp +++ b/src/slic3r/GUI/CameraUtils.cpp @@ -110,12 +110,8 @@ void CameraUtils::ray_from_persp_screen_pos(const Camera &camera, const Vec2d &p Matrix4d modelview = camera.get_view_matrix().matrix(); Matrix4d projection = camera.get_projection_matrix().matrix(); Vec4i viewport(camera.get_viewport().data()); - - Vec3d unprojected_point; - igl::unproject(screen_point(camera, position), modelview, projection, viewport, unprojected_point); - - point = camera.get_position(); - direction = unprojected_point - point; + igl::unproject(screen_point(camera, position), modelview, projection, viewport, point); + direction = point - camera.get_position(); } Vec2d CameraUtils::get_z0_position(const Camera &camera, const Vec2d & coor) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 0202f8ada..5f000bb03 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -1426,6 +1426,7 @@ void GLGizmoCut3D::on_render() void GLGizmoCut3D::render_debug_input_window(float x) { + return; m_imgui->begin(wxString("DEBUG")); ImVec2 pos = ImGui::GetWindowPos(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp index 88027f684..6158c0405 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp @@ -97,7 +97,7 @@ class GLGizmoCut3D : public GLGizmoBase bool m_hide_cut_plane{ false }; bool m_connectors_editing{ false }; - bool m_cut_plane_as_circle{ true }; + bool m_cut_plane_as_circle{ false }; float m_connector_depth_ratio{ 3.f }; float m_connector_size{ 2.5f };