Solve merge conflict

include/openspace/interaction/interactionhandler.h

@@ -34,6 +34,8 @@
 #include <openspace/util/keys.h>
 
 #include <list>
+#include <modules/globebrowsing/globes/renderableglobe.h>
+
 #include <mutex>
 
 namespace openspace {
@@ -189,7 +191,7 @@ public:
     ~InteractionMode();
 
     // Mutators
-    void setFocusNode(SceneGraphNode* focusNode);
+    virtual void setFocusNode(SceneGraphNode* focusNode);
     void setCamera(Camera* camera);
 
     // Accessors
@@ -256,7 +258,7 @@ public:
     ~OrbitalInteractionMode();
 
     virtual void update(double deltaTime);
-private:
+protected:
     void updateMouseStatesFromInput(double deltaTime);
     void updateCameraStateFromMouseStates();
 
@@ -271,6 +273,22 @@ private:
     glm::dquat _globalCameraRotation;
 };
 
+class GlobeBrowsingInteractionMode : public OrbitalInteractionMode
+{
+public:
+    GlobeBrowsingInteractionMode(
+        std::shared_ptr<InputState> inputState,
+        double sensitivity,
+        double velocityScaleFactor);
+    ~GlobeBrowsingInteractionMode();
+
+    virtual void setFocusNode(SceneGraphNode* focusNode);
+    virtual void update(double deltaTime);
+private:
+    void updateCameraStateFromMouseStates();
+    RenderableGlobe* _globe;
+};
+
 
 class InteractionHandler : public properties::PropertyOwner
 {

include/openspace/util/camera.h

@@ -73,9 +73,9 @@ namespace openspace {
         // now working with float precision. To be changed to double later.
         // The reason double does not work yet is because of the setUniform function
         // in ghoul::opengl
-        typedef glm::quat Quat;
-        typedef glm::mat4 Mat4;
-        typedef glm::vec3 Vec3;
+        typedef glm::dquat Quat;
+        typedef glm::dmat4 Mat4;
+        typedef glm::dvec3 Vec3;
 
         // Static constants
         static const Vec3 _VIEW_DIRECTION_CAMERA_SPACE;
@@ -113,6 +113,8 @@ namespace openspace {
         // @TODO this should simply be called viewMatrix!
         // Or it needs to be changed so that it actually is combined. Right now it is
         // only the view matrix that is the same for all SGCT cameras.
+        // Right now this function returns the actual combined matrix which makes some
+        // of the old calls to the function wrong..
         const Mat4& combinedViewMatrix() const;
 
         // Synchronization

include/openspace/util/time.h

@@ -58,6 +58,10 @@ class SyncBuffer;
 
 class Time {
 public:
+    Time();
+    Time(const Time& other);
+
+
     /**
      * Initializes the Time singleton.
      * \return <code>true</code> if the initialization succeeded, <code>false</code>
@@ -123,6 +127,12 @@ public:
      */
     std::string currentTimeUTC() const;
 
+    /**
+    * Returns the current time as a ISO 8601 formatted, i.e YYYY-MM-DDThh:mm:ssZ
+    * \return The current time as a ISO 8601 formatted string
+    */
+    std::string ISO8601() const;
+    
     /**
      * Sets the delta time value that is the number of seconds that should pass for each
      * real-time second. This value is used in the advanceTime(double) method to easily