State: explicitly use internal state

pkdawson · Aug 26, 2024 · 687b7be · 687b7be
1 parent 1f6b8fc
commit 687b7be
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/addons/imgui-godot/ImGuiGodot/ImGuiController.cs b/addons/imgui-godot/ImGuiGodot/ImGuiController.cs
@@ -24,8 +24,8 @@ public override void _Ready()
 
         public override void _Process(double delta)
         {
-            State.Instance.InProcessFrame = true;
-            State.Instance.Update(delta, State.Instance.Layer.UpdateViewport().ToImVec2());
+            Internal.State.Instance.InProcessFrame = true;
+            Internal.State.Instance.Update(delta, Internal.State.Instance.Layer.UpdateViewport().ToImVec2());
         }
     }
 
@@ -55,7 +55,7 @@ public override void _EnterTree()
             GD.PushError($"imgui-godot: config does not exist: {cfgPath}");
         }
 
-        State.Init(cfg ?? (Resource)((GDScript)GD.Load(
+        Internal.State.Init(cfg ?? (Resource)((GDScript)GD.Load(
                 "res://addons/imgui-godot/scripts/ImGuiConfig.gd")).New());
 
         _helper = new ImGuiControllerHelper();
@@ -73,14 +73,14 @@ public override void _Ready()
 
     public override void _ExitTree()
     {
-        State.Instance.Dispose();
+        Internal.State.Instance.Dispose();
     }
 
     public override void _Process(double delta)
     {
         Signaler.EmitSignal("imgui_layout");
-        State.Instance.Render();
-        State.Instance.InProcessFrame = false;
+        Internal.State.Instance.Render();
+        Internal.State.Instance.InProcessFrame = false;
     }
 
     public override void _Notification(int what)
@@ -91,7 +91,7 @@ public override void _Notification(int what)
     public void OnLayerExiting()
     {
         // an ImGuiLayer is being destroyed without calling SetMainViewport
-        if (State.Instance.Layer.GetViewport() != _window)
+        if (Internal.State.Instance.Layer.GetViewport() != _window)
         {
             // revert to main window
             SetMainViewport(_window);
@@ -100,7 +100,7 @@ public void OnLayerExiting()
 
     public void SetMainViewport(Viewport vp)
     {
-        ImGuiLayer? oldLayer = State.Instance.Layer;
+        ImGuiLayer? oldLayer = Internal.State.Instance.Layer;
         if (oldLayer != null)
         {
             oldLayer.TreeExiting -= OnLayerExiting;
@@ -112,7 +112,7 @@ public void SetMainViewport(Viewport vp)
 
         if (vp is Window window)
         {
-            State.Instance.Input = new Internal.Input();
+            Internal.State.Instance.Input = new Internal.Input();
             if (window == _window)
                 AddChild(newLayer);
             else
@@ -122,7 +122,7 @@ public void SetMainViewport(Viewport vp)
         }
         else if (vp is SubViewport svp)
         {
-            State.Instance.Input = new InputLocal();
+            Internal.State.Instance.Input = new Internal.InputLocal();
             svp.AddChild(newLayer);
             ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.PlatformHasViewports;
             ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.HasMouseHoveredViewport;
@@ -131,7 +131,7 @@ public void SetMainViewport(Viewport vp)
         {
             throw new System.ArgumentException("secret third kind of viewport??", nameof(vp));
         }
-        State.Instance.Layer = newLayer;
+        Internal.State.Instance.Layer = newLayer;
     }
 
     private void CheckContentScale()
@@ -144,7 +144,7 @@ private void CheckContentScale()
 
     public static void WindowInputCallback(InputEvent evt)
     {
-        State.Instance.Input.ProcessInput(evt);
+        Internal.State.Instance.Input.ProcessInput(evt);
     }
 }
 #endif
diff --git a/addons/imgui-godot/ImGuiGodot/ImGuiLayer.cs b/addons/imgui-godot/ImGuiGodot/ImGuiLayer.cs
@@ -1,5 +1,4 @@
 using Godot;
-using ImGuiGodot.Internal;
 #if GODOT_PC
 #nullable enable
 
@@ -17,15 +16,15 @@ public partial class ImGuiLayer : CanvasLayer
     public override void _EnterTree()
     {
         Name = "ImGuiLayer";
-        Layer = State.Instance.LayerNum;
+        Layer = Internal.State.Instance.LayerNum;
 
         _parentViewport = GetViewport();
         _subViewportRid = AddLayerSubViewport(this);
         _canvasItem = RenderingServer.CanvasItemCreate();
         RenderingServer.CanvasItemSetParent(_canvasItem, GetCanvas());
 
-        State.Instance.Renderer.InitViewport(_subViewportRid);
-        State.Instance.Viewports.SetMainWindow(GetWindow(), _subViewportRid);
+        Internal.State.Instance.Renderer.InitViewport(_subViewportRid);
+        Internal.State.Instance.Viewports.SetMainWindow(GetWindow(), _subViewportRid);
     }
 
     public override void _Ready()
@@ -50,15 +49,15 @@ private void OnChangeVisibility()
         else
         {
             SetProcessInput(false);
-            State.Instance.Renderer.OnHide();
+            Internal.State.Instance.Renderer.OnHide();
             _subViewportSize = Vector2I.Zero;
             RenderingServer.CanvasItemClear(_canvasItem);
         }
     }
 
     public override void _Input(InputEvent @event)
     {
-        if (State.Instance.Input.ProcessInput(@event))
+        if (Internal.State.Instance.Input.ProcessInput(@event))
         {
             _parentViewport.SetInputAsHandled();
         }