fix nullable warnings, some code cleanup

pkdawson · Sep 18, 2023 · ea9ecdc · ea9ecdc
1 parent 05a6b99
commit ea9ecdc
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 209 deletions.
diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
-    <RootNamespace>DearImGuiforGodotDemo</RootNamespace>
+    <RootNamespace>DemoProject</RootNamespace>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="doc\**" />

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Click `Build` in the top right, then run the project.
 
 1. Create a project and, if you haven't already added some C# code, use `Project > Tools > C# > Create C# solution`.
 
-2. [Install the plugin](https://docs.godotengine.org/en/stable/tutorials/plugins/editor/installing_plugins.html) by copying over the `addons` folder. Or [use Chicken](#package-managers).
+2. [Install the plugin](https://docs.godotengine.org/en/stable/tutorials/plugins/editor/installing_plugins.html) by copying over the `addons` folder. Or [use GodotEnv](#package-managers).
 
 3. In Visual Studio or another IDE, open the solution and allow unsafe code, and install `ImGui.NET` with NuGet. Save and return to Godot.
 
@@ -78,7 +78,7 @@ That's about it. Everything else is provided by ImGui itself, via ImGui.NET.
 
 ## Package managers
 
-[Chicken](https://github.com/chickensoft-games/Chicken/) is a dotnet tool that can manage Godot addons with just a little configuration. Use something like:
+[GodotEnv](https://github.com/chickensoft-games/GodotEnv/) is a dotnet tool that can manage Godot addons with just a little configuration. Use something like:
 
 ```json
 {

diff --git a/addons/imgui-godot/ImGuiGodot/ImGuiAPI.cs b/addons/imgui-godot/ImGuiGodot/ImGuiAPI.cs
diff --git a/addons/imgui-godot/ImGuiGodot/ImGuiLayer.cs b/addons/imgui-godot/ImGuiGodot/ImGuiLayer.cs
@@ -2,43 +2,35 @@
 using ImGuiNET;
 using System;
 using System.Collections.Generic;
-#if IMGUI_GODOT_DEV
-using System.Runtime.InteropServices;
-#endif
 
 namespace ImGuiGodot;
 
 public partial class ImGuiLayer : CanvasLayer
 {
-    public static ImGuiLayer Instance { get; private set; }
-
-#if IMGUI_GODOT_DEV
-    public ImGuiAPI API = new();
-#endif
+    public static ImGuiLayer Instance { get; private set; } = null!;
 
     [Export(PropertyHint.ResourceType, "ImGuiConfig")]
-    public GodotObject Config = null;
+    public GodotObject Config = null!;
 
     /// <summary>
     /// Do NOT connect to this directly, please use <see cref="Connect"/> instead
     /// </summary>
     [Signal] public delegate void ImGuiLayoutEventHandler();
 
-    private Window _window;
+    private Window _window = null!;
     private Rid _subViewportRid;
     private Vector2I _subViewportSize = Vector2I.Zero;
     private Rid _ci;
     private Transform2D _finalTransform = Transform2D.Identity;
-    private UpdateFirst _updateFirst;
+    private UpdateFirst _updateFirst = null!;
     private static readonly HashSet<GodotObject> _connectedObjects = new();
-    private int sizeCheck = 0;
     private bool _headless = false;
 
     private sealed partial class UpdateFirst : Node
     {
         private uint _counter = 0;
-        private ImGuiLayer _parent;
-        private Window _window;
+        private ImGuiLayer _parent = null!;
+        private Window _window = null!;
 
         public override void _Ready()
         {
@@ -131,9 +123,6 @@ public override void _ExitTree()
         ImGuiGD.Shutdown();
         RenderingServer.FreeRid(_ci);
         RenderingServer.FreeRid(_subViewportRid);
-#if IMGUI_GODOT_DEV
-        API.Free();
-#endif
     }
 
     private void OnChangeVisibility()
@@ -212,36 +201,6 @@ public static void Connect(ImGuiLayoutEventHandler d)
         }
     }
 
-#if IMGUI_GODOT_DEV
-#pragma warning disable CA1822 // Mark members as static
-    // WIP, this will probably be changed or moved
-    public long[] GetImGuiPtrs(string version, int ioSize, int vertSize, int idxSize)
-    {
-        if (version != ImGui.GetVersion() ||
-            ioSize != Marshal.SizeOf<ImGuiIO>() ||
-            vertSize != Marshal.SizeOf<ImDrawVert>() ||
-            idxSize != sizeof(ushort))
-        {
-            throw new PlatformNotSupportedException($"ImGui version mismatch, use {ImGui.GetVersion()}-docking");
-        }
-
-        IntPtr mem_alloc = IntPtr.Zero;
-        IntPtr mem_free = IntPtr.Zero;
-        unsafe
-        {
-            void* user_data = null;
-            ImGui.GetAllocatorFunctions(ref mem_alloc, ref mem_free, ref user_data);
-        }
-
-        return new[] {
-            (long)ImGui.GetCurrentContext(),
-            (long)mem_alloc,
-            (long)mem_free
-        };
-    }
-#pragma warning restore CA1822 // Mark members as static
-#endif
-
     private static void OnNodeRemoved(Node node)
     {
         // signals declared in C# don't (yet?) work like normal Godot signals,

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/CanvasRenderer.cs b/addons/imgui-godot/ImGuiGodot/Internal/CanvasRenderer.cs
@@ -56,7 +56,7 @@ private void RenderOne(Rid vprid, ImDrawDataPtr drawData)
         ViewportData vd = _vpData[vprid];
         Rid parent = vd.RootCanvasItem;
 
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(drawData.OwnerViewport.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(drawData.OwnerViewport.PlatformHandle).Target!;
 
         if (!_canvasItemPools.ContainsKey(parent))
             _canvasItemPools[parent] = new();

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/Fonts.cs b/addons/imgui-godot/ImGuiGodot/Internal/Fonts.cs
@@ -8,11 +8,11 @@ namespace ImGuiGodot.Internal;
 
 internal sealed class Fonts
 {
-    private Texture2D _fontTexture;
+    private Texture2D? _fontTexture;
 
     private sealed class FontParams
     {
-        public FontFile Font { get; init; }
+        public FontFile? Font { get; init; }
         public int FontSize { get; init; }
         public bool Merge { get; init; }
     }
@@ -31,12 +31,12 @@ public void ResetFonts()
         _fontConfiguration.Clear();
     }
 
-    public void AddFont(FontFile fontData, int fontSize, bool merge)
+    public void AddFont(FontFile? fontData, int fontSize, bool merge)
     {
         _fontConfiguration.Add(new FontParams { Font = fontData, FontSize = fontSize, Merge = merge });
     }
 
-    private static unsafe void AddFontToAtlas(FontFile fontData, int fontSize, bool merge)
+    private static unsafe void AddFontToAtlas(FontFile? fontData, int fontSize, bool merge)
     {
         ImFontConfig* fc = ImGuiNative.ImFontConfig_ImFontConfig();
         if (merge)

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/Input.cs b/addons/imgui-godot/ImGuiGodot/Internal/Input.cs
@@ -7,7 +7,7 @@ namespace ImGuiGodot.Internal;
 
 internal sealed class Input
 {
-    internal SubViewport CurrentSubViewport { get; set; }
+    internal SubViewport? CurrentSubViewport { get; set; }
     internal System.Numerics.Vector2 CurrentSubViewportPos { get; set; }
     private Vector2 _mouseWheel = Vector2.Zero;
     private ImGuiMouseCursor _currentCursor = ImGuiMouseCursor.None;
@@ -132,7 +132,6 @@ public bool ProcessInput(InputEvent evt, Window window)
                     io.AddMouseButtonEvent((int)ImGuiMouseButton.Left, mb.Pressed);
 #if GODOT_WINDOWS && !GODOT4_1_OR_GREATER
                     // if the left mouse button is released, the mouse almost certainly should not be captured
-                    // TODO: remove workaround after Godot 4.2
                     if (viewportsEnable && !mb.Pressed)
                         Viewports.MouseCaptureWorkaround();
 #endif

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/RdRendererThreadSafe.cs b/addons/imgui-godot/ImGuiGodot/Internal/RdRendererThreadSafe.cs
@@ -63,7 +63,7 @@ internal sealed class RdRendererThreadSafe : RdRenderer, IRenderer
     public new string Name => "imgui_impl_godot4_rd_mt";
 
     private readonly object _sharedDataLock = new();
-    private SharedList _dataToDraw;
+    private SharedList? _dataToDraw;
 
     public RdRendererThreadSafe() : base()
     {

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/State.cs b/addons/imgui-godot/ImGuiGodot/Internal/State.cs
@@ -26,7 +26,7 @@ internal sealed class State : IDisposable
     internal Fonts Fonts { get; private set; }
     internal Input Input { get; private set; }
     internal IRenderer Renderer { get; private set; }
-    internal static State Instance { get; set; }
+    internal static State Instance { get; set; } = null!;
 
     public State(Window mainWindow, Rid mainSubViewport, IRenderer renderer)
     {

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/Viewports.cs b/addons/imgui-godot/ImGuiGodot/Internal/Viewports.cs
@@ -288,63 +288,63 @@ private static void Godot_DestroyWindow(ImGuiViewportPtr vp)
     {
         if (vp.PlatformHandle != IntPtr.Zero)
         {
-            var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+            var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
             window.Dispose();
             vp.PlatformHandle = IntPtr.Zero;
         }
     }
 
     private static void Godot_ShowWindow(ImGuiViewportPtr vp)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         window.ShowWindow();
     }
 
     private static void Godot_SetWindowPos(ImGuiViewportPtr vp, Vector2 pos)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         window.SetWindowPos(pos.ToVector2I());
     }
 
     private static void Godot_GetWindowPos(ImGuiViewportPtr vp, out Vector2 pos)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         pos = window.GetWindowPos().ToImVec2();
     }
 
     private static void Godot_SetWindowSize(ImGuiViewportPtr vp, Vector2 size)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         window.SetWindowSize(size.ToVector2I());
     }
 
     private static void Godot_GetWindowSize(ImGuiViewportPtr vp, out Vector2 size)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         size = window.GetWindowSize().ToImVec2();
     }
 
     private static void Godot_SetWindowFocus(ImGuiViewportPtr vp)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         window.SetWindowFocus();
     }
 
     private static bool Godot_GetWindowFocus(ImGuiViewportPtr vp)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         return window.GetWindowFocus();
     }
 
     private static bool Godot_GetWindowMinimized(ImGuiViewportPtr vp)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         return window.GetWindowMinimized();
     }
 
     private static void Godot_SetWindowTitle(ImGuiViewportPtr vp, string title)
     {
-        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target;
+        var window = (GodotImGuiWindow)GCHandle.FromIntPtr(vp.PlatformHandle).Target!;
         window.SetWindowTitle(title);
     }
 }
diff --git a/src/MyNode.cs b/src/MyNode.cs
@@ -5,7 +5,7 @@ namespace DemoProject;
 
 public partial class MyNode : Node
 {
-    private Window _window;
+    private Window _window = null!;
 
     public override void _Ready()
     {