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

Follow-up of 85dd2e486a - Fixed Zoom to mouse cursor for orthograpic camera

Browse Source
This commit is contained in:
enricoturri1966 2023-04-21 09:09:04 +02:00
parent 5bb3f2f9da
commit 69b69cb9a2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2943,8 +2943,8 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
const double delta = direction_factor * (double)evt.GetWheelRotation() / (double)evt.GetWheelDelta(); const double delta = direction_factor * (double)evt.GetWheelRotation() / (double)evt.GetWheelDelta();
if (wxGetKeyState(WXK_SHIFT)) { if (wxGetKeyState(WXK_SHIFT)) {
const auto cnv_size = get_canvas_size(); const auto cnv_size = get_canvas_size();
const auto screen_center_3d_pos = _mouse_to_3d({ cnv_size.get_width() * 0.5, cnv_size.get_height() * 0.5 }); const Vec3d screen_center_3d_pos = _mouse_to_3d({ cnv_size.get_width() * 0.5, cnv_size.get_height() * 0.5 });
const auto mouse_3d_pos = _mouse_to_3d({ evt.GetX(), evt.GetY() }); const Vec3d mouse_3d_pos = _mouse_to_3d({ evt.GetX(), evt.GetY() });
const Vec3d displacement = mouse_3d_pos - screen_center_3d_pos; const Vec3d displacement = mouse_3d_pos - screen_center_3d_pos;
wxGetApp().plater()->get_camera().translate_world(displacement); wxGetApp().plater()->get_camera().translate_world(displacement);
const double origin_zoom = wxGetApp().plater()->get_camera().get_zoom(); const double origin_zoom = wxGetApp().plater()->get_camera().get_zoom();
@ -6267,7 +6267,8 @@ Vec3d GLCanvas3D::_mouse_to_3d(const Point& mouse_pos, float* z)
Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos) Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos)
{ {
return mouse_ray(mouse_pos).intersect_plane(0.0); const Linef3 ray = mouse_ray(mouse_pos);
return (std::abs(ray.unit_vector().z() < EPSILON)) ? ray.a : ray.intersect_plane(0.0);
} }
void GLCanvas3D::_start_timer() void GLCanvas3D::_start_timer()