Merge pull request #256 from haphzd/profiling+debug

Fix build with profiling enabled, debug stats changes

rwengine/src/render/GameRenderer.cpp

@@ -351,7 +351,7 @@ void GameRenderer::renderWorld(GameWorld* world, const ViewCamera& camera,
     }
 
     RW_PROFILE_END();
-
+    culled += objectRenderer.culled;
     renderer->pushDebugGroup("Objects");
     renderer->pushDebugGroup("RenderList");
 

rwengine/src/render/GameRenderer.hpp

@@ -86,6 +86,9 @@ class GameRenderer {
     ViewCamera _camera;
     ViewCamera cullingCamera;
     bool cullOverride;
+    
+    /** Number of culling events */
+    size_t culled;
 
     GLuint framebufferName;
     GLuint fbTextures[2];
@@ -99,9 +102,6 @@ public:
     GameRenderer(Logger* log, GameData* data);
     ~GameRenderer();
 
-    /** Number of culling events */
-    size_t culled;
-
     /** @todo Clean up all these shader program and location variables */
     Renderer::ShaderProgram* worldProg;
     Renderer::ShaderProgram* skyProg;
@@ -123,6 +123,10 @@ public:
     GLuint getMissingTexture() const {
         return m_missingTexture;
     }
+    
+    size_t getCulledCount() {
+        return culled;
+    }
 
     /**
      * Renders the world using the parameters of the passed Camera.

rwengine/src/render/ObjectRenderer.cpp

@@ -129,6 +129,7 @@ bool ObjectRenderer::renderFrame(Model* m, ModelFrame* f,
 
                 glm::vec3 boundpos = bounds.center + glm::vec3(localmatrix[3]);
                 if (!m_camera.frustum.intersects(boundpos, bounds.radius)) {
+                    culled++;
                     continue;
                 }
             }

rwengine/src/render/ObjectRenderer.hpp

@@ -25,7 +25,8 @@ public:
         : m_world(world)
         , m_camera(camera)
         , m_renderAlpha(renderAlpha)
-        , m_errorTexture(errorTexture) {
+        , m_errorTexture(errorTexture)
+        , culled(0) {
     }
 
     /**
@@ -33,6 +34,7 @@ public:
      *
      * Exports rendering instructions for an object
      */
+    size_t culled;
     void buildRenderList(GameObject* object, RenderList& outList);
 
     bool renderFrame(Model* m, ModelFrame* f, const glm::mat4& matrix,

rwgame/RWGame.cpp

@@ -607,7 +607,8 @@ void RWGame::renderDebugStats(float time) {
     std::stringstream ss;
     ss << "FPS: " << (1000.f / time_average) << " (" << time_average << "ms)\n"
        << "Frame: " << time_ms << "ms\n"
-       << "Draws/Textures/Buffers: " << lastDraws << "/"
+       << "Draws/Culls/Textures/Buffers: " << lastDraws << "/"
+       << renderer.getCulledCount() << "/"
        << renderer.getRenderer()->getTextureCount() << "/"
        << renderer.getRenderer()->getBufferCount() << "\n";
 
@@ -794,7 +795,7 @@ void RWGame::renderProfile() {
         }
     }
 
-    float xscale = renderer->getRenderer()->getViewport().x / upperlimit;
+    float xscale = renderer.getRenderer()->getViewport().x / upperlimit;
     TextRenderer::TextInfo ti;
     ti.align = TextRenderer::TextInfo::Left;
     ti.font = 2;
@@ -806,21 +807,21 @@ void RWGame::renderProfile() {
         for (auto& event : entry.childProfiles) {
             auto duration = event.end - event.start;
             float y = 60.f + (depth * (lineHeight + 5.f));
-            renderer->drawColour(
+            renderer.drawColour(
                 perf_colours[(std::hash<std::string>()(entry.label) * (g++)) %
                              perf_colours.size()],
                 {xscale * event.start, y, xscale * duration, lineHeight});
             ti.screenPosition.x = xscale * (event.start);
             ti.screenPosition.y = y + 2.f;
-            ti.text = event.label + " " + std::to_string(duration) + " us ";
-            renderer->text.renderText(ti);
+            ti.text = GameStringUtil::fromString(event.label + " " + std::to_string(duration) + " us ");
+            renderer.text.renderText(ti);
             renderEntry(event, depth + 1);
         }
     };
     renderEntry(frame, 0);
     ti.screenPosition = glm::vec2(xscale * (16000), 40.f);
-    ti.text = ".16 ms";
-    renderer->text.renderText(ti);
+    ti.text = GameStringUtil::fromString(".16 ms");
+    renderer.text.renderText(ti);
 #endif
 }