From 9dda48d44b48661cb37e01b631eb14726d97fa97 Mon Sep 17 00:00:00 2001
From: Kalle Bladin <kallebladin@gmail.com>
Date: Thu, 19 May 2016 12:22:55 -0400
Subject: [PATCH] Remove functions setViewRotationMatrix and
 compileViewRotationMatrix from camera class.

---
 include/openspace/util/camera.h        |  5 -----
 src/interaction/interactionhandler.cpp |  4 ++--
 src/rendering/renderengine.cpp         |  4 ----
 src/util/camera.cpp                    | 23 -----------------------
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h
index b9a97e64c6..ceddce1b50 100644
--- a/include/openspace/util/camera.h
+++ b/include/openspace/util/camera.h
@@ -90,11 +90,6 @@ public:
     float sinMaxFov() const;
     const glm::mat4& viewRotationMatrix() const;
 
-
-    // TEMPORARY
-    void setViewRotationMatrix(glm::mat4 m);
-    void compileViewRotationMatrix();
-
     //@TODO this should simply be called viewMatrix!
     //Rename after removing deprecated methods
     const glm::mat4& combinedViewMatrix() const;
diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp
index 79e09f3f44..3feb36eebb 100644
--- a/src/interaction/interactionhandler.cpp
+++ b/src/interaction/interactionhandler.cpp
@@ -160,9 +160,9 @@ void InteractionHandler::update(double deltaTime) {
     
     _keyframeMutex.unlock();
     
-    if(hasKeys){
+    if (hasKeys) {
         _camera->setPosition(pos);
-        _camera->setViewRotationMatrix(glm::mat4_cast(q));
+        _camera->setRotation(q);
     }
 
         
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a4f3fa6f69..ccdeffa6d8 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -347,10 +347,6 @@ void RenderEngine::postSynchronizationPreDraw() {
         ghoul::fontrendering::FontRenderer::defaultRenderer().setWindowSize(glm::vec2(res));
     }
 
-    // converts the quaternion used to rotation matrices
-    if (_mainCamera)
-        _mainCamera->compileViewRotationMatrix();
-
     // update and evaluate the scene starting from the root node
     _sceneGraph->update({
         Time::ref().currentTime(),
diff --git a/src/util/camera.cpp b/src/util/camera.cpp
index c36ad93671..b68e8b4839 100644
--- a/src/util/camera.cpp
+++ b/src/util/camera.cpp
@@ -125,29 +125,6 @@ const glm::mat4& Camera::viewRotationMatrix() const {
 	return _viewRotationMatrix.synced;
 }
 
-void Camera::setViewRotationMatrix(glm::mat4 m) {
-    /*
-    std::lock_guard<std::mutex> _lock(_mutex);
-    _localViewRotationMatrix = m;
-    */
-}
-
-void Camera::compileViewRotationMatrix()
-{
-    /*
-    std::lock_guard<std::mutex> _lock(_mutex);
-    // convert from quaternion to rotation matrix using glm
-    //_viewRotationMatrix = glm::mat4_cast(_viewRotation);
-
-    // the camera matrix needs to be rotated inverse to the world
-    // _viewDirection = glm::rotate(glm::inverse(_viewRotation), _cameraDirection);
-    //_viewDirection = (glm::inverse(_localViewRotationMatrix) * glm::vec4(_cameraDirection, 0.f)).xyz;
-    _viewDirection = (glm::inverse(_localViewRotationMatrix) * glm::vec4(_cameraDirection, 0.f)).xyz();
-    _viewDirection = glm::normalize(_viewDirection);
-    */
-}
-
-
 const glm::mat4& Camera::combinedViewMatrix() const {
 	glm::vec3 cameraPosition = position().vec3();
 	glm::mat4 viewTransform = glm::inverse(glm::translate(glm::mat4(1.0), cameraPosition));