Control RDebugRender registration in Device.seqRender

OpenXRay · Jan 30, 2025 · 62bfb73 · 62bfb73
1 parent bbd56a7
commit 62bfb73
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/Layers/xrRender/dxDebugRender.cpp b/src/Layers/xrRender/dxDebugRender.cpp
@@ -136,13 +136,16 @@ struct RDebugRender : public dxDebugRender, public pureRender
     xr_vector<FVF::L> _line_vertices;
 
 public:
-    RDebugRender()
+    void Register() override
     {
-        // Device.seqRender.Add		(this);
         Device.seqRender.Add(this, REG_PRIORITY_LOW - 100);
     }
 
-    virtual ~RDebugRender() { Device.seqRender.Remove(this); }
+    void Unregister() override
+    {
+        Device.seqRender.Remove(this);
+    }
+
     void OnRender()
     {
         m_line_indices = _line_indices;

diff --git a/src/Layers/xrRender/dxDebugRender.h b/src/Layers/xrRender/dxDebugRender.h
@@ -32,6 +32,9 @@ class dxDebugRender : public IDebugRender
     virtual void dbg_DrawTRI(Fmatrix& T, Fvector& p1, Fvector& p2, Fvector& p3, u32 C);
 #endif //	DEBUG
 
+    virtual void Register() {}
+    virtual void Unregister() {}
+
 private:
     void try_render(u32 const& vertex_count, u32 const& index_count);
 

diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.cpp b/src/Layers/xrRenderPC_GL/xrRender_GL.cpp
@@ -85,6 +85,7 @@ class RGLRendererModule final : public RendererModule
         GEnv.UIRender = &UIRenderImpl;
 #ifdef DEBUG
         GEnv.DRender = &DebugRenderImpl;
+        rdebug_render->Register();
 #endif
         xrRender_initconsole();
     }
@@ -100,6 +101,9 @@ class RGLRendererModule final : public RendererModule
             GEnv.DU = nullptr;
             GEnv.UIRender = nullptr;
             GEnv.DRender = nullptr;
+#ifdef DEBUG
+            rdebug_render->Unregister();
+#endif
         }
     }
 } static s_rgl_module;

diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.cpp b/src/Layers/xrRenderPC_R4/xrRender_R4.cpp
@@ -94,6 +94,7 @@ class R4RendererModule final : public RendererModule
         GEnv.UIRender = &UIRenderImpl;
 #ifdef DEBUG
         GEnv.DRender = &DebugRenderImpl;
+        rdebug_render->Register();
 #endif
         xrRender_initconsole();
     }
@@ -109,6 +110,9 @@ class R4RendererModule final : public RendererModule
             GEnv.DU = nullptr;
             GEnv.UIRender = nullptr;
             GEnv.DRender = nullptr;
+#ifdef DEBUG
+            rdebug_render->Unregister();
+#endif
         }
     }
 } static s_r4_module;