Cleaned up RenderableRings

Some minor performance improvements

src/rendering/framebufferrenderer.cpp

@@ -125,8 +125,6 @@ void FramebufferRenderer::initialize() {
     }
 
     OsEng.renderEngine().raycasterManager().addListener(*this);
-
-
 }
 
 void FramebufferRenderer::deinitialize() {
@@ -153,8 +151,6 @@ void FramebufferRenderer::raycastersChanged(VolumeRaycaster& raycaster, bool att
 }
 
 void FramebufferRenderer::update() {
-    PerfMeasure("FramebufferRenderer::update");
-    
     if (_dirtyResolution) {
         updateResolution();
     }
@@ -206,14 +202,11 @@ void FramebufferRenderer::update() {
 }
 
 void FramebufferRenderer::updateResolution() {
-    int nSamples = _nAaSamples;
-    PerfMeasure("FramebufferRenderer::updateResolution");
-
     glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainColorTexture);
 
     glTexImage2DMultisample(
         GL_TEXTURE_2D_MULTISAMPLE,
-        nSamples,
+        _nAaSamples,
         GL_RGBA,
         GLsizei(_resolution.x),
         GLsizei(_resolution.y),
@@ -222,7 +215,7 @@ void FramebufferRenderer::updateResolution() {
     glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainDepthTexture);
     glTexImage2DMultisample(
         GL_TEXTURE_2D_MULTISAMPLE,
-        nSamples,
+        _nAaSamples,
         GL_DEPTH_COMPONENT32F,
         GLsizei(_resolution.x),
         GLsizei(_resolution.y),
@@ -263,8 +256,6 @@ void FramebufferRenderer::updateResolution() {
 }
 
 void FramebufferRenderer::updateRaycastData() {
-    PerfMeasure("FramebufferRenderer::updateRaycastData");
-
     _raycastData.clear();
     _exitPrograms.clear();
     _raycastPrograms.clear();
@@ -319,7 +310,13 @@ void FramebufferRenderer::updateRaycastData() {
 }
 
 void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasurements) {
-    PerfMeasure("FramebufferRenderer::render");
+    std::unique_ptr<performance::PerformanceMeasurement> perf;
+    if (doPerformanceMeasurements) {
+        perf = std::make_unique<performance::PerformanceMeasurement>(
+            "FramebufferRenderer::render",
+            OsEng.renderEngine().performanceManager()
+        );
+    }
     
     if (!_scene)
         return;
@@ -468,8 +465,6 @@ void FramebufferRenderer::setNAaSamples(int nAaSamples) {
 }
 
 void FramebufferRenderer::updateRendererData() {
-    PerfMeasure("FramebufferRenderer::updateRendererData");
-
     ghoul::Dictionary dict;
     dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath));
     dict.setValue("postFragmentRendererPath", std::string(PostRenderFragmentShaderPath));
@@ -479,6 +474,4 @@ void FramebufferRenderer::updateRendererData() {
     OsEng.renderEngine().setRendererData(dict);
 }
 
-
 }
-

src/rendering/renderengine.cpp

@@ -339,8 +339,8 @@ void RenderEngine::updateSceneGraph() {
         glm::dmat3(1),
         1,
         Time::ref().j2000Seconds(),
-        Time::ref().timeJumped(),
         Time::ref().deltaTime(),
+        Time::ref().timeJumped(),
         _performanceManager != nullptr
     });