Merge remote-tracking branch 'upstream/master' into 2024-10-18-bui

metalgearsloth · metalgearsloth · commit 282814453305 · 2024-10-26T13:08:23.000+11:00
diff --git a/MSBuild/Robust.Engine.Version.props b/MSBuild/Robust.Engine.Version.props
@@ -1,4 +1,4 @@
 <Project>
     <!-- This file automatically reset by Tools/version.py -->
-    <PropertyGroup><Version>236.1.0</Version></PropertyGroup>
+    <PropertyGroup><Version>237.1.0</Version></PropertyGroup>
 </Project>
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -39,23 +39,53 @@ END TEMPLATE-->
 
 ### New features
 
-* The game server's `/update` endpoint now supports passing more information on why an update is available.
-  * This information is accessible via `IWatchdogApi.RestartRequested`.
-  * Information can be specified by passing a JSON object with a `Reason` code and `Message` field.
+*None yet*
 
 ### Bugfixes
 
 *None yet*
 
 ### Other
 
-* Made `WatchdogApi` and some members of `IWatchdogApi` private. These symbols should never have been accessed by content.
+*None yet*
 
 ### Internal
 
 *None yet*
 
 
+## 237.1.0
+
+### New features
+
+* csi's auto import-system can now handle generic types.
+* csi's reflection helpers (like `fld()`) handle private members up the inheritance chain.
+
+### Bugfixes
+
+* Fix `UniqueIndexHkm<,>` and, by extension, entity data storage memory leaking.
+* Fix bugs related to UIScale on `OSWindow`s.
+
+
+## 237.0.0
+
+### Breaking changes
+
+* `IClydeWindow.Size` is now settable, allowing window sizes to be changed after creation.
+
+### New features
+
+* The game server's `/update` endpoint now supports passing more information on why an update is available.
+  * This information is accessible via `IWatchdogApi.RestartRequested`.
+  * Information can be specified by passing a JSON object with a `Reason` code and `Message` field.
+* Added an "Erase" button to the tile spawn menu.
+* Added `OSWindow.Create()`, which allows OS windows to be created & initialised without immediately opening/showing them.
+
+### Other
+
+* Made `WatchdogApi` and some members of `IWatchdogApi` private. These symbols should never have been accessed by content.
+
+
 ## 236.1.0
 
 ### New features
diff --git a/Robust.Client/Graphics/Clyde/Clyde.Events.cs b/Robust.Client/Graphics/Clyde/Clyde.Events.cs
@@ -109,6 +109,9 @@ private void SendCloseWindow(WindowReg windowReg, WindowRequestClosedEventArgs e
 
         private void SendWindowResized(WindowReg reg, Vector2i oldSize)
         {
+            if (!reg.IsVisible) // Only send this for open windows
+                return;
+
             var loaded = RtToLoaded(reg.RenderTarget);
             loaded.Size = reg.FramebufferSize;
 
diff --git a/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs b/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs
@@ -343,6 +343,8 @@ public IClydeWindow CreateWindow(WindowCreateParameters parameters)
                 if (isMain)
                     _mainWindow = reg;
 
+                reg.IsVisible = parameters.Visible;
+
                 _windows.Add(reg);
                 _windowHandles.Add(reg.Handle);
 
@@ -444,6 +446,12 @@ public void SetCursor(ICursor? cursor)
             _windowing!.CursorSet(_mainWindow!, cursor);
         }
 
+        private void SetWindowSize(WindowReg reg, Vector2i size)
+        {
+            DebugTools.AssertNotNull(_windowing);
+
+            _windowing!.WindowSetSize(reg, size);
+        }
 
         private void SetWindowVisible(WindowReg reg, bool visible)
         {
@@ -533,7 +541,11 @@ public void Dispose()
                 _clyde.DoDestroyWindow(Reg);
             }
 
-            public Vector2i Size => Reg.FramebufferSize;
+            public Vector2i Size
+            {
+                get => Reg.FramebufferSize;
+                set => _clyde.SetWindowSize(Reg, value);
+            }
 
             public IRenderTarget RenderTarget => Reg.RenderTarget;
 
diff --git a/Robust.Client/Graphics/Clyde/ClydeHeadless.cs b/Robust.Client/Graphics/Clyde/ClydeHeadless.cs
@@ -517,7 +517,7 @@ public DummyWindow(IRenderTarget renderTarget)
                 RenderTarget = renderTarget;
             }
 
-            public Vector2i Size { get; } = default;
+            public Vector2i Size { get; set; } = default;
             public bool IsDisposed { get; private set; }
             public WindowId Id { get; set; }
             public IRenderTarget RenderTarget { get; }
diff --git a/Robust.Client/Graphics/Clyde/GLContext/GLContextWindow.cs b/Robust.Client/Graphics/Clyde/GLContext/GLContextWindow.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Channels;
@@ -176,6 +176,7 @@ private void BlitSecondaryWindows()
                         window.BlitDoneEvent!.Reset();
                         window.BlitStartEvent!.Set();
                         window.BlitDoneEvent.Wait();
+                        window.UnlockBeforeSwap = Clyde._cfg.GetCVar(CVars.DisplayThreadUnlockBeforeSwap);
                     }
                 }
                 else
@@ -212,8 +213,15 @@ private void BlitThreadDoSecondaryWindowBlit(WindowData window)
                 GL.DrawArrays(PrimitiveType.TriangleStrip, 0, 4);
                 Clyde.CheckGlError();
 
-                window.BlitDoneEvent?.Set();
+                if (window.UnlockBeforeSwap)
+                {
+                    window.BlitDoneEvent?.Set();
+                }
                 Clyde._windowing!.WindowSwapBuffers(window.Reg);
+                if (!window.UnlockBeforeSwap)
+                {
+                    window.BlitDoneEvent?.Set();
+                }
             }
 
             private unsafe void BlitThreadInit(WindowData reg)
@@ -336,6 +344,7 @@ private sealed class WindowData
                 public Thread? BlitThread;
                 public ManualResetEventSlim? BlitStartEvent;
                 public ManualResetEventSlim? BlitDoneEvent;
+                public bool UnlockBeforeSwap;
             }
         }
     }
diff --git a/Robust.Client/Graphics/Clyde/Windowing/Glfw.WindowThread.cs b/Robust.Client/Graphics/Clyde/Windowing/Glfw.WindowThread.cs
@@ -85,6 +85,10 @@ private void ProcessGlfwCmd(CmdBase cmdb)
                         WinThreadWinSetMonitor(cmd);
                         break;
 
+                    case CmdWinSetSize cmd:
+                        WinThreadWinSetSize(cmd);
+                        break;
+
                     case CmdWinSetVisible cmd:
                         WinThreadWinSetVisible(cmd);
                         break;
@@ -234,6 +238,11 @@ private sealed record CmdWinSetFullscreen(
                 nint Window
             ) : CmdBase;
 
+            private sealed record CmdWinSetSize(
+                nint Window,
+                int W, int H
+            ) : CmdBase;
+
             private sealed record CmdWinSetVisible(
                 nint Window,
                 bool Visible
diff --git a/Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs b/Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs
@@ -84,6 +84,13 @@ private void WinThreadWinSetMonitor(CmdWinSetMonitor cmd)
                 );
             }
 
+            public void WindowSetSize(WindowReg window, Vector2i size)
+            {
+                var reg = (GlfwWindowReg) window;
+
+                SendCmd(new CmdWinSetSize((nint) reg.GlfwWindow, size.X, size.Y));
+            }
+
             public void WindowSetVisible(WindowReg window, bool visible)
             {
                 var reg = (GlfwWindowReg) window;
@@ -92,6 +99,13 @@ public void WindowSetVisible(WindowReg window, bool visible)
                 SendCmd(new CmdWinSetVisible((nint) reg.GlfwWindow, visible));
             }
 
+            private void WinThreadWinSetSize(CmdWinSetSize cmd)
+            {
+                var win = (Window*) cmd.Window;
+
+                GLFW.SetWindowSize(win, cmd.W, cmd.H);
+            }
+
             private void WinThreadWinSetVisible(CmdWinSetVisible cmd)
             {
                 var win = (Window*) cmd.Window;
diff --git a/Robust.Client/Graphics/Clyde/Windowing/IWindowingImpl.cs b/Robust.Client/Graphics/Clyde/Windowing/IWindowingImpl.cs
@@ -39,6 +39,7 @@ private interface IWindowingImpl
             void WindowDestroy(WindowReg reg);
             void WindowSetTitle(WindowReg window, string title);
             void WindowSetMonitor(WindowReg window, IClydeMonitor monitor);
+            void WindowSetSize(WindowReg window, Vector2i size);
             void WindowSetVisible(WindowReg window, bool visible);
             void WindowRequestAttention(WindowReg window);
             void WindowSwapBuffers(WindowReg window);
diff --git a/Robust.Client/Graphics/Clyde/Windowing/Sdl2.WindowThread.cs b/Robust.Client/Graphics/Clyde/Windowing/Sdl2.WindowThread.cs
@@ -93,6 +93,10 @@ private void ProcessSdl2Cmd(CmdBase cmdb)
                     WinThreadWinRequestAttention(cmd);
                     break;
 
+                case CmdWinSetSize cmd:
+                    WinThreadWinSetSize(cmd);
+                    break;
+
                 case CmdWinSetVisible cmd:
                     WinThreadWinSetVisible(cmd);
                     break;
@@ -246,6 +250,11 @@ private sealed record CmdWinRequestAttention(
             nint Window
         ) : CmdBase;
 
+        private sealed record CmdWinSetSize(
+            nint Window,
+            int W, int H
+        ) : CmdBase;
+
         private sealed record CmdWinSetVisible(
             nint Window,
             bool Visible
diff --git a/Robust.Client/Graphics/Clyde/Windowing/Sdl2.Windows.cs b/Robust.Client/Graphics/Clyde/Windowing/Sdl2.Windows.cs
@@ -336,11 +336,22 @@ public void WindowSetMonitor(WindowReg window, IClydeMonitor monitor)
             _sawmill.Warning("WindowSetMonitor not implemented on SDL2");
         }
 
+        public void WindowSetSize(WindowReg window, Vector2i size)
+        {
+            SendCmd(new CmdWinSetSize(WinPtr(window), size.X, size.Y));
+        }
+
         public void WindowSetVisible(WindowReg window, bool visible)
         {
+            window.IsVisible = visible;
             SendCmd(new CmdWinSetVisible(WinPtr(window), visible));
         }
 
+        private static void WinThreadWinSetSize(CmdWinSetSize cmd)
+        {
+            SDL_SetWindowSize(cmd.Window, cmd.W, cmd.H);
+        }
+
         private static void WinThreadWinSetVisible(CmdWinSetVisible cmd)
         {
             if (cmd.Visible)
diff --git a/Robust.Client/Graphics/IClydeWindow.cs b/Robust.Client/Graphics/IClydeWindow.cs
@@ -14,7 +14,7 @@ public interface IClydeWindow : IDisposable
         WindowId Id { get; }
         IRenderTarget RenderTarget { get; }
         string Title { get; set; }
-        Vector2i Size { get; }
+        Vector2i Size { get; set; }
         bool IsFocused { get; }
         bool IsMinimized { get; }
         bool IsVisible { get; set; }
diff --git a/Robust.Client/UserInterface/Controls/OSWindow.cs b/Robust.Client/UserInterface/Controls/OSWindow.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.ComponentModel;
-using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
@@ -33,9 +32,9 @@ public class OSWindow : Control
         public IClydeWindow? Owner { get; set; }
 
         /// <summary>
-        /// Whether the window is currently open.
+        /// Whether the window is created and currently open.
         /// </summary>
-        public bool IsOpen => ClydeWindow != null;
+        public bool IsOpen => ClydeWindow?.IsVisible ?? false;
 
         /// <summary>
         /// The title of the window.
@@ -97,12 +96,13 @@ public OSWindow()
         }
 
         /// <summary>
-        /// Show the window to the user.
+        /// Create the window if not already created.
+        /// This window is not visible by default, call <see cref="Show"/> to display it.
         /// </summary>
-        public void Show()
+        public IClydeWindow Create()
         {
-            if (IsOpen)
-                return;
+            if (ClydeWindow != null)
+                return ClydeWindow;
 
             var parameters = new WindowCreateParameters();
 
@@ -127,6 +127,7 @@ public void Show()
             parameters.Styles = WindowStyles;
             parameters.Owner = Owner;
             parameters.StartupLocation = StartupLocation;
+            parameters.Visible = false;
 
             ClydeWindow = _clyde.CreateWindow(parameters);
             ClydeWindow.RequestClosed += OnWindowRequestClosed;
@@ -136,6 +137,19 @@ public void Show()
             _root = UserInterfaceManager.CreateWindowRoot(ClydeWindow);
             _root.AddChild(this);
 
+            // Resize the window by our UIScale
+            ClydeWindow.Size = new((int)(ClydeWindow.Size.X * UIScale), (int)(ClydeWindow.Size.Y * UIScale));
+            return ClydeWindow;
+        }
+
+        /// <summary>
+        /// Show the window to the user, creating it if necessary
+        /// </summary>
+        public void Show()
+        {
+            ClydeWindow = Create();
+            ClydeWindow.IsVisible = true;
+
             Shown();
         }
 
@@ -179,7 +193,7 @@ private void OnWindowDestroyed(WindowDestroyedEventArgs obj)
 
         private void OnWindowResized(WindowResizedEventArgs obj)
         {
-            SetSize = obj.NewSize;
+            SetSize = obj.NewSize / UIScale;
         }
 
         private void RealClosed()
diff --git a/Robust.Client/UserInterface/UserInterfaceManager.Roots.cs b/Robust.Client/UserInterface/UserInterfaceManager.Roots.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 
@@ -28,10 +29,11 @@ public WindowRoot CreateWindowRoot(IClydeWindow window)
         {
             MouseFilter = Control.MouseFilterMode.Ignore,
             HorizontalAlignment = Control.HAlignment.Stretch,
-            VerticalAlignment = Control.VAlignment.Stretch,
-            UIScaleSet = window.ContentScale.X
+            VerticalAlignment = Control.VAlignment.Stretch
         };
 
+        newRoot.UIScaleSet = CalculateAutoScale(newRoot);
+
         _roots.Add(newRoot);
         _windowsToRoot.Add(window.Id, newRoot);
 
diff --git a/Robust.Shared.Scripting/ScriptGlobalsShared.cs b/Robust.Shared.Scripting/ScriptGlobalsShared.cs
diff --git a/Robust.Shared.Scripting/ScriptInstanceShared.cs b/Robust.Shared.Scripting/ScriptInstanceShared.cs
diff --git a/Robust.Shared/CVars.cs b/Robust.Shared/CVars.cs
diff --git a/Robust.Shared/Utility/UniqueIndexHkm.cs b/Robust.Shared/Utility/UniqueIndexHkm.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`<Project>`
`2`	`2`	`<!-- This file automatically reset by Tools/version.py -->`
`3`		`- <PropertyGroup><Version>236.1.0</Version></PropertyGroup>`
	`3`	`+ <PropertyGroup><Version>237.1.0</Version></PropertyGroup>`
`4`	`4`	`</Project>`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@ private void SendCloseWindow(WindowReg windowReg, WindowRequestClosedEventArgs e`
`109`	`109`
`110`	`110`	`private void SendWindowResized(WindowReg reg, Vector2i oldSize)`
`111`	`111`	`{`
	`112`	`+ if (!reg.IsVisible) // Only send this for open windows`
	`113`	`+ return;`
	`114`	`+`
`112`	`115`	`var loaded = RtToLoaded(reg.RenderTarget);`
`113`	`116`	`loaded.Size = reg.FramebufferSize;`
`114`	`117`
Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ public DummyWindow(IRenderTarget renderTarget)`
`517`	`517`	`RenderTarget = renderTarget;`
`518`	`518`	`}`
`519`	`519`
`520`		`- public Vector2i Size { get; } = default;`
	`520`	`+ public Vector2i Size { get; set; } = default;`
`521`	`521`	`public bool IsDisposed { get; private set; }`
`522`	`522`	`public WindowId Id { get; set; }`
`523`	`523`	`public IRenderTarget RenderTarget { get; }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Threading;`
`4`	`4`	`using System.Threading.Channels;`
`@@ -176,6 +176,7 @@ private void BlitSecondaryWindows()`
`176`	`176`	`window.BlitDoneEvent!.Reset();`
`177`	`177`	`window.BlitStartEvent!.Set();`
`178`	`178`	`window.BlitDoneEvent.Wait();`
	`179`	`+ window.UnlockBeforeSwap = Clyde._cfg.GetCVar(CVars.DisplayThreadUnlockBeforeSwap);`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`	`else`
`@@ -212,8 +213,15 @@ private void BlitThreadDoSecondaryWindowBlit(WindowData window)`
`212`	`213`	`GL.DrawArrays(PrimitiveType.TriangleStrip, 0, 4);`
`213`	`214`	`Clyde.CheckGlError();`
`214`	`215`
`215`		`- window.BlitDoneEvent?.Set();`
	`216`	`+ if (window.UnlockBeforeSwap)`
	`217`	`+ {`
	`218`	`+ window.BlitDoneEvent?.Set();`
	`219`	`+ }`
`216`	`220`	`Clyde._windowing!.WindowSwapBuffers(window.Reg);`
	`221`	`+ if (!window.UnlockBeforeSwap)`
	`222`	`+ {`
	`223`	`+ window.BlitDoneEvent?.Set();`
	`224`	`+ }`
`217`	`225`	`}`
`218`	`226`
`219`	`227`	`private unsafe void BlitThreadInit(WindowData reg)`
`@@ -336,6 +344,7 @@ private sealed class WindowData`
`336`	`344`	`public Thread? BlitThread;`
`337`	`345`	`public ManualResetEventSlim? BlitStartEvent;`
`338`	`346`	`public ManualResetEventSlim? BlitDoneEvent;`
	`347`	`+ public bool UnlockBeforeSwap;`
`339`	`348`	`}`
`340`	`349`	`}`
`341`	`350`	`}`