From 2116f5c987461ea6bff86a72c76e3ba8a4170cca Mon Sep 17 00:00:00 2001
From: Erik Broberg <erikbroberg90@gmail.com>
Date: Sat, 3 Sep 2016 22:14:10 -0400
Subject: [PATCH] Rename preSync and postSync in InteractionHandler to more
 descriptive names

---
 include/openspace/interaction/interactionhandler.h |  5 ++---
 src/engine/openspaceengine.cpp                     |  7 +++----
 src/interaction/interactionhandler.cpp             | 13 +++----------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/include/openspace/interaction/interactionhandler.h b/include/openspace/interaction/interactionhandler.h
index ed0d34b25d..5f803a398f 100644
--- a/include/openspace/interaction/interactionhandler.h
+++ b/include/openspace/interaction/interactionhandler.h
@@ -173,9 +173,8 @@ public:
     void unlockControls();
 
     //void update(double deltaTime);
-
-    void preSynchronization(double deltaTime);
-    void postSynchronizationPreDraw();
+    void updateCamera();
+    void updateInputStates(double timeSinceLastUpdate);    
 
     void serialize(SyncBuffer* syncBuffer);
     void deserialize(SyncBuffer* syncBuffer);
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index b29acd2190..a79e03017c 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -768,15 +768,13 @@ void OpenSpaceEngine::preSynchronization() {
 
         _scriptEngine->preSynchronization();
 
-        // Update the mouse velocities for interaction handler
-        _interactionHandler->preSynchronization(dt);
+        _interactionHandler->updateInputStates(dt);
 
         _parallelConnection->preSynchronization();
     }
 }
 
 void OpenSpaceEngine::postSynchronizationPreDraw() {
-
     if (_isInShutdownMode) {
         if (_shutdownCountdown <= 0.f) {
             _windowWrapper->terminate();
@@ -795,7 +793,8 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     _renderEngine->camera()->invalidateCache();
 
     // Step the camera using the current mouse velocities which are synced
-    _interactionHandler->postSynchronizationPreDraw();
+    _interactionHandler->updateCamera();
+    
 
 
 #ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp
index 979b8fb112..bd5307ffcc 100644
--- a/src/interaction/interactionhandler.cpp
+++ b/src/interaction/interactionhandler.cpp
@@ -770,19 +770,13 @@ void InteractionHandler::unlockControls() {
 
 }
 
-void InteractionHandler::preSynchronization(double deltaTime) {
+void InteractionHandler::updateInputStates(double timeSinceLastUpdate) {
     ghoul_assert(_inputState != nullptr, "InputState cannot be null!");
     ghoul_assert(_camera != nullptr, "Camera cannot be null!");
-
-    if (_cameraUpdatedFromScript) {
-        _cameraUpdatedFromScript = false;
-    }
-    else {
-        _currentInteractionMode->updateMouseStatesFromInput(*_inputState, deltaTime);
-    }
+    _currentInteractionMode->updateMouseStatesFromInput(*_inputState, timeSinceLastUpdate);
 }
 
-void InteractionHandler::postSynchronizationPreDraw() {
+void InteractionHandler::updateCamera() {
     ghoul_assert(_inputState != nullptr, "InputState cannot be null!");
     ghoul_assert(_camera != nullptr, "Camera cannot be null!");
 
@@ -795,7 +789,6 @@ void InteractionHandler::postSynchronizationPreDraw() {
     }
 }
 
-
 SceneGraphNode* const InteractionHandler::focusNode() const {
     return _currentInteractionMode->focusNode();
 }