Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing

include/openspace/interaction/interactionhandler.h

@@ -30,6 +30,7 @@
 #include <openspace/network/parallelconnection.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/stringproperty.h>
+#include <openspace/util/mouse.h>
 #include <openspace/util/keys.h>
 
 #include <mutex>
@@ -155,19 +156,29 @@ public:
     void mousePositionCallback(double mouseX, double mouseY);
     void mouseScrollWheelCallback(double mouseScrollDelta);
 
+    // Mutators
+    void addKeyframe(const network::datamessagestructures::PositionKeyframe &kf);
+    void clearKeyframes();
+
     // Accessors
     const std::list<std::pair<Key, KeyModifier> >& getPressedKeys();
     const std::list<MouseButton>& getPressedMouseButtons();
     glm::dvec2 getMousePosition();
     double getMouseScrollDelta();
+    std::vector<network::datamessagestructures::PositionKeyframe>& getKeyFrames();
 
     bool isKeyPressed(std::pair<Key, KeyModifier> keyModPair);
     bool isMouseButtonPressed(MouseButton mouseButton);
 private:
+    // Input from keyboard and mouse
     std::list<std::pair<Key, KeyModifier> > _keysDown;
     std::list<MouseButton> _mouseButtonsDown;
     glm::dvec2 _mousePosition;
     double _mouseScrollDelta;
+
+    // Remote input via keyframes
+    std::vector<network::datamessagestructures::PositionKeyframe> _keyframes;
+    std::mutex _keyframeMutex;
 };
 
 class InteractionMode
@@ -223,6 +234,17 @@ protected:
     Camera* _camera;
 };
 
+class KeyframeInteractionMode : public InteractionMode
+{
+public:
+    KeyframeInteractionMode(std::shared_ptr<InputState> inputState);
+    ~KeyframeInteractionMode();
+
+    virtual void update(double deltaTime);
+private:
+    double _currentKeyframeTime;
+};
+
 class OrbitalInteractionMode : public InteractionMode
 {
 public:
@@ -256,8 +278,6 @@ public:
     ~InteractionHandler();
 
     // Mutators
-    void setKeyboardController(KeyboardController* controller);
-    void setMouseController(MouseController* controller);
     void setFocusNode(SceneGraphNode* node);
     void setCamera(Camera* camera);
 

include/openspace/interaction/mousecontroller.h

@@ -22,6 +22,10 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+
+//#define USE_OLD_INTERACTIONHANDLER
+#ifdef USE_OLD_INTERACTIONHANDLER
+
 #ifndef __MOUSECONTROLLER_H__
 #define __MOUSECONTROLLER_H__
 
@@ -101,4 +105,7 @@ private:
 } // namespace interaction
 } // namespace openspace
 
-#endif // __MOUSECONTROLLER_H__
+#endif // __MOUSECONTROLLER_H__
+
+
+#endif // USE_OLD_INTERACTIONHANDLER

src/engine/openspaceengine.cpp

@@ -398,8 +398,8 @@ bool OpenSpaceEngine::initialize() {
         sceneDescriptionPath = commandlineArgumentPlaceholders.sceneName;
     sceneGraph->scheduleLoadSceneFile(sceneDescriptionPath);
 
-    _interactionHandler->setKeyboardController(new interaction::KeyboardControllerFixed);
-    _interactionHandler->setMouseController(new interaction::OrbitalMouseController);
+    //_interactionHandler->setKeyboardController(new interaction::KeyboardControllerFixed);
+    //_interactionHandler->setMouseController(new interaction::OrbitalMouseController);
 
     // Run start up scripts
     runPreInitializationScripts(sceneDescriptionPath);

src/interaction/interactionhandler.cpp

@@ -622,6 +622,24 @@ InputState::~InputState() {
 
 }
 
+void InputState::addKeyframe(const network::datamessagestructures::PositionKeyframe &kf) {
+    _keyframeMutex.lock();
+
+    //save a maximum of 10 samples (1 seconds of buffer)
+    if (_keyframes.size() >= 10) {
+        _keyframes.erase(_keyframes.begin());
+    }
+    _keyframes.push_back(kf);
+
+    _keyframeMutex.unlock();
+}
+
+void InputState::clearKeyframes() {
+    _keyframeMutex.lock();
+    _keyframes.clear();
+    _keyframeMutex.unlock();
+}
+
 void InputState::keyboardCallback(Key key, KeyModifier modifier, KeyAction action) {
     if (action == KeyAction::Press) {
         _keysDown.push_back(std::pair<Key, KeyModifier>(key, modifier));
@@ -714,6 +732,20 @@ Camera* InteractionMode::camera() {
     return _camera;
 }
 
+// KeyframeInteractionMode
+KeyframeInteractionMode::KeyframeInteractionMode(std::shared_ptr<InputState> inputState)
+    : InteractionMode(inputState) {
+
+}
+
+KeyframeInteractionMode::~KeyframeInteractionMode() {
+
+}
+
+void KeyframeInteractionMode::update(double deltaTime) {
+    // TODO : Get keyframes from input state and use them to position and rotate the camera
+}
+
 // OrbitalInteractionMode
 OrbitalInteractionMode::OrbitalInteractionMode(
     std::shared_ptr<InputState> inputState,
@@ -747,19 +779,25 @@ void OrbitalInteractionMode::updateMouseStatesFromInput(double deltaTime) {
             glm::dvec2 mousePositionDelta =
                 _localRotationMouseState.previousPosition - mousePosition;
             _localRotationMouseState.velocity.set(mousePositionDelta * deltaTime * _sensitivity);
+
+            _globalRotationMouseState.previousPosition = mousePosition;
+            _globalRotationMouseState.velocity.set(glm::dvec2(0, 0));
         }
         else {
             glm::dvec2 mousePositionDelta =
                 _globalRotationMouseState.previousPosition - mousePosition;
             _globalRotationMouseState.velocity.set(mousePositionDelta * deltaTime * _sensitivity);
+
+            _localRotationMouseState.previousPosition = mousePosition;
+            _localRotationMouseState.velocity.set(glm::dvec2(0, 0));
         }
     }
-    else { //!button1Pressed
-        _globalRotationMouseState.previousPosition = mousePosition;
+    else { // !button1Pressed
         _localRotationMouseState.previousPosition = mousePosition;
-
-        _globalRotationMouseState.velocity.set(glm::dvec2(0, 0));
         _localRotationMouseState.velocity.set(glm::dvec2(0, 0));
+
+        _globalRotationMouseState.previousPosition = mousePosition;
+        _globalRotationMouseState.velocity.set(glm::dvec2(0, 0));
     }
     if (button2Pressed) {
         glm::dvec2 mousePositionDelta =
@@ -811,11 +849,14 @@ void OrbitalInteractionMode::updateCameraStateFromMouseStates() {
 
             newPosition = camPos + rotationDiffVec3;
 
-            glm::dvec3 lookUp = _camera->lookUpVectorWorldSpace();
+            glm::dvec3 directionToCenter = glm::normalize(centerPos - newPosition);
+
+            glm::dvec3 lookUpWhenFacingCenter =
+                _globalCameraRotation * glm::dvec3(_camera->lookUpVectorCameraSpace());
             glm::dmat4 lookAtMat = glm::lookAt(
                 glm::dvec3(0, 0, 0),
-                glm::normalize(centerPos - newPosition),
-                lookUp);
+                directionToCenter,
+                lookUpWhenFacingCenter);
             _globalCameraRotation =
                 glm::normalize(glm::quat_cast(glm::inverse(lookAtMat)));
         }
@@ -823,7 +864,7 @@ void OrbitalInteractionMode::updateCameraStateFromMouseStates() {
             double boundingSphere = _focusNode->boundingSphere().lengthf();
             glm::dvec3 centerToBoundingSphere =
                 glm::normalize(posDiff) *
-                boundingSphere;
+                static_cast<double>(_focusNode->boundingSphere().lengthf());
             newPosition += -(posDiff - centerToBoundingSphere) *
                 _truckMovementMouseState.velocity.get().y;
         }
@@ -874,14 +915,6 @@ InteractionHandler::~InteractionHandler() {
 
 }
 
-void InteractionHandler::setKeyboardController(KeyboardController* controller) {
-    //_interactor->setKeyboardController(controller);
-}
-
-void InteractionHandler::setMouseController(MouseController* controller) {
-    //_interactor->setMouseController(controller);
-}
-
 void InteractionHandler::setFocusNode(SceneGraphNode* node) {
     _interactor->setFocusNode(node);
 }
@@ -1017,11 +1050,11 @@ scripting::ScriptEngine::LuaLibrary InteractionHandler::luaLibrary() {
 }
 
 void InteractionHandler::addKeyframe(const network::datamessagestructures::PositionKeyframe &kf) {
-
+    _inputState->addKeyframe(kf);
 }
 
 void InteractionHandler::clearKeyframes() {
-
+    _inputState->clearKeyframes();
 }
 
 #endif // USE_OLD_INTERACTIONHANDLER

src/interaction/mousecontroller.cpp

@@ -22,6 +22,11 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+
+
+//#define USE_OLD_INTERACTIONHANDLER
+#ifdef USE_OLD_INTERACTIONHANDLER
+
 #include <openspace/interaction/mousecontroller.h>
 
 #include <openspace/engine/openspaceengine.h>
@@ -248,3 +253,5 @@ void OrbitalMouseController::update(const double& dt){
 
 } // namespace interaction
 } // namespace openspace
+
+#endif // USE_OLD_INTERACTIONHANDLER