minor optimizations in chunk

[blank.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index 8309fe6414965b2a67d7c560f7c30e3d34227db6..f4e3171b01fb2697062cbb1bea6180f00a9ec109 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -1,68 +1,55 @@
 #include "camera.hpp"
 
+#include "geometry.hpp"
+
 #include <GL/glew.h>
 #include <glm/gtc/matrix_transform.hpp>
 
 
 namespace blank {
 
-Camera::Camera()
-: fov(45.0f)
+Camera::Camera() noexcept
+: fov(PI_0p25)
 , aspect(1.0f)
 , near_clip(0.1f)
-, far_clip(100.0f)
-, position(0, 0, 0)
-, target(0, 0, -1)
-, up(0, 1, 0)
-, projection(glm::perspective(fov, aspect, near_clip, far_clip))
-, view(glm::lookAt(position, target, up))
-, vp(projection * view) {
-
-}
-
-Camera::~Camera() {
+, far_clip(256.0f)
+, projection(glm::perspective(fov, aspect, near_clip, far_clip)) {
 
 }
 
 
-void Camera::Viewport(int width, int height) {
+void Camera::Viewport(int width, int height) noexcept {
        Viewport(0, 0, width, height);
 }
 
-void Camera::Viewport(int x, int y, int width, int height) {
+void Camera::Viewport(int x, int y, int width, int height) noexcept {
        glViewport(x, y, width, height);
        Aspect(width, height);
 }
 
-void Camera::FOV(float f) {
+void Camera::FOV(float f) noexcept {
        fov = f;
        UpdateProjection();
 }
 
-void Camera::Aspect(float r) {
+void Camera::Aspect(float r) noexcept {
        aspect = r;
        UpdateProjection();
 }
 
-void Camera::Aspect(float w, float h) {
+void Camera::Aspect(float w, float h) noexcept {
        Aspect(w / h);
 }
 
-void Camera::Clip(float near, float far) {
+void Camera::Clip(float near, float far) noexcept {
        near_clip = near;
        far_clip = far;
        UpdateProjection();
 }
 
 
-void Camera::UpdateProjection() {
+void Camera::UpdateProjection() noexcept {
        projection = glm::perspective(fov, aspect, near_clip, far_clip);
-       vp = projection * view;
-}
-
-void Camera::UpdateView() {
-       view = glm::lookAt(position, target, up);
-       vp = projection * view;
 }
 
 }