GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 01:32:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#11617 - Fixed calculation of camera's tight frustrum around box (SPE-2023)

Browse Source
This commit is contained in:
enricoturri1966 2023-11-09 09:55:37 +01:00
parent 82efbd6143
commit bf3772d68a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,6 +373,8 @@ std::pair<double, double> Camera::calc_tight_frustrum_zs_around(const BoundingBo
std::pair<double, double> ret; std::pair<double, double> ret;
auto& [near_z, far_z] = ret; auto& [near_z, far_z] = ret;
set_distance(DefaultDistance);
// box in eye space // box in eye space
const BoundingBoxf3 eye_box = box.transformed(m_view_matrix); const BoundingBoxf3 eye_box = box.transformed(m_view_matrix);
near_z = -eye_box.max.z(); near_z = -eye_box.max.z();
@ -396,15 +398,6 @@ std::pair<double, double> Camera::calc_tight_frustrum_zs_around(const BoundingBo
near_z += delta; near_z += delta;
far_z += delta; far_z += delta;
} }
// The following is commented out because it causes flickering of the 3D scene GUI
// when the bounding box of the scene gets large enough
// We need to introduce some smarter code to move the camera back and forth in such case
// else if (near_z > 2.0 * FrustrumMinNearZ && m_distance > DefaultDistance) {
// float delta = m_distance - DefaultDistance;
// set_distance(DefaultDistance);
// near_z -= delta;
// far_z -= delta;
// }
return ret; return ret;
} }