More work on performance measuring in imgui

include/openspace/engine/gui.h

@@ -34,6 +34,10 @@
 #include <string>
 #include <vector>
 
+namespace ghoul {
+	class SharedMemory;
+}
+
 namespace openspace {
 
 namespace properties {
@@ -67,10 +71,20 @@ public:
 	static scripting::ScriptEngine::LuaLibrary luaLibrary();
 
 private:
+	void renderMainWindow();
+
 	void renderPropertyWindow();
+	void renderPerformanceWindow();
 
 	bool _isEnabled;
 
+	bool _showPropertyWindow;
+	bool _showPerformanceWindow;
+	bool _showHelp;
+
+	ghoul::SharedMemory* _performanceMemory;
+	float _minMaxValues[2];
+
 	std::set<properties::Property*> _boolProperties;
 	std::set<properties::Property*> _intProperties;
 	std::set<properties::Property*> _floatProperties;

include/openspace/rendering/renderable.h

@@ -56,6 +56,7 @@ public:
     virtual bool deinitialize() = 0;
 
 	virtual bool isReady() const = 0;
+	bool isEnabled() const;
 
     void setBoundingSphere(const PowerScaledScalar& boundingSphere);
     const PowerScaledScalar& getBoundingSphere();

include/openspace/rendering/renderengine.h

@@ -43,6 +43,8 @@ class ScreenLog;
 
 class RenderEngine {
 public:
+	static const std::string PerformanceMeasurementSharedData;
+
 	RenderEngine();
 	~RenderEngine();
 	
@@ -64,6 +66,7 @@ public:
 	void toggleVisualizeABuffer(bool b);
 
 	void setPerformanceMeasurements(bool performanceMeasurements);
+	bool doesPerformanceMeasurements() const;
 
 	void serialize(SyncBuffer* syncBuffer);
 	void deserialize(SyncBuffer* syncBuffer);