fixed the bug where Overlay crashes on close.

Updated interface that loads the image from disk to also return image width/height.
zaafar · Sep 22, 2020 · 53fb5c0 · 53fb5c0
1 parent 64270fb
commit 53fb5c0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/ClickableTransparentOverlay/ClickableTransparentOverlay.csproj b/ClickableTransparentOverlay/ClickableTransparentOverlay.csproj
@@ -34,10 +34,10 @@
   <ItemGroup>
     <PackageReference Include="Coroutine" Version="2.0.0" />
     <PackageReference Include="ImGui.NET" Version="1.78.0" />
-    <PackageReference Include="Veldrid" Version="4.9.0-g99f48fc1fd" />
-    <PackageReference Include="Veldrid.ImageSharp" Version="4.9.0-g99f48fc1fd" />
-    <PackageReference Include="Veldrid.Sdl2" Version="4.9.0-g99f48fc1fd" />
-    <PackageReference Include="Veldrid.StartupUtilities" Version="4.9.0-g99f48fc1fd" />
+    <PackageReference Include="Veldrid" Version="4.9.0-g6e9e71e698" />
+    <PackageReference Include="Veldrid.ImageSharp" Version="4.9.0-g6e9e71e698" />
+    <PackageReference Include="Veldrid.Sdl2" Version="4.9.0-g6e9e71e698" />
+    <PackageReference Include="Veldrid.StartupUtilities" Version="4.9.0-g6e9e71e698" />
   </ItemGroup>
 
 </Project>
diff --git a/ClickableTransparentOverlay/Overlay.cs b/ClickableTransparentOverlay/Overlay.cs
@@ -201,10 +201,14 @@ public static Point Size
         /// save it on the disk before sending to this function. Reason for this
         /// is to cache the Image Texture using filePath as the key.
         /// </param>
-        /// <returns>
-        /// A pointer to the Texture in the Graphic Device.
-        /// </returns>
-        public static IntPtr AddOrGetImagePointer(string filePath)
+        /// <param name="handle">output pointer to the image in the graphic device.</param>
+        /// <param name="width">width of the loaded image.</param>
+        /// <param name="height">height of the loaded image.</param>
+        public static void AddOrGetImagePointer(
+            string filePath,
+            out IntPtr handle,
+            out uint width,
+            out uint height)
         {
             if (!loadedImages.TryGetValue(filePath, out Texture texture))
             {
@@ -213,7 +217,9 @@ public static IntPtr AddOrGetImagePointer(string filePath)
                 loadedImages.Add(filePath, texture);
             }
 
-            return imController.GetOrCreateImGuiBinding(graphicsDevice.ResourceFactory, texture);
+            width = texture.Width;
+            height = texture.Height;
+            handle = imController.GetOrCreateImGuiBinding(graphicsDevice.ResourceFactory, texture);
         }
 
         /// <summary>

diff --git a/DriverProgram/Program.cs b/DriverProgram/Program.cs
@@ -156,7 +156,12 @@ private static IEnumerator<Wait> SubmitRenderLogic()
                     ImGui.NewLine();
                     if (File.Exists("image.png"))
                     {
-                        ImGui.Image(Overlay.AddOrGetImagePointer("image.png"), new Vector2(256, 256));
+                        Overlay.AddOrGetImagePointer(
+                            "image.png",
+                            out IntPtr imgPtr,
+                            out uint w,
+                            out uint h);
+                        ImGui.Image(imgPtr, new Vector2(w, h));
                     }
                     else
                     {