Moved grid rendering capability to debug renderer

jonjondev · jonjondev · commit 750a52968f00 · 2023-07-29T15:34:21.000+10:00
diff --git a/engine/render/renderer/renderer/DebugRenderer3D.cpp b/engine/render/renderer/renderer/DebugRenderer3D.cpp
@@ -39,17 +39,27 @@ void DebugRenderer3D::Initialise(const String& globalDataAttributeName)
     {
         perFrameVertexBuffers[i] = Vulkan::VertexBuffer(sizeof(LineVertex) * MAX_LINES);
     }
+
+    gridMaterial = Vulkan::Material(
+        Vulkan::Shader::Builder()
+            .FromVertexShader("assets/shaders/Grid3D.vert.spv")
+            .WithGlobalData3DUniform()
+            .Build(),
+        Vulkan::Shader::Builder().FromFragmentShader("assets/shaders/Grid3D.frag.spv").Build(),
+        false);
 }
 
 void DebugRenderer3D::Destroy()
 {
     lineMaterial.Free();
     for (auto it = perFrameVertexBuffers.CreateFIterator(); it; ++it) it->Free();
+    gridMaterial.~Material();
 }
 
 void DebugRenderer3D::RecreateMaterials()
 {
     lineMaterial.Recreate();
+    gridMaterial.Recreate();
 }
 
 // Wire primitives
@@ -86,11 +96,29 @@ void DebugRenderer3D::RenderLines(Vulkan::CommandBuffer& buffer,
     Vulkan::Utils::Draw(buffer.Get(), lines.Count(), 1, 0, 0);
 }
 
+void DebugRenderer3D::RenderGrid(Vulkan::CommandBuffer& commandBuffer,
+                                 const uint64_t& globalDataSize,
+                                 const void* globalData)
+{
+    if (!drawGrid) return;
+
+    gridMaterial.SetUniformData(globalDataId, globalDataSize, globalData);
+    gridMaterial.Bind(commandBuffer);
+
+    Vulkan::Utils::Draw(commandBuffer.Get(), 6, 1, 0, 0);
+}
+
 void DebugRenderer3D::Render(Vulkan::CommandBuffer& commandBuffer,
                              const uint64_t& globalDataSize,
                              const void* globalData,
                              uint32_t currentFrame)
 {
     RenderLines(commandBuffer, globalDataSize, globalData, currentFrame);
+    RenderGrid(commandBuffer, globalDataSize, globalData);
+}
+
+void DebugRenderer3D::SetGridEnabled(bool enabled)
+{
+    drawGrid = enabled;
 }
 } // namespace Siege
diff --git a/engine/render/renderer/renderer/DebugRenderer3D.h b/engine/render/renderer/renderer/DebugRenderer3D.h
@@ -31,6 +31,8 @@ class DebugRenderer3D
     // Wire primitives
     void DrawLine(const Vec3& origin, const Vec3& destination, const IColour& colour);
 
+    void SetGridEnabled(bool enabled);
+
     void Render(Vulkan::CommandBuffer& commandBuffer,
                 const uint64_t& globalDataSize,
                 const void* globalData,
@@ -55,13 +57,21 @@ class DebugRenderer3D
                      const void* globalData,
                      uint32_t currentFrame);
 
+    void RenderGrid(Vulkan::CommandBuffer& commandBuffer,
+                    const uint64_t& globalDataSize,
+                    const void* globalData);
+
     Vulkan::Material lineMaterial;
 
     MHArray<Vulkan::VertexBuffer> perFrameVertexBuffers;
 
     Hash::StringId globalDataId;
 
     MSArray<LineVertex, MAX_LINES> lines;
+
+    Vulkan::Material gridMaterial;
+
+    bool drawGrid;
 };
 } // namespace Siege
 
diff --git a/engine/render/renderer/renderer/Renderer3D.cpp b/engine/render/renderer/renderer/Renderer3D.cpp
@@ -17,8 +17,6 @@ namespace Siege
 // static initialisation
 Hash::StringId Renderer3D::globalDataId;
 
-Vulkan::Material Renderer3D::gridMaterial;
-
 ModelRenderer Renderer3D::modelRenderer;
 DebugRenderer3D Renderer3D::debugRenderer;
 BillboardRenderer Renderer3D::billboardRenderer;
@@ -38,14 +36,6 @@ void Renderer3D::Initialise()
     lightRenderer.Initialise("globalData");
     textRenderer.Initialise("globalData");
     quadRenderer3D.Initialise("globalData");
-
-    gridMaterial = Vulkan::Material(
-        Vulkan::Shader::Builder()
-            .FromVertexShader("assets/shaders/Grid3D.vert.spv")
-            .WithGlobalData3DUniform()
-            .Build(),
-        Vulkan::Shader::Builder().FromFragmentShader("assets/shaders/Grid3D.frag.spv").Build(),
-        false);
 }
 
 void Renderer3D::DrawBillboard(const Vec3& position,
@@ -102,10 +92,6 @@ void Renderer3D::Render(uint32_t currentFrame,
 
     modelRenderer.Render(commandBuffer, globalDataSize, &global3DData);
 
-#ifdef ENABLE_GRID
-    RenderGrid(commandBuffer, global3DData);
-#endif
-
     lightRenderer.Render(commandBuffer, globalDataSize, &global3DData, currentFrame);
     debugRenderer.Render(commandBuffer, globalDataSize, &global3DData, currentFrame);
     billboardRenderer.Render(commandBuffer, globalDataSize, &global3DData, currentFrame);
@@ -118,12 +104,9 @@ void Renderer3D::DrawLine(const Vec3& origin, const Vec3& destination, const ICo
     debugRenderer.DrawLine(origin, destination, colour);
 }
 
-void Renderer3D::RenderGrid(Vulkan::CommandBuffer& commandBuffer, const GlobalData& globalData)
+void Renderer3D::SetGridEnabled(bool enabled)
 {
-    gridMaterial.SetUniformData(globalDataId, sizeof(globalData), &globalData);
-    gridMaterial.Bind(commandBuffer);
-
-    Vulkan::Utils::Draw(commandBuffer.GetActiveCommandBuffer(), 6, 1, 0, 0);
+    debugRenderer.SetGridEnabled(enabled);
 }
 
 void Renderer3D::RecreateMaterials()
@@ -134,8 +117,6 @@ void Renderer3D::RecreateMaterials()
     lightRenderer.RecreateMaterials();
     quadRenderer3D.RecreateMaterials();
     textRenderer.RecreateMaterials();
-
-    gridMaterial.Recreate();
 }
 
 void Renderer3D::Flush()
@@ -155,8 +136,6 @@ void Renderer3D::DestroyRenderer3D()
     lightRenderer.Free();
     quadRenderer3D.Free();
     textRenderer.Free();
-
-    gridMaterial.~Material();
 }
 
 void Renderer3D::Update()
diff --git a/engine/render/renderer/renderer/Renderer3D.h b/engine/render/renderer/renderer/Renderer3D.h
@@ -46,7 +46,7 @@ class Renderer3D
                               Vulkan::Texture2D* texture = nullptr);
 
     // Debug rendering
-    // TODO(Aryeh): Move this to it's own renderer module?
+    // TODO(Aryeh): Move this to its own renderer module?
     static void DrawLine(const Vec3& origin, const Vec3& destination, const IColour& colour);
 
     static void DrawPointLight(const Vec3& position,
@@ -67,6 +67,8 @@ class Renderer3D
                          IColour colour,
                          Vulkan::Texture2D* texture = nullptr);
 
+    static void SetGridEnabled(bool enabled);
+
     static void RecreateMaterials();
 
     static void Render(uint32_t currentFrame,
@@ -80,9 +82,6 @@ class Renderer3D
 
 private:
 
-    // static void RenderRects(VkCommandBuffer& commandBuffer, const GlobalData& globalData);
-    static void RenderGrid(Vulkan::CommandBuffer& commandBuffer, const GlobalData& globalData);
-
     static Hash::StringId globalDataId;
 
     // FIXME(Aryeh): These statics are evil and need to be removed.
@@ -94,8 +93,6 @@ class Renderer3D
     static TextRenderer textRenderer;
     static QuadRenderer3D quadRenderer3D;
 
-    static Vulkan::Material gridMaterial;
-
     static GlobalData global3DData;
 };
 } // namespace Siege

Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,27 @@ void DebugRenderer3D::Initialise(const String& globalDataAttributeName)`
`39`	`39`	`{`
`40`	`40`	`perFrameVertexBuffers[i] = Vulkan::VertexBuffer(sizeof(LineVertex) * MAX_LINES);`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ gridMaterial = Vulkan::Material(`
	`44`	`+ Vulkan::Shader::Builder()`
	`45`	`+ .FromVertexShader("assets/shaders/Grid3D.vert.spv")`
	`46`	`+ .WithGlobalData3DUniform()`
	`47`	`+ .Build(),`
	`48`	`+ Vulkan::Shader::Builder().FromFragmentShader("assets/shaders/Grid3D.frag.spv").Build(),`
	`49`	`+ false);`
`42`	`50`	`}`
`43`	`51`
`44`	`52`	`void DebugRenderer3D::Destroy()`
`45`	`53`	`{`
`46`	`54`	`lineMaterial.Free();`
`47`	`55`	`for (auto it = perFrameVertexBuffers.CreateFIterator(); it; ++it) it->Free();`
	`56`	`+ gridMaterial.~Material();`
`48`	`57`	`}`
`49`	`58`
`50`	`59`	`void DebugRenderer3D::RecreateMaterials()`
`51`	`60`	`{`
`52`	`61`	`lineMaterial.Recreate();`
	`62`	`+ gridMaterial.Recreate();`
`53`	`63`	`}`
`54`	`64`
`55`	`65`	`// Wire primitives`
`@@ -86,11 +96,29 @@ void DebugRenderer3D::RenderLines(Vulkan::CommandBuffer& buffer,`
`86`	`96`	`Vulkan::Utils::Draw(buffer.Get(), lines.Count(), 1, 0, 0);`
`87`	`97`	`}`
`88`	`98`
	`99`	`+void DebugRenderer3D::RenderGrid(Vulkan::CommandBuffer& commandBuffer,`
	`100`	`+ const uint64_t& globalDataSize,`
	`101`	`+ const void* globalData)`
	`102`	`+{`
	`103`	`+ if (!drawGrid) return;`
	`104`	`+`
	`105`	`+ gridMaterial.SetUniformData(globalDataId, globalDataSize, globalData);`
	`106`	`+ gridMaterial.Bind(commandBuffer);`
	`107`	`+`
	`108`	`+ Vulkan::Utils::Draw(commandBuffer.Get(), 6, 1, 0, 0);`
	`109`	`+}`
	`110`	`+`
`89`	`111`	`void DebugRenderer3D::Render(Vulkan::CommandBuffer& commandBuffer,`
`90`	`112`	`const uint64_t& globalDataSize,`
`91`	`113`	`const void* globalData,`
`92`	`114`	`uint32_t currentFrame)`
`93`	`115`	`{`
`94`	`116`	`RenderLines(commandBuffer, globalDataSize, globalData, currentFrame);`
	`117`	`+ RenderGrid(commandBuffer, globalDataSize, globalData);`
	`118`	`+}`
	`119`	`+`
	`120`	`+void DebugRenderer3D::SetGridEnabled(bool enabled)`
	`121`	`+{`
	`122`	`+ drawGrid = enabled;`
`95`	`123`	`}`
`96`	`124`	`} // namespace Siege`