Closes #6; Fixed callbacks destruction

technologists-team · Jul 11, 2024 · 27c9d95 · 27c9d95
1 parent 19f5e23
commit 27c9d95
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 17 deletions.
diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Callbacks.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Callbacks.cs
@@ -1,22 +1,43 @@
-using Hypercube.Client.Graphics.Event;
-using Hypercube.Client.Input;
+using Hypercube.Client.Input;
 using Hypercube.Client.Utilities;
 using OpenTK.Windowing.GraphicsLibraryFramework;
 using GlfwKeyModifiers = OpenTK.Windowing.GraphicsLibraryFramework.KeyModifiers;
 using KeyModifiers = Hypercube.Client.Input.KeyModifiers;
+using static OpenTK.Windowing.GraphicsLibraryFramework.GLFWCallbacks;
 
 namespace Hypercube.Client.Graphics.Windows.Manager;
 
 public sealed unsafe partial class GlfwWindowManager
 {
-    private void OnWindowClosed(Window* window)
+    private ErrorCallback? _errorCallback;
+
+    private KeyCallback? _keyCallback;
+
+    private WindowCloseCallback? _windowCloseCallback;
+    private WindowSizeCallback? _windowSizeCallback;
+    private WindowFocusCallback? _windowFocusCallback;
+
+    /// <summary>
+    /// GC doesn't think our callbacks are stored anywhere,
+    /// so it cleans them up,
+    /// we need to indicate that there is a link to them so they don't get lost.
+    /// </summary>
+    private void HandleCallbacks()
     {
-        if (!TryGetWindow(window, out var registration))
-            return;
+        _errorCallback = OnErrorHandled;
+
+        _keyCallback = OnWindowKeyHandled;
 
-        _renderer.CloseWindow(registration);
+        _windowCloseCallback = OnWindowClosed;
+        _windowSizeCallback = OnWindowResized;
+        _windowFocusCallback = OnWindowFocusChanged;
     }
-
+
+    private void OnErrorHandled(ErrorCode error, string description)
+    {
+        _logger.Error(GLFWHelper.FormatError(error, description));
+    }
+
     private void OnWindowKeyHandled(Window* window, Keys glfwKey, int scanCode, InputAction action, GlfwKeyModifiers mods)
     {
         var key = (Key)glfwKey;
@@ -49,6 +70,14 @@ private void OnWindowKeyHandled(Window* window, Keys glfwKey, int scanCode, Inpu
             (KeyModifiers)mods,
             scanCode));
     }
+
+    private void OnWindowClosed(Window* window)
+    {
+        if (!TryGetWindow(window, out var registration))
+            return;
+
+        _renderer.CloseWindow(registration);
+    }
 
     private void OnWindowResized(Window* window, int width, int height)
     {

diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Init.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Init.cs
@@ -14,17 +14,12 @@ private bool GlfwInit()
         }
 
         // Set callback to handle errors
-        GLFW.SetErrorCallback(OnErrorHandled);
+        GLFW.SetErrorCallback(_errorCallback);
 
         _initialized = true;
 
         var version = GLFW.GetVersionString();
         _logger.EngineInfo($"Initialize, version: {version}");
         return true;
     }
-
-    private void OnErrorHandled(ErrorCode error, string description)
-    {
-        _logger.Error(GLFWHelper.FormatError(error, description));
-    }
 }
diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs
@@ -130,10 +130,10 @@ private GlfwWindowRegistration WindowSetup(Window* window, WindowCreateSettings
              SetWindowIcons(registration, settings.WindowImages.ToList());
 
          // Setting callbacks
-         GLFW.SetKeyCallback(window, OnWindowKeyHandled);
-         GLFW.SetWindowCloseCallback(window, OnWindowClosed);
-         GLFW.SetWindowSizeCallback(window, OnWindowResized);
-         GLFW.SetWindowFocusCallback(window, OnWindowFocusChanged);
+         GLFW.SetKeyCallback(window, _keyCallback);
+         GLFW.SetWindowCloseCallback(window, _windowCloseCallback);
+         GLFW.SetWindowSizeCallback(window, _windowSizeCallback);
+         GLFW.SetWindowFocusCallback(window, _windowFocusCallback);
 
          return registration;
      }

diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.cs
@@ -26,6 +26,9 @@ public bool Init()
     {
         DependencyManager.Inject(this);
 
+        // We don't let GC take our callbacks
+        HandleCallbacks();
+
         if (!GlfwInit())
             return false;