Merge branch 'feature/retina' into feature/globebrowsing

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/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;