Merge branch 'develop' into feature/globebrowsing

include/openspace/engine/wrapper/sgctwindowwrapper.h

@@ -42,6 +42,7 @@ public:
     bool windowHasResized() const override;
 
     double averageDeltaTime() const override;
+	double deltaTime() const override;
     glm::vec2 mousePosition() const override;
     uint32_t mouseButtons(int maxNumber) const override;
     glm::ivec2 currentWindowSize() const override;

include/openspace/engine/wrapper/windowwrapper.h

@@ -79,6 +79,12 @@ public:
      */
     virtual double averageDeltaTime() const;
 
+	/**
+	* Returns the frametime in seconds. On default, this method returns <code>0.0</code>.
+	* \return The frametime in seconds
+	*/
+	virtual double deltaTime() const;
+
     /**
      * Returns the location of the mouse cursor in pixel screen coordinates. On default,
      * this method returns <code>0,0</code>.

include/openspace/rendering/renderengine.h

@@ -68,8 +68,15 @@ public:
         Post
     };
 
+	enum class FrametimeType {
+		DtTimeAvg = 0,
+		FPS,
+		FPSAvg
+	};
+
     static const std::string KeyFontMono;
     static const std::string KeyFontLight;
+	static const std::vector<FrametimeType> FrametimeTypes;
 
     RenderEngine();
     ~RenderEngine();
@@ -97,6 +104,7 @@ public:
 
     void takeScreenshot();
     void toggleInfoText(bool b);
+	void toggleFrametimeType(int t);
 
     // Performance measurements
     void setPerformanceMeasurements(bool performanceMeasurements);
@@ -199,6 +207,8 @@ private:
     ghoul::Dictionary _resolveData;
     ScreenLog* _log;
 
+	FrametimeType _frametimeType;
+
     bool _showInfo;
     bool _showLog;
     bool _takeScreenshot;