diff --git a/src/slic3r/GUI/Camera.cpp b/src/slic3r/GUI/Camera.cpp index a01e76ea4c..8271a81bab 100644 --- a/src/slic3r/GUI/Camera.cpp +++ b/src/slic3r/GUI/Camera.cpp @@ -103,13 +103,13 @@ double Camera::get_fov() const }; } -void Camera::apply_viewport(int x, int y, unsigned int w, unsigned int h) const +void Camera::apply_viewport(int x, int y, unsigned int w, unsigned int h) { glsafe(::glViewport(0, 0, w, h)); - glsafe(::glGetIntegerv(GL_VIEWPORT, const_cast*>(&m_viewport)->data())); + glsafe(::glGetIntegerv(GL_VIEWPORT, m_viewport.data())); } -void Camera::apply_view_matrix() const +void Camera::apply_view_matrix() { glsafe(::glMatrixMode(GL_MODELVIEW)); glsafe(::glLoadIdentity()); diff --git a/src/slic3r/GUI/Camera.hpp b/src/slic3r/GUI/Camera.hpp index 7fbe1d55c7..1788ab5458 100644 --- a/src/slic3r/GUI/Camera.hpp +++ b/src/slic3r/GUI/Camera.hpp @@ -91,8 +91,8 @@ public: double get_fov() const; - void apply_viewport(int x, int y, unsigned int w, unsigned int h) const; - void apply_view_matrix() const; + void apply_viewport(int x, int y, unsigned int w, unsigned int h); + void apply_view_matrix(); // Calculates and applies the projection matrix tighting the frustrum z range around the given box. // If larger z span is needed, pass the desired values of near and far z (negative values are ignored) void apply_projection(const BoundingBoxf3& box, double near_z = -1.0, double far_z = -1.0); @@ -105,7 +105,7 @@ public: #endif // ENABLE_CAMERA_STATISTICS // translate the camera in world space - void translate_world(const Vec3d& displacement) { this->set_target(m_target + displacement); } + void translate_world(const Vec3d& displacement) { set_target(m_target + displacement); } // rotate the camera on a sphere having center == m_target and radius == m_distance // using the given variations of spherical coordinates