Merge pull request #133 from MilchRatchet/dev-memory-leaks

Memory leak fixes

Author: MilchRatchet

LibReplanetizer/Level Objects/Gameplay/Moby.cs

@@ -741,7 +741,7 @@ public IngameMobyMemory()
 
             public bool IsDead()
             {
-                return (state & 0x80) > 0;
+                return (state & 0x80) > 0 || oClass == 0xFFFF || UID == 0xFFFF;
             }
 
             public void SetDead()

LibReplanetizer/Level.cs

@@ -17,7 +17,7 @@
 
 namespace LibReplanetizer
 {
-    public class Level
+    public class Level : IDisposable
     {
         private static readonly NLog.Logger LOGGER = NLog.LogManager.GetCurrentClassLogger();
 
@@ -461,6 +461,15 @@ public void EmplaceCommonData()
             });
         }
 
+        public void Dispose()
+        {
+            if (textures != null) foreach (var tex in textures) tex?.Dispose();
+            if (armorTextures != null) foreach (var list in armorTextures) { if (list != null) foreach (var tex in list) tex?.Dispose(); }
+            if (gadgetTextures != null) foreach (var tex in gadgetTextures) tex?.Dispose();
+            if (mobyloadTextures != null) foreach (var list in mobyloadTextures) { if (list != null) foreach (var tex in list) tex?.Dispose(); }
+            if (missions != null) foreach (var mission in missions) { if (mission?.textures != null) foreach (var tex in mission.textures) tex?.Dispose(); }
+        }
+
         public void Save(string outputFile)
         {
             string? directory;

LibReplanetizer/Models/Texture.cs

@@ -15,7 +15,7 @@
 
 namespace LibReplanetizer
 {
-    public class Texture
+    public class Texture : IDisposable
     {
         public enum CompressionFormat : byte
         {
@@ -379,6 +379,12 @@ private static void ConvertRgb565ToRgb888(ushort color, out byte r, out byte g,
             temp = (color & 0x001F) * 255 + 16;
             b = (byte) ((temp / 32 + temp) / 32);
         }
+
+        public void Dispose()
+        {
+            renderedImage?.Dispose();
+            img?.Dispose();
+        }
     }
 }
 

Replanetizer/Frames/Frame.cs

@@ -5,11 +5,12 @@
 // either version 3 of the License, or (at your option) any later version.
 // Please see the LICENSE.md file for more details.
 
+using System;
 using ImGuiNET;
 
 namespace Replanetizer.Frames
 {
-    public abstract class Frame
+    public abstract class Frame : IDisposable
     {
         protected Window wnd;
         protected abstract string frameName { get; set; }
@@ -44,5 +45,9 @@ public virtual void RenderAsWindow(float deltaTime)
                 ImGui.End();
             }
         }
+
+        public virtual void Dispose()
+        {
+        }
     }
 }

Replanetizer/Frames/LevelFrame.cs

@@ -85,6 +85,8 @@ public class LevelFrame : Frame
 
         private List<Frame> subFrames;
 
+        private void ToolboxOnToolChanged(object? sender, EventArgs e) => InvalidateView();
+
         public LevelFrame(Window wnd, string res) : base(wnd)
         {
             level = new Level(res);
@@ -102,7 +104,7 @@ public LevelFrame(Window wnd, string res) : base(wnd)
             selectedObjects = new Selection();
             selectedObjects.CollectionChanged += SelectedObjectsOnCollectionChanged;
 
-            toolbox.ToolChanged += (_, _) => InvalidateView();
+            toolbox.ToolChanged += ToolboxOnToolChanged;
 
             rendererPayload = new RendererPayload(camera, selectedObjects, toolbox, showBangles);
 
@@ -524,7 +526,15 @@ public override void Render(float deltaTime)
 
         private void RenderSubFrames(float deltaTime)
         {
+            foreach (Frame levelSubFrame in subFrames)
+            {
+                if (FrameMustClose(levelSubFrame))
+                {
+                    levelSubFrame.Dispose();
+                }
+            }
             subFrames.RemoveAll(FrameMustClose);
+
             foreach (Frame levelSubFrame in subFrames)
             {
                 levelSubFrame.RenderAsWindow(deltaTime);
@@ -1055,14 +1065,12 @@ public void InvalidateView()
 
         public bool StartMemoryHook(ref string message)
         {
+            hook?.Dispose();
             hook = new MemoryHook.MemoryHookHandle(level);
 
             message = hook.GetLastErrorMessage();
 
-            if (hook.hookWorking)
-            {
-                interactiveSession = true;
-            }
+            interactiveSession = hook.hookWorking;
 
             return hook.hookWorking;
         }
@@ -1105,6 +1113,41 @@ public void AddSubFrame(Frame frame)
         {
             if (!subFrames.Contains(frame)) subFrames.Add(frame);
         }
+
+        public override void Dispose()
+        {
+            hook?.Dispose();
+
+            selectedObjects.CollectionChanged -= SelectedObjectsOnCollectionChanged;
+            toolbox.ToolChanged -= ToolboxOnToolChanged;
+            toolbox?.Dispose();
+
+            base.Dispose();
+
+            if (subFrames != null)
+            {
+                foreach (var subFrame in subFrames)
+                {
+                    subFrame.Dispose();
+                }
+                subFrames.Clear();
+            }
+
+            renderer?.Dispose();
+            levelRenderer?.Dispose();
+            shaderTable?.Dispose();
+
+            if (textureIds != null)
+            {
+                foreach (var texture in textureIds.Values)
+                {
+                    texture.Dispose();
+                }
+                textureIds.Clear();
+            }
+
+            level?.Dispose();
+        }
     }
 
 }

Replanetizer/Frames/ModelFrame.cs

@@ -916,5 +916,12 @@ private void ExportSelectedModelTextures()
                 TextureIO.ExportTexture(texture, Path.Combine(folder, $"{textureId}.png"), includeTransparency);
             }
         }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            renderer?.Dispose();
+            meshRenderer?.Dispose();
+        }
     }
 }

Replanetizer/MemoryHook/MemoryHookHandle.cs

@@ -19,7 +19,7 @@
 
 namespace Replanetizer.MemoryHook
 {
-    public class MemoryHookHandle
+    public class MemoryHookHandle : IDisposable
     {
         // Read and write acceess
         const int PROCESS_WM_READ = 0x38;
@@ -33,6 +33,10 @@ public class MemoryHookHandle
 
         [DllImport("kernel32.dll")]
         private static extern bool WriteProcessMemory(IntPtr hProcess, Int64 lpBaseAddress, byte[] lpBuffer, int nSize, ref int lpNumberOfBytesWritten);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool CloseHandle(IntPtr hObject);
 #endif
 
         private readonly Process? PROCESS;
@@ -211,5 +215,16 @@ public void HandleSplineTranslation(Level level, Spline spline, int currentSplin
             WriteProcessMemory(processHandle, splinePtr + currentSplineVertex * 0x10, buff, buff.Length, ref bytesRead);
             */
         }
+
+        public void Dispose()
+        {
+#if _WINDOWS
+            if (PROCESS_HANDLE != IntPtr.Zero)
+            {
+                CloseHandle(PROCESS_HANDLE);
+            }
+#endif
+            PROCESS?.Dispose();
+        }
     }
 }

Replanetizer/Renderer/BillboardRenderer.cs

@@ -63,7 +63,7 @@ static BillboardRenderer()
 
             // Only a single placeholder texture currently.
 
-            Image<Rgba32> image = Image.Load<Rgba32>(Path.Join(iconsFolder, "Placeholder.png"));
+            using Image<Rgba32> image = Image.Load<Rgba32>(Path.Join(iconsFolder, "Placeholder.png"));
             GLTexture placeholderTex = new GLTexture("BillboardTexture", image, true, true);
 
             billboardTextures = new Dictionary<RenderedObjectType, GLTexture>();
@@ -146,6 +146,16 @@ public override void Render(RendererPayload payload)
 
         public override void Dispose()
         {
+        }
+
+        public static void CleanupStaticResources()
+        {
+            foreach (var texture in billboardTextures.Values)
+            {
+                texture.Dispose();
+            }
+            billboardTextures.Clear();
+
             GL.DeleteBuffer(ibo);
             GL.DeleteBuffer(vbo);
             GL.DeleteVertexArray(vao);

Replanetizer/Renderer/DirectionalLightsBuffer.cs

@@ -76,6 +76,9 @@ public void Bind()
             GL.BindBufferBase(BufferRangeTarget.UniformBuffer, 0, buffer);
         }
 
-        public void Dispose() => throw new NotImplementedException();
+        public void Dispose()
+        {
+            GL.DeleteBuffer(buffer);
+        }
     }
 }

Replanetizer/Renderer/GLTexture.cs

@@ -42,7 +42,7 @@ static GLTexture()
 
             string? applicationFolder = System.AppContext.BaseDirectory;
             string resourcesFolder = Path.Join(applicationFolder, "Resources");
-            Image<L8> image = Image.Load<L8>(Path.Join(resourcesFolder, "blue_noise.png"));
+            using Image<L8> image = Image.Load<L8>(Path.Join(resourcesFolder, "blue_noise.png"));
             blueNoiseTexture = new GLTexture("BlueNoiseTextrue", image);
         }
 
@@ -277,5 +277,10 @@ public void Dispose()
         {
             GL.DeleteTexture(textureID);
         }
+
+        public static void CleanupStaticResources()
+        {
+            blueNoiseTexture?.Dispose();
+        }
     }
 }