Selective Merge 2024-11-04

.github/workflows/update-credits.yml

@@ -19,6 +19,8 @@ jobs:
 
       - name: Get this week's Contributors
         shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt
 
       # TODO

Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs

@@ -25,7 +25,7 @@ public sealed class ExplosionDebugOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
 
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public MapId Map;
 
     private readonly Font _font;
@@ -78,15 +78,16 @@ private void DrawScreen(OverlayDrawArgs args)
         if (SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds);
+        Matrix3x2.Invert(SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(args.WorldBounds);
 
         DrawText(handle, gridBounds, SpaceMatrix, SpaceTiles, SpaceTileSize);
     }
 
     private void DrawText(
         DrawingHandleScreen handle,
         Box2 gridBounds,
-        Matrix3 transform,
+        Matrix3x2 transform,
         Dictionary<int, List<Vector2i>> tileSets,
         ushort tileSize)
     {
@@ -103,7 +104,7 @@ private void DrawText(
                 if (!gridBounds.Contains(centre))
                     continue;
 
-                var worldCenter = transform.Transform(centre);
+                var worldCenter = Vector2.Transform(centre, transform);
 
                 var screenCenter = _eyeManager.WorldToScreen(worldCenter);
 
@@ -119,7 +120,7 @@ private void DrawText(
         if (tileSets.TryGetValue(0, out var set))
         {
             var epicenter = set.First();
-            var worldCenter = transform.Transform((epicenter + Vector2Helpers.Half) * tileSize);
+            var worldCenter = Vector2.Transform((epicenter + Vector2Helpers.Half) * tileSize, transform);
             var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
             var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
             handle.DrawString(_font, screenCenter, text);
@@ -148,11 +149,12 @@ private void DrawWorld(in OverlayDrawArgs args)
         if (SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds).Enlarged(2);
+        Matrix3x2.Invert(SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(args.WorldBounds).Enlarged(2);
         handle.SetTransform(SpaceMatrix);
 
         DrawTiles(handle, gridBounds, SpaceTiles, SpaceTileSize);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawTiles(

Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs

@@ -1,4 +1,5 @@
 using Content.Client.Atmos.Overlays;
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using JetBrains.Annotations;
@@ -36,28 +37,38 @@ public override void Shutdown()
 
         private void OnHandleState(EntityUid gridUid, GasTileOverlayComponent comp, ref ComponentHandleState args)
         {
-            if (args.Current is not GasTileOverlayState state)
-                return;
+            Dictionary<Vector2i, GasOverlayChunk> modifiedChunks;
 
-            // is this a delta or full state?
-            if (!state.FullState)
+            switch (args.Current)
             {
-                foreach (var index in comp.Chunks.Keys)
+                // is this a delta or full state?
+                case GasTileOverlayDeltaState delta:
                 {
-                    if (!state.AllChunks!.Contains(index))
-                        comp.Chunks.Remove(index);
+                    modifiedChunks = delta.ModifiedChunks;
+                    foreach (var index in comp.Chunks.Keys)
+                    {
+                        if (!delta.AllChunks.Contains(index))
+                            comp.Chunks.Remove(index);
+                    }
+
+                    break;
                 }
-            }
-            else
-            {
-                foreach (var index in comp.Chunks.Keys)
+                case GasTileOverlayState state:
                 {
-                    if (!state.Chunks.ContainsKey(index))
-                        comp.Chunks.Remove(index);
+                    modifiedChunks = state.Chunks;
+                    foreach (var index in comp.Chunks.Keys)
+                    {
+                        if (!state.Chunks.ContainsKey(index))
+                            comp.Chunks.Remove(index);
+                    }
+
+                    break;
                 }
+                default:
+                    return;
             }
 
-            foreach (var (index, data) in state.Chunks)
+            foreach (var (index, data) in modifiedChunks)
             {
                 comp.Chunks[index] = data;
             }

Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

@@ -66,7 +66,7 @@ protected override void Draw(in OverlayDrawArgs args)
             DrawData(msg, handle);
         }
 
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawData(DebugMessage msg,

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -190,7 +190,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
                     var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
                     state.drawHandle.SetTransform(worldMatrix);
-                    var floatBounds = invMatrix.TransformBox(in state.WorldBounds).Enlarged(grid.TileSize);
+                    var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
                     var localBounds = new Box2i(
                         (int) MathF.Floor(floatBounds.Left),
                         (int) MathF.Floor(floatBounds.Bottom),
@@ -249,7 +249,7 @@ protected override void Draw(in OverlayDrawArgs args)
                 });
 
             drawHandle.UseShader(null);
-            drawHandle.SetTransform(Matrix3.Identity);
+            drawHandle.SetTransform(Matrix3x2.Identity);
         }
 
         private void DrawMapOverlay(

Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs

@@ -31,7 +31,7 @@ public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool n
         Author.Visible = true;
 
         PageName.Text = article.Title;
-        PageText.SetMarkup(article.Content);
+        PageText.SetMarkupPermissive(article.Content);
 
         PageNum.Text = $"{targetNum}/{totalNum}";
 

Content.Client/Clickable/ClickableComponent.cs

@@ -38,18 +38,18 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
             renderOrder = sprite.RenderOrder;
             var (spritePos, spriteRot) = transform.GetWorldPositionRotation(xformQuery);
             var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation);
-            bottom = Matrix3.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
+            bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
 
-            var invSpriteMatrix = Matrix3.Invert(sprite.GetLocalMatrix());
+            Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix);
 
             // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites.
             var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive();
 
             Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
 
             // First we get `localPos`, the clicked location in the sprite-coordinate frame.
-            var entityXform = Matrix3.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
-            var localPos = invSpriteMatrix.Transform(entityXform.Transform(worldPos));
+            var entityXform = Matrix3Helpers.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
+            var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
 
             // Check explicitly defined click-able bounds
             if (CheckDirBound(sprite, relativeRotation, localPos))
@@ -79,8 +79,8 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
 
                 // convert to layer-local coordinates
                 layer.GetLayerDrawMatrix(dir, out var matrix);
-                var inverseMatrix = Matrix3.Invert(matrix);
-                var layerLocal = inverseMatrix.Transform(localPos);
+                Matrix3x2.Invert(matrix, out var inverseMatrix);
+                var layerLocal = Vector2.Transform(localPos, inverseMatrix);
 
                 // Convert to image coordinates
                 var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f);

Content.Client/Decals/DecalSystem.cs

@@ -56,34 +56,43 @@ protected override void OnDecalRemoved(EntityUid gridId, uint decalId, DecalGrid
 
         private void OnHandleState(EntityUid gridUid, DecalGridComponent gridComp, ref ComponentHandleState args)
         {
-            if (args.Current is not DecalGridState state)
-                return;
-
             // is this a delta or full state?
             _removedChunks.Clear();
+            Dictionary<Vector2i, DecalChunk> modifiedChunks;
 
-            if (!state.FullState)
+            switch (args.Current)
             {
-                foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                case DecalGridDeltaState delta:
                 {
-                    if (!state.AllChunks!.Contains(key))
-                        _removedChunks.Add(key);
+                    modifiedChunks = delta.ModifiedChunks;
+                    foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                    {
+                        if (!delta.AllChunks.Contains(key))
+                            _removedChunks.Add(key);
+                    }
+
+                    break;
                 }
-            }
-            else
-            {
-                foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                case DecalGridState state:
                 {
-                    if (!state.Chunks.ContainsKey(key))
-                        _removedChunks.Add(key);
+                    modifiedChunks = state.Chunks;
+                    foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                    {
+                        if (!state.Chunks.ContainsKey(key))
+                            _removedChunks.Add(key);
+                    }
+
+                    break;
                 }
+                default:
+                    return;
             }
 
             if (_removedChunks.Count > 0)
                 RemoveChunks(gridUid, gridComp, _removedChunks);
 
-            if (state.Chunks.Count > 0)
-                UpdateChunks(gridUid, gridComp, state.Chunks);
+            if (modifiedChunks.Count > 0)
+                UpdateChunks(gridUid, gridComp, modifiedChunks);
         }
 
         private void OnChunkUpdate(DecalChunkUpdateEvent ev)

Content.Client/Decals/Overlays/DecalOverlay.cs

@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -113,7 +114,7 @@ protected override void Draw(in OverlayDrawArgs args)
                     handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
             }
 
-            handle.SetTransform(Matrix3.Identity);
+            handle.SetTransform(Matrix3x2.Identity);
         }
     }
 }

Content.Client/Decals/Overlays/DecalPlacementOverlay.cs

@@ -51,7 +51,7 @@ protected override void Draw(in OverlayDrawArgs args)
         var handle = args.WorldHandle;
         handle.SetTransform(worldMatrix);
 
-        var localPos = invMatrix.Transform(mousePos.Position);
+        var localPos = Vector2.Transform(mousePos.Position, invMatrix);
 
         if (snap)
         {
@@ -63,6 +63,6 @@ protected override void Draw(in OverlayDrawArgs args)
         var box = new Box2Rotated(aabb, rotation, localPos);
 
         handle.DrawTextureRect(_sprite.Frame0(decal.Sprite), box, color);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 }

Content.Client/DoAfter/DoAfterOverlay.cs

@@ -56,8 +56,8 @@ protected override void Draw(in OverlayDrawArgs args)
 
         // If you use the display UI scale then need to set max(1f, displayscale) because 0 is valid.
         const float scale = 1f;
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
-        var rotationMatrix = Matrix3.CreateRotation(-rotation);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
 
         var curTime = _timing.CurTime;
 
@@ -91,9 +91,9 @@ protected override void Draw(in OverlayDrawArgs args)
                 ? curTime - _meta.GetPauseTime(uid, meta)
                 : curTime;
 
-            var worldMatrix = Matrix3.CreateTranslation(worldPosition);
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
             handle.SetTransform(matty);
 
             var offset = 0f;
@@ -151,7 +151,7 @@ protected override void Draw(in OverlayDrawArgs args)
         }
 
         handle.UseShader(null);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     public Color GetProgressColor(float progress, float alpha = 1f)

Content.Client/Explosion/ExplosionOverlay.cs

@@ -48,7 +48,7 @@ protected override void Draw(in OverlayDrawArgs args)
             DrawExplosion(drawHandle, args.WorldBounds, visuals, index, xforms, textures);
         }
 
-        drawHandle.SetTransform(Matrix3.Identity);
+        drawHandle.SetTransform(Matrix3x2.Identity);
         drawHandle.UseShader(null);
     }
 
@@ -78,7 +78,8 @@ private void DrawExplosion(
         if (visuals.SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(visuals.SpaceMatrix).TransformBox(worldBounds).Enlarged(2);
+        Matrix3x2.Invert(visuals.SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(worldBounds).Enlarged(2);
         drawHandle.SetTransform(visuals.SpaceMatrix);
 
         DrawTiles(drawHandle, gridBounds, index, visuals.SpaceTiles, visuals, visuals.SpaceTileSize, textures);

Content.Client/Fluids/PuddleOverlay.cs

@@ -1,4 +1,5 @@
-using Content.Shared.FixedPoint;
+using System.Numerics;
+using Content.Shared.FixedPoint;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
@@ -73,7 +74,7 @@ private void DrawWorld(in OverlayDrawArgs args)
             }
         }
 
-        drawHandle.SetTransform(Matrix3.Identity);
+        drawHandle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawScreen(in OverlayDrawArgs args)
@@ -99,7 +100,7 @@ private void DrawScreen(in OverlayDrawArgs args)
                 if (!gridBounds.Contains(centre))
                     continue;
 
-                var screenCenter = _eyeManager.WorldToScreen(matrix.Transform(centre));
+                var screenCenter = _eyeManager.WorldToScreen(Vector2.Transform(centre, matrix));
 
                 drawHandle.DrawString(_font, screenCenter, debugOverlayData.CurrentVolume.ToString(), Color.White);
             }

Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs

@@ -37,14 +37,8 @@ public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
-            switch (message)
-            {
-                case InstrumentBandResponseBuiMessage bandRx:
-                    _bandMenu?.Populate(bandRx.Nearby, EntMan);
-                    break;
-                default:
-                    break;
-            }
+            if (message is InstrumentBandResponseBuiMessage bandRx)
+                _bandMenu?.Populate(bandRx.Nearby, EntMan);
         }
 
         protected override void Open()