remove Init from IRenderer

pkdawson · Jan 19, 2024 · 35968b9 · 35968b9
1 parent b1c9de7
commit 35968b9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/addons/imgui-godot/ImGuiGodot/Internal/CanvasRenderer.cs b/addons/imgui-godot/ImGuiGodot/Internal/CanvasRenderer.cs
@@ -20,12 +20,6 @@ private sealed class ViewportData
 
     public string Name => "godot4_net_canvas";
 
-    public void Init(ImGuiIOPtr io)
-    {
-        io.BackendFlags |= ImGuiBackendFlags.RendererHasVtxOffset;
-        io.BackendFlags |= ImGuiBackendFlags.RendererHasViewports;
-    }
-
     public void InitViewport(Rid vprid)
     {
         Rid canvas = RenderingServer.CanvasCreate();

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/DummyRenderer.cs b/addons/imgui-godot/ImGuiGodot/Internal/DummyRenderer.cs
@@ -1,17 +1,12 @@
 #if GODOT_PC
 using Godot;
-using ImGuiNET;
 
 namespace ImGuiGodot.Internal;
 
 internal sealed class DummyRenderer : IRenderer
 {
     public string Name => "godot4_net_dummy";
 
-    public void Init(ImGuiIOPtr io)
-    {
-    }
-
     public void InitViewport(Rid vprid)
     {
     }

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/IRenderer.cs b/addons/imgui-godot/ImGuiGodot/Internal/IRenderer.cs
@@ -0,0 +1,13 @@
+using Godot;
+
+namespace ImGuiGodot.Internal;
+
+internal interface IRenderer
+{
+    public string Name { get; }
+    public void InitViewport(Rid vprid);
+    public void CloseViewport(Rid vprid);
+    public void RenderDrawData();
+    public void OnHide();
+    public void Shutdown();
+}
diff --git a/addons/imgui-godot/ImGuiGodot/Internal/RdRenderer.cs b/addons/imgui-godot/ImGuiGodot/Internal/RdRenderer.cs
@@ -143,12 +143,6 @@ public RdRenderer()
         _uniformArray.Resize(1);
     }
 
-    public void Init(ImGuiIOPtr io)
-    {
-        io.BackendFlags |= ImGuiBackendFlags.RendererHasVtxOffset;
-        io.BackendFlags |= ImGuiBackendFlags.RendererHasViewports;
-    }
-
     public void InitViewport(Rid vprid)
     {
         //RenderingServer.ViewportSetUpdateMode(vprid, RenderingServer.ViewportUpdateMode.Disabled);

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/State.cs b/addons/imgui-godot/ImGuiGodot/Internal/State.cs
@@ -6,17 +6,6 @@
 
 namespace ImGuiGodot.Internal;
 
-internal interface IRenderer
-{
-    public string Name { get; }
-    public void Init(ImGuiIOPtr io);
-    public void InitViewport(Rid vprid);
-    public void CloseViewport(Rid vprid);
-    public void RenderDrawData();
-    public void OnHide();
-    public void Shutdown();
-}
-
 internal sealed class State : IDisposable
 {
     private enum RendererType
@@ -52,10 +41,12 @@ public State(Window mainWindow, Rid mainSubViewport, IRenderer renderer)
         ImGui.SetCurrentContext(context);
         var io = ImGui.GetIO();
 
-        io.BackendFlags = 0;
-        io.BackendFlags |= ImGuiBackendFlags.HasGamepad;
-        io.BackendFlags |= ImGuiBackendFlags.HasSetMousePos;
-        io.BackendFlags |= ImGuiBackendFlags.HasMouseCursors;
+        io.BackendFlags =
+            ImGuiBackendFlags.HasGamepad |
+            ImGuiBackendFlags.HasSetMousePos |
+            ImGuiBackendFlags.HasMouseCursors |
+            ImGuiBackendFlags.RendererHasVtxOffset |
+            ImGuiBackendFlags.RendererHasViewports;
 
         if (_rendererName == IntPtr.Zero)
         {
@@ -68,7 +59,6 @@ public State(Window mainWindow, Rid mainSubViewport, IRenderer renderer)
             io.NativePtr->BackendRendererName = (byte*)_rendererName;
         }
 
-        Renderer.Init(io);
         Viewports = new Viewports(mainWindow, mainSubViewport);
     }