juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-15 04:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop the per-frame mouse raycast that only a drag start reads (#15664)

Browse Source
This commit is contained in:
Kris Austin
2026-09-14 16:31:23 -05:00
committed by GitHub
parent 5c635d5e50
commit 292cf0095e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -2098,12 +2098,6 @@ void GLCanvas3D::render(bool only_init)
_render_selection_center(); _render_selection_center();
#endif // ENABLE_RENDER_SELECTION_CENTER #endif // ENABLE_RENDER_SELECTION_CENTER
// we need to set the mouse's scene position here because the depth buffer
// could be invalidated by the following gizmo render methods
// this position is used later into on_mouse() to drag the objects
if (m_picking_enabled)
m_mouse.scene_position = _mouse_to_3d(m_mouse.position.cast<coord_t>());
// sidebar hints need to be rendered before the gizmos because the depth buffer // sidebar hints need to be rendered before the gizmos because the depth buffer
// could be invalidated by the following gizmo render methods // could be invalidated by the following gizmo render methods
_render_selection_sidebar_hints(); _render_selection_sidebar_hints();
@@ -4491,12 +4485,13 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
BoundingBoxf3 volume_bbox = m_volumes.volumes[volume_idx]->transformed_bounding_box(); BoundingBoxf3 volume_bbox = m_volumes.volumes[volume_idx]->transformed_bounding_box();
volume_bbox.offset(1.0); volume_bbox.offset(1.0);
const bool is_cut_connector_selected = m_selection.is_any_connector(); const bool is_cut_connector_selected = m_selection.is_any_connector();
if ((!any_gizmo_active || !evt.CmdDown()) && volume_bbox.contains(m_mouse.scene_position) && !is_cut_connector_selected) { const Vec3d scene_position = _mouse_to_3d(pos);
if ((!any_gizmo_active || !evt.CmdDown()) && volume_bbox.contains(scene_position) && !is_cut_connector_selected) {
m_volumes.volumes[volume_idx]->hover = GLVolume::HS_None; m_volumes.volumes[volume_idx]->hover = GLVolume::HS_None;
// The dragging operation is initiated. // The dragging operation is initiated.
m_mouse.drag.move_volume_idx = volume_idx; m_mouse.drag.move_volume_idx = volume_idx;
m_selection.setup_cache(); m_selection.setup_cache();
m_mouse.drag.start_position_3D = m_mouse.scene_position; m_mouse.drag.start_position_3D = scene_position;
m_sequential_print_clearance_first_displacement = true; m_sequential_print_clearance_first_displacement = true;
m_moving = true; m_moving = true;

1
src/slic3r/GUI/GLCanvas3D.hpp
View File

@@ -337,7 +337,6 @@ class GLCanvas3D
bool dragging{ false }; bool dragging{ false };
Vec2d position{ DBL_MAX, DBL_MAX }; Vec2d position{ DBL_MAX, DBL_MAX };
Vec3d scene_position{ DBL_MAX, DBL_MAX, DBL_MAX };
bool ignore_left_up{ false }; bool ignore_left_up{ false };
Drag drag; Drag drag;
bool ignore_right_up; bool ignore_right_up;