diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2020-01-29 16:44:03 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2020-01-29 16:44:03 +0300 |
| commit | da3cb30b7cc3106d8f0b7e0e176eac3fac32f3a2 (patch) | |
| tree | 145ac8a9ba3f0ae06f4c303423f1bb3c419c3007 /src | |
| parent | 7156ed998727a32827af938d048e0f14c06ada6e (diff) | |
Follow-up of 17a6b696e7a4b94d49e09b8598b0343a3c2ddd40 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/Camera.cpp | 4 | ||||
| -rw-r--r-- | src/slic3r/GUI/Camera.hpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Camera.cpp b/src/slic3r/GUI/Camera.cpp index 4eaa5a9e3..a4eccf050 100644 --- a/src/slic3r/GUI/Camera.cpp +++ b/src/slic3r/GUI/Camera.cpp @@ -502,16 +502,16 @@ void Camera::rotate_local_around_pivot(const Vec3d& rotation_rad, const Vec3d& p m_view_matrix.rotate(Eigen::AngleAxisd(rotation_rad(2), get_dir_forward())); translate_world(center); } +#endif // ENABLE_6DOF_CAMERA double Camera::min_zoom() const { #if ENABLE_6DOF_CAMERA return 0.7 * calc_zoom_to_bounding_box_factor(m_scene_box); #else - return 0.7 * calc_zoom_to_bounding_box_factor(m_scene_box, (int)m_viewport[2], (int)m_viewport[3]); + return 0.7 * calc_zoom_to_bounding_box_factor(m_scene_box, m_viewport[2], m_viewport[3]); #endif // ENABLE_6DOF_CAMERA } -#endif // ENABLE_6DOF_CAMERA std::pair<double, double> Camera::calc_tight_frustrum_zs_around(const BoundingBoxf3& box) const { diff --git a/src/slic3r/GUI/Camera.hpp b/src/slic3r/GUI/Camera.hpp index a1c42a0c6..b0a646ebf 100644 --- a/src/slic3r/GUI/Camera.hpp +++ b/src/slic3r/GUI/Camera.hpp @@ -146,10 +146,9 @@ public: // returns true if the camera z axis (forward) is pointing in the negative direction of the world z axis bool is_looking_downward() const { return get_dir_forward().dot(Vec3d::UnitZ()) < 0.0; } - +#endif // ENABLE_6DOF_CAMERA double max_zoom() const { return 100.0; } double min_zoom() const; -#endif // ENABLE_6DOF_CAMERA private: // returns tight values for nearZ and farZ plane around the given bounding box |