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
 {