From 3a887fef02a8049fd4058db7882a8c76a2bb15ad Mon Sep 17 00:00:00 2001
From: Erik Broberg <erikbroberg90@gmail.com>
Date: Sat, 3 Sep 2016 21:02:30 -0400
Subject: [PATCH] Remove non-descriptive preSync and postSync methods from
 Camera class

---
 include/openspace/util/camera.h        | 4 ++--
 src/engine/openspaceengine.cpp         | 9 +--------
 src/interaction/interactionhandler.cpp | 8 --------
 src/util/camera.cpp                    | 9 +--------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h
index f4501ec5ca..70d75b9c9e 100644
--- a/include/openspace/util/camera.h
+++ b/include/openspace/util/camera.h
@@ -118,9 +118,9 @@ namespace openspace {
         // of the old calls to the function wrong..
         const Mat4& combinedViewMatrix() const;
 
+        void invalidateCache();
+
         // Synchronization
-        void postSynchronizationPreDraw();
-        void preSynchronization();
         void serialize(SyncBuffer* syncBuffer);
         void deserialize(SyncBuffer* syncBuffer);
         
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index a7217875cd..45605f124d 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -774,8 +774,6 @@ void OpenSpaceEngine::preSynchronization() {
         // Update the mouse velocities for interaction handler
         _interactionHandler->preSynchronization(dt);
 
-        _renderEngine->camera()->preSynchronization();
-
         _parallelConnection->preSynchronization();
     }
 }
@@ -794,16 +792,11 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     _scriptEngine->postSynchronizationPreDraw();
     _renderEngine->postSynchronizationPreDraw();
     
-    // Sync the camera to match the previous frame
-    _renderEngine->camera()->postSynchronizationPreDraw();
+    _renderEngine->camera()->invalidateCache();
 
     // Step the camera using the current mouse velocities which are synced
     _interactionHandler->postSynchronizationPreDraw();
 
-    // Update the synched variables in the camera class
-
-    _renderEngine->camera()->preSynchronization();
-    _renderEngine->camera()->postSynchronizationPreDraw();
 
 #ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
     if (_isMaster && _gui->isEnabled() && _windowWrapper->isRegularRendering()) {
diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp
index f1bf90b1aa..979b8fb112 100644
--- a/src/interaction/interactionhandler.cpp
+++ b/src/interaction/interactionhandler.cpp
@@ -734,10 +734,6 @@ void InteractionHandler::resetCameraDirection() {
 
     // Update camera Rotation
     _camera->setRotation(rotationLookAtFocusNode);
-
-    // Explicitly synch
-    _camera->preSynchronization();
-    _camera->postSynchronizationPreDraw();
 }
 
 void InteractionHandler::setInteractionMode(std::shared_ptr<InteractionMode> interactionMode) {
@@ -865,10 +861,6 @@ void InteractionHandler::setCameraStateFromDictionary(const ghoul::Dictionary& c
     _camera->setPositionVec3(cameraPosition);
     _camera->setRotation(glm::dquat(
         cameraRotation.x, cameraRotation.y, cameraRotation.z, cameraRotation.w));
-
-    // Explicitly synch
-    _camera->preSynchronization();
-    _camera->postSynchronizationPreDraw();
 }
 
 ghoul::Dictionary InteractionHandler::getCameraStateDictionary() {
diff --git a/src/util/camera.cpp b/src/util/camera.cpp
index 2496969a20..74713ccca6 100644
--- a/src/util/camera.cpp
+++ b/src/util/camera.cpp
@@ -200,9 +200,7 @@ namespace openspace {
         syncData.deserialize(syncBuffer);
     }
 
-    void Camera::postSynchronizationPreDraw() {
-        std::lock_guard<std::mutex> _lock(_mutex);
-
+    void Camera::invalidateCache() {
         _cachedViewDirection.isDirty = true;
         _cachedLookupVector.isDirty = true;
         _cachedViewRotationMatrix.isDirty = true;
@@ -226,11 +224,6 @@ namespace openspace {
         setRotation(q);
     }
 
-    void Camera::preSynchronization() {
-        std::lock_guard<std::mutex> _lock(_mutex);
-
-    }
-
     //////////////////////////////////////////////////////////////////////////////////////
     //                                    SGCT INTERNAL                                    //
     //////////////////////////////////////////////////////////////////////////////////////