very basic chunk model

[blank.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index 239ddb2b429887ada5970dbe560acbfc14e003a6..fbf10bca2e1391a9f88522c0ba5ab9fe040475f1 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -7,12 +7,13 @@
 namespace blank {
 
 Camera::Camera()
-: Model()
+: FPSController()
 , fov(45.0f)
 , aspect(1.0f)
 , near_clip(0.1f)
 , far_clip(100.0f)
 , projection(glm::perspective(fov, aspect, near_clip, far_clip))
+, view(glm::inverse(Transform()))
 , vp(projection) {
 
 }
@@ -53,8 +54,9 @@ void Camera::Clip(float near, float far) {
 
 
 void Camera::Update(int dt) {
-       Model::Update(dt);
-       vp = projection * glm::inverse(Transform());
+       FPSController::Update(dt);
+       view = glm::inverse(Transform());
+       vp = projection * view;
 }
 
 void Camera::UpdateProjection() {