Moving performance-related collection code from RenderEngine into new PerformanceManager code

This commit is contained in:
Alexander Bock
2016-06-06 03:19:44 +02:00
parent 55d484205a
commit 53c35c7531
8 changed files with 211 additions and 107 deletions

View File

@@ -31,6 +31,7 @@
#include <openspace/properties/stringproperty.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <openspace/performance/performancemanager.h>
namespace ghoul {
namespace fontrendering {
@@ -67,9 +68,6 @@ public:
Post
};
static const std::string PerformanceMeasurementSharedData;
static const std::string KeyFontMono;
static const std::string KeyFontLight;
@@ -101,8 +99,6 @@ public:
void setPerformanceMeasurements(bool performanceMeasurements);
bool doesPerformanceMeasurements() const;
void serialize(SyncBuffer* syncBuffer);
void deserialize(SyncBuffer* syncBuffer);
@@ -181,7 +177,7 @@ public:
private:
void setRenderer(std::unique_ptr<Renderer> renderer);
RendererImplementation rendererFromString(const std::string& method);
void storePerformanceMeasurements();
void renderInformation();
void renderScreenLog();
@@ -189,6 +185,8 @@ private:
Scene* _sceneGraph;
RaycasterManager* _raycasterManager;
std::unique_ptr<performance::PerformanceManager> _performanceManager;
std::unique_ptr<Renderer> _renderer;
RendererImplementation _rendererImplementation;
ghoul::Dictionary _rendererData;
@@ -199,9 +197,6 @@ private:
bool _showLog;
bool _takeScreenshot;
bool _doPerformanceMeasurements;
ghoul::SharedMemory* _performanceMemory;
float _globalBlackOutFactor;
float _fadeDuration;
float _currentFadeTime;