Merge

include/openspace/engine/configurationmanager.h

@@ -97,6 +97,9 @@ public:
     /// The key that stores the time (in seconds) that the application will wait before
     /// shutting down after the shutdown call is made
     static const std::string KeyShutdownCountdown;
+    /// The key that stores whether the onscreen text should be scaled to the window size
+    /// or the window resolution
+    static const std::string KeyOnScreenTextScaling;
     /// The key that stores whether the master node should perform rendering just function
     /// as a pure manager
     static const std::string KeyDisableMasterRendering;

include/openspace/interaction/interactionhandler.h

@@ -76,7 +76,7 @@ public:
     void unlockControls();
 
     //void update(double deltaTime);
-    void updateCamera();
+    void updateCamera(double deltaTime);
     void updateInputStates(double timeSinceLastUpdate);    
 
     // Accessors

include/openspace/interaction/interactionmode.h

@@ -120,7 +120,7 @@ public:
     Interpolator<double>& rotateToFocusNodeInterpolator();
     
     virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime) = 0;
-    virtual void updateCameraStateFromMouseStates(Camera& camera) = 0;
+    virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime) = 0;
 
 protected:
     /**
@@ -193,7 +193,7 @@ public:
     ~KeyframeInteractionMode();
 
     virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
-    virtual void updateCameraStateFromMouseStates(Camera& camera);
+    virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
 
 private:
     std::vector<datamessagestructures::CameraKeyframe> _keyframes;
@@ -243,10 +243,10 @@ public:
     //virtual void update(Camera& camera, const InputState& inputState, double deltaTime);
 
     virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
-    virtual void updateCameraStateFromMouseStates(Camera& camera);
+    virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
 
 protected:
-    //void updateCameraStateFromMouseStates(Camera& camera);
+    //void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
     std::shared_ptr<MouseStates> _mouseStates;
 };
 
@@ -258,11 +258,13 @@ public:
 
     virtual void setFocusNode(SceneGraphNode* focusNode);
     //virtual void update(Camera& camera, const InputState& inputState, double deltaTime);
-    virtual void updateCameraStateFromMouseStates(Camera& camera);
+    virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
 
 private:
-    //void updateCameraStateFromMouseStates(Camera& camera);
+    //void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
     globebrowsing::RenderableGlobe* _globe;
+#endif
 };
 
 } // namespace interaction

include/openspace/rendering/renderengine.h

@@ -190,6 +190,9 @@ public:
 
     void sortScreenspaceRenderables();
 
+    glm::ivec2 renderingResolution() const;
+    glm::ivec2 fontResolution() const;
+
     // This is temporary until a proper screenspace solution is found ---abock
     struct OnScreenInformation{
         glm::vec2 _position;