Various code fixes

Author: davidwengier

src/Trains.Emoji/Program.cs

@@ -118,7 +118,7 @@ public static void Draw(string name, string folderName, IPixelMapper pixelMapper
     {
         using var bitmap = new SKBitmap(pixelMapper.CellSize, pixelMapper.CellSize, SKImageInfo.PlatformColorType, SKAlphaType.Premul);
         using var skCanvas = new SKCanvas(bitmap);
-        using (ICanvas canvas = new SKCanvasWrapper(skCanvas))
+        using (var canvas = new SKCanvasWrapper(skCanvas))
         using (canvas.Scope())
         {
             float scale = pixelMapper.CellSize / 100.0f;

src/Trains.NET.Engine/Entity/Layout.cs

@@ -7,7 +7,7 @@ public class Layout(IEntityCollectionSerializer gameSerializer) : ILayout, IInit
 {
     public event EventHandler? CollectionChanged;
 
-    private readonly object _gate = new object();
+    private readonly object _gate = new();
     private readonly IEntityCollectionSerializer _gameSerializer = gameSerializer;
     private IStaticEntity?[][] _entities = null!;
     private int _rows;
@@ -165,14 +165,9 @@ public bool Load(IGameStorage storage)
 
         var entities = _gameSerializer.Deserialize(entitiesString);
 
-        var staticEntites = entities.OfType<IStaticEntity>();
-
-        if (staticEntites is null)
-            return false;
-
         ResetArrays();
 
-        foreach (IStaticEntity entity in staticEntites)
+        foreach (IStaticEntity entity in entities.OfType<IStaticEntity>())
         {
             StoreEntity(entity.Column, entity.Row, entity);
         }

src/Trains.NET.Rendering.Skia/SKImageFactory.cs

@@ -15,9 +15,9 @@ public bool SetContext(IContext context)
     {
         if (context is SKContextWrapper skContext)
         {
-            bool initalSet = _context == null;
+            bool initialSet = _context == null;
             _context = skContext.Context;
-            return initalSet;
+            return initialSet;
         }
         return false;
     }

src/Trains.NET.Rendering/LayerRenderer/TrainsRenderer.cs

@@ -20,8 +20,10 @@ public class TrainsRenderer(
 
     public void Render(ICanvas canvas, int width, int height, IPixelMapper pixelMapper)
     {
-        foreach (Train train in _movableLayout)
+        foreach (var movable in _movableLayout)
         {
+            var train = (Train)movable;
+
             // Create a fake train pointing backwards, to represent our carriage
             var fakeTrain = train.Clone();
             for (var i = 0; i <= train.Carriages; i++)

src/Trains.NET.Rendering/LayerRenderer/TunnelRenderer.cs

@@ -28,7 +28,7 @@ public void Render(ICanvas canvas, int width, int height, IPixelMapper pixelMapp
         var tunnelBaseColour = BuildModeAwareColour(TerrainMapRenderer.GetTerrainColour(firstMountain));
         var entranceColourArray = new[] { tunnelBaseColour, tunnelRoofColour, tunnelBaseColour };
 
-        Dictionary<(int column, int row), Tunnel> entrances = new();
+        Dictionary<(int column, int row), Tunnel> entrances = [];
 
         foreach (Track track in _trackLayout)
         {
@@ -202,13 +202,13 @@ void DrawAction(ICanvas c)
         {
             var cellSize = pixelMapper.CellSize;
             var quarterCellSize = 0.25f * cellSize;
-            var threequarterCellSize = 0.75f * cellSize;
+            var threeQuarterCellSize = 0.75f * cellSize;
 
             c.DrawHorizontalGradientRect(0, 0, cellSize, quarterCellSize, colours);
-            c.DrawVerticalGradientRect(threequarterCellSize, 0, quarterCellSize, cellSize, colours);
-            c.DrawHorizontalGradientRect(0, threequarterCellSize, cellSize, quarterCellSize, colours);
-            c.DrawGradientCircle(threequarterCellSize, 0, quarterCellSize, quarterCellSize, cellSize, 0, cellSize, colours);
-            c.DrawGradientCircle(threequarterCellSize, threequarterCellSize, quarterCellSize, quarterCellSize, cellSize, cellSize, cellSize, colours);
+            c.DrawVerticalGradientRect(threeQuarterCellSize, 0, quarterCellSize, cellSize, colours);
+            c.DrawHorizontalGradientRect(0, threeQuarterCellSize, cellSize, quarterCellSize, colours);
+            c.DrawGradientCircle(threeQuarterCellSize, 0, quarterCellSize, quarterCellSize, cellSize, 0, cellSize, colours);
+            c.DrawGradientCircle(threeQuarterCellSize, threeQuarterCellSize, quarterCellSize, quarterCellSize, cellSize, cellSize, cellSize, colours);
         }
     }
 
@@ -220,16 +220,16 @@ void DrawAction(ICanvas c)
         {
             var cellSize = pixelMapper.CellSize;
             var quarterCellSize = 0.25f * cellSize;
-            var threequarterCellSize = 0.75f * cellSize;
+            var threeQuarterCellSize = 0.75f * cellSize;
 
             c.DrawVerticalGradientRect(0, 0, quarterCellSize, cellSize, colours);
             c.DrawHorizontalGradientRect(0, 0, cellSize, quarterCellSize, colours);
-            c.DrawVerticalGradientRect(0, threequarterCellSize, quarterCellSize, cellSize, colours);
-            c.DrawHorizontalGradientRect(0, threequarterCellSize, cellSize, quarterCellSize, colours);
+            c.DrawVerticalGradientRect(0, threeQuarterCellSize, quarterCellSize, cellSize, colours);
+            c.DrawHorizontalGradientRect(0, threeQuarterCellSize, cellSize, quarterCellSize, colours);
             c.DrawGradientCircle(0, 0, quarterCellSize, quarterCellSize, 0, 0, cellSize, colours);
-            c.DrawGradientCircle(threequarterCellSize, 0, quarterCellSize, quarterCellSize, cellSize, 0, cellSize, colours);
-            c.DrawGradientCircle(threequarterCellSize, threequarterCellSize, quarterCellSize, quarterCellSize, cellSize, cellSize, cellSize, colours);
-            c.DrawGradientCircle(0, threequarterCellSize, quarterCellSize, quarterCellSize, 0, cellSize, cellSize, colours);
+            c.DrawGradientCircle(threeQuarterCellSize, 0, quarterCellSize, quarterCellSize, cellSize, 0, cellSize, colours);
+            c.DrawGradientCircle(threeQuarterCellSize, threeQuarterCellSize, quarterCellSize, quarterCellSize, cellSize, cellSize, cellSize, colours);
+            c.DrawGradientCircle(0, threeQuarterCellSize, quarterCellSize, quarterCellSize, 0, cellSize, cellSize, colours);
         }
     }
 
@@ -315,9 +315,9 @@ void DrawAction(ICanvas c)
             var cellSize = pixelMapper.CellSize;
             var halfCellSize = 0.5f * pixelMapper.CellSize;
 
-            c.DrawVerticalGradientRect(0, 0, cellSize, halfCellSize, new Color[] { darkColour, lightColour });
-            c.DrawGradientCircle(0, halfCellSize, halfCellSize, halfCellSize, 0, cellSize, halfCellSize, new[] { darkColour, lightColour });
-            c.DrawGradientCircle(halfCellSize, halfCellSize, halfCellSize, halfCellSize, cellSize, cellSize, halfCellSize, new[] { darkColour, lightColour });
+            c.DrawVerticalGradientRect(0, 0, cellSize, halfCellSize, [darkColour, lightColour]);
+            c.DrawGradientCircle(0, halfCellSize, halfCellSize, halfCellSize, 0, cellSize, halfCellSize, [darkColour, lightColour]);
+            c.DrawGradientCircle(halfCellSize, halfCellSize, halfCellSize, halfCellSize, cellSize, cellSize, halfCellSize, [darkColour, lightColour]);
         }
     }
 
@@ -339,7 +339,7 @@ void DrawAction(ICanvas c)
             var cellSize = pixelMapper.CellSize;
             var halfCellSize = 0.5f * pixelMapper.CellSize;
 
-            c.DrawGradientCircle(0, 0, cellSize, cellSize, 0, halfCellSize, halfCellSize, new[] { lightColour, darkColour });
+            c.DrawGradientCircle(0, 0, cellSize, cellSize, 0, halfCellSize, halfCellSize, [lightColour, darkColour]);
         }
     }
 

src/Trains.NET.Rendering/UI/BuildModeButton.cs

@@ -6,9 +6,9 @@ public class BuildModeButton(IGameManager gameManager) : MultiButton(34, GetButt
 {
     private static ButtonBase[] GetButtons(IGameManager gameManager)
     {
-        return new ButtonBase[]{
-                new PictureButton(Picture.Tools, 20, () => gameManager.BuildMode, () => gameManager.BuildMode = true),
-                new PictureButton(Picture.Play, 20, () => !gameManager.BuildMode, () => gameManager.BuildMode = false)
-                };
+        return [
+            new PictureButton(Picture.Tools, 20, () => gameManager.BuildMode, () => gameManager.BuildMode = true),
+            new PictureButton(Picture.Play, 20, () => !gameManager.BuildMode, () => gameManager.BuildMode = false)
+        ];
     }
 }

tests/Trains.NET.Tests/Rendering/PixelMapperTests/AdjustGameScaleTests.cs

@@ -49,7 +49,7 @@ public async Task AdjustGameScale_SingleZoomOut_CorrectViewportWorldPosition()
 
         pixelMapper.SetViewPortSize(ScreenSize, ScreenSize);
 
-        // Set the inital viewport to be at 100,100
+        // Set the initial viewport to be at 100,100
         pixelMapper.SetViewPort(100, 100);
         pixelMapper.LogData(_output);
 
@@ -72,7 +72,7 @@ public async Task AdjustGameScale_SingleZoomIn_CorrectViewportWorldPosition()
 
         pixelMapper.SetViewPortSize(ScreenSize, ScreenSize);
 
-        // Set the inital viewport to be at 100,100
+        // Set the initial viewport to be at 100,100
         pixelMapper.SetViewPort(100, 100);
         pixelMapper.LogData(_output);
 
@@ -95,7 +95,7 @@ public async Task AdjustGameScale_DoubleZoomIn_CorrectViewportWorldPosition()
 
         pixelMapper.SetViewPortSize(ScreenSize, ScreenSize);
 
-        // Set the inital viewport to be at 100,100
+        // Set the initial viewport to be at 100,100
         pixelMapper.SetViewPort(100, 100);
         pixelMapper.LogData(_output);
 
@@ -124,7 +124,7 @@ public async Task AdjustGameScale_DoubleZoomIn_OddPos_CorrectViewportWorldPositi
 
         pixelMapper.SetViewPortSize(ScreenSize, ScreenSize);
 
-        // Set the inital viewport to be at 100,100
+        // Set the initial viewport to be at 100,100
         pixelMapper.SetViewPort(350, 700);
         pixelMapper.LogData(_output);
 

tests/Trains.NET.Tests/TrainMovement/MoveHorizontal/MovingLeft.cs

@@ -47,9 +47,9 @@ public void MoveHorizontal_MovingLeft_WithinCell_SnappingToCenter(float relative
     [InlineData(0.9f, 0.2f, 0.7f)]
     [InlineData(0.9f, 0.5f, 0.4f)]
     [InlineData(0.5f, 0.4f, 0.1f)]
-    public void MoveHorizontal_MovingLeft_WithinCell_VariedDistance(float initalLeft, float distance, float expectedLeft)
+    public void MoveHorizontal_MovingLeft_WithinCell_VariedDistance(float initialLeft, float distance, float expectedLeft)
     {
-        var position = new TrainPosition(initalLeft, 0.5f, 180, distance);
+        var position = new TrainPosition(initialLeft, 0.5f, 180, distance);
         var expectedPos = new TrainPosition(expectedLeft, 0.5f, 180, 0.0f);
 
         TrainMovement.MoveHorizontal(position);
@@ -66,9 +66,9 @@ public void MoveHorizontal_MovingLeft_WithinCell_VariedDistance(float initalLeft
     [InlineData(0.5f, 1.0f, 0.5f)]
     [InlineData(0.5f, 2.0f, 1.5f)]
     [InlineData(1.0f, 1.0f, 0.0f)]
-    public void MoveHorizontal_MovingLeft_BeyondCell(float initalLeft, float distance, float expectedDistance)
+    public void MoveHorizontal_MovingLeft_BeyondCell(float initialLeft, float distance, float expectedDistance)
     {
-        var position = new TrainPosition(initalLeft, 0.5f, 180, distance);
+        var position = new TrainPosition(initialLeft, 0.5f, 180, distance);
         var expectedPos = new TrainPosition(-0.1f, 0.5f, 180, expectedDistance);
 
         TrainMovement.MoveHorizontal(position);

tests/Trains.NET.Tests/TrainMovement/MoveHorizontal/MovingRight.cs

@@ -52,9 +52,9 @@ public void MoveHorizontal_MovingRight_WithinCell_SnappingToCenter(float relativ
     [InlineData(0.1f, 0.2f, 0.3f)]
     [InlineData(0.1f, 0.5f, 0.6f)]
     [InlineData(0.5f, 0.4f, 0.9f)]
-    public void MoveHorizontal_MovingRight_WithinCell_VariedDistance(float initalLeft, float distance, float expectedLeft)
+    public void MoveHorizontal_MovingRight_WithinCell_VariedDistance(float initialLeft, float distance, float expectedLeft)
     {
-        var position = new TrainPosition(initalLeft, 0.5f, 0, distance);
+        var position = new TrainPosition(initialLeft, 0.5f, 0, distance);
         var expectedPos = new TrainPosition(expectedLeft, 0.5f, 0, 0.0f);
 
         TrainMovement.MoveHorizontal(position);
@@ -71,9 +71,9 @@ public void MoveHorizontal_MovingRight_WithinCell_VariedDistance(float initalLef
     [InlineData(0.5f, 1.0f, 0.5f)]
     [InlineData(0.5f, 2.0f, 1.5f)]
     [InlineData(0.0f, 1.0f, 0.0f)]
-    public void MoveHorizontal_MovingRight_BeyondCell(float initalLeft, float distance, float expectedDistance)
+    public void MoveHorizontal_MovingRight_BeyondCell(float initialLeft, float distance, float expectedDistance)
     {
-        var position = new TrainPosition(initalLeft, 0.5f, 0, distance);
+        var position = new TrainPosition(initialLeft, 0.5f, 0, distance);
         var expectedPos = new TrainPosition(1.1f, 0.5f, 0, expectedDistance);
 
         TrainMovement.MoveHorizontal(position);

tests/Trains.NET.Tests/TrainMovement/MoveLeftDown/ClockwiseFromLeft.cs

@@ -49,9 +49,9 @@ public void MoveLeftDown_ClockwiseFromLeft_WithinCell_SnappingToCenter(float rel
     [InlineData(0.0f, 0.5f, 0.0f, ThirdCornerTrackDistance, Cos60ByRadius, 1.0f - Sin60ByRadius, 30.0f)]
     [InlineData(0.0f, 0.5f, 0.0f, ThirdCornerTrackDistance * 2, Cos30ByRadius, 1.0f - Sin30ByRadius, 60.0f)]
     [InlineData(Cos60ByRadius, 1.0f - Sin60ByRadius, 30, ThirdCornerTrackDistance, Cos30ByRadius, 1.0f - Sin30ByRadius, 60.0f)]
-    public void MoveLeftDown_ClockwiseFromLeft_WithinCell_VariedDistance(float initalLeft, float initalTop, float initialAngle, float distance, float expectedLeft, float expectedTop, float expectedAngle)
+    public void MoveLeftDown_ClockwiseFromLeft_WithinCell_VariedDistance(float initialLeft, float initialTop, float initialAngle, float distance, float expectedLeft, float expectedTop, float expectedAngle)
     {
-        var position = new TrainPosition(initalLeft, initalTop, initialAngle, distance);
+        var position = new TrainPosition(initialLeft, initialTop, initialAngle, distance);
         var expectedPos = new TrainPosition(expectedLeft, expectedTop, expectedAngle, 0.0f);
 
         TrainMovement.MoveLeftDown(position);
@@ -66,9 +66,9 @@ public void MoveLeftDown_ClockwiseFromLeft_WithinCell_VariedDistance(float inita
     [InlineData(0.0f, 0.5f, 0.0f, HalfCornerTrackDistance * 3, HalfCornerTrackDistance)]
     [InlineData(Cos45ByRadius, 1.0f - Sin45ByRadius, 45.0f, HalfCornerTrackDistance * 2, HalfCornerTrackDistance)]
     [InlineData(Cos45ByRadius, 1.0f - Sin45ByRadius, 45.0f, 1.0f + HalfCornerTrackDistance, 1.0f)]
-    public void MoveLeftDown_ClockwiseFromLeft_BeyondCell(float initalLeft, float initalTop, float initialAngle, float distance, float expectedDistance)
+    public void MoveLeftDown_ClockwiseFromLeft_BeyondCell(float initialLeft, float initialTop, float initialAngle, float distance, float expectedDistance)
     {
-        var position = new TrainPosition(initalLeft, initalTop, initialAngle, distance);
+        var position = new TrainPosition(initialLeft, initialTop, initialAngle, distance);
         var expectedPos = new TrainPosition(0.5f, 1.1f, 90.0f, expectedDistance);
 
         TrainMovement.MoveLeftDown(position);