From 898a9cedc1eb85b798e9bd7c53d5cf3e68cd55e5 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sun, 7 Apr 2024 19:19:11 +0200
Subject: [PATCH] bullets collide with walls

---
 TanksServer/DrawSteps/BulletDrawer.cs  |  2 +-
 TanksServer/DrawSteps/DrawHelpers.cs   | 23 -----------------
 TanksServer/DrawSteps/MapDrawer.cs     |  2 +-
 TanksServer/Helpers/PositionHelpers.cs | 35 ++++++++++++++++++++++++++
 TanksServer/Models/FloatPosition.cs    |  1 -
 TanksServer/Services/BulletManager.cs  | 15 +++++++++--
 6 files changed, 50 insertions(+), 28 deletions(-)
 delete mode 100644 TanksServer/DrawSteps/DrawHelpers.cs
 create mode 100644 TanksServer/Helpers/PositionHelpers.cs

diff --git a/TanksServer/DrawSteps/BulletDrawer.cs b/TanksServer/DrawSteps/BulletDrawer.cs
index 9773e80..39e7be0 100644
--- a/TanksServer/DrawSteps/BulletDrawer.cs
+++ b/TanksServer/DrawSteps/BulletDrawer.cs
@@ -8,6 +8,6 @@ internal sealed class BulletDrawer(BulletManager bullets): IDrawStep
     public void Draw(DisplayPixelBuffer buffer)
     {
         foreach (var bullet in bullets.GetAll())
-            buffer.Pixels[bullet.Position.ToPixelPosition().GetPixelIndex()] = true;
+            buffer.Pixels[bullet.Position.ToPixelPosition().ToPixelIndex()] = true;
     }
 }
diff --git a/TanksServer/DrawSteps/DrawHelpers.cs b/TanksServer/DrawSteps/DrawHelpers.cs
deleted file mode 100644
index cd84e00..0000000
--- a/TanksServer/DrawSteps/DrawHelpers.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Diagnostics;
-using TanksServer.Models;
-using TanksServer.Services;
-
-namespace TanksServer.DrawSteps;
-
-internal static class DrawHelpers
-{
-    public static int GetPixelIndex(this PixelPosition position)
-    {
-        return position.Y * MapService.PixelsPerRow + position.X;
-    }
-
-    public static PixelPosition GetPixel(this TilePosition position, byte subX, byte subY)
-    {
-        Debug.Assert(subX < 8);
-        Debug.Assert(subY < 8);
-        return new PixelPosition(
-            X: position.X * MapService.TileSize + subX,
-            Y: position.Y * MapService.TileSize + subY
-        );
-    }
-}
diff --git a/TanksServer/DrawSteps/MapDrawer.cs b/TanksServer/DrawSteps/MapDrawer.cs
index c46e731..56b9c9f 100644
--- a/TanksServer/DrawSteps/MapDrawer.cs
+++ b/TanksServer/DrawSteps/MapDrawer.cs
@@ -18,7 +18,7 @@ internal sealed class MapDrawer(MapService map) : IDrawStep
             for (byte pixelInTileY = 0; pixelInTileY < MapService.TileSize; pixelInTileY++)
             for (byte pixelInTileX = 0; pixelInTileX < MapService.TileSize; pixelInTileX++)
             {
-                var index = tile.GetPixel(pixelInTileX, pixelInTileY).GetPixelIndex();
+                var index = tile.GetPixelRelative(pixelInTileX, pixelInTileY).ToPixelIndex();
                 buffer.Pixels[index] = pixelInTileX % 2 == pixelInTileY % 2;
             }
         }
diff --git a/TanksServer/Helpers/PositionHelpers.cs b/TanksServer/Helpers/PositionHelpers.cs
new file mode 100644
index 0000000..55e2bc1
--- /dev/null
+++ b/TanksServer/Helpers/PositionHelpers.cs
@@ -0,0 +1,35 @@
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using TanksServer.Models;
+using TanksServer.Services;
+
+namespace TanksServer.Helpers;
+
+internal static class PositionHelpers
+{
+    public static int ToPixelIndex(this PixelPosition position)
+    {
+        return position.Y * MapService.PixelsPerRow + position.X;
+    }
+
+    public static PixelPosition GetPixelRelative(this TilePosition position, byte subX, byte subY)
+    {
+        Debug.Assert(subX < 8);
+        Debug.Assert(subY < 8);
+        return new PixelPosition(
+            X: position.X * MapService.TileSize + subX,
+            Y: position.Y * MapService.TileSize + subY
+        );
+    }
+
+
+    public static PixelPosition ToPixelPosition(this FloatPosition position) => new(
+        X: (int)position.X % MapService.PixelsPerRow,
+        Y: (int)position.Y % MapService.PixelsPerRow
+    );
+
+    public static TilePosition ToTilePosition(this PixelPosition position) => new(
+        X: position.X / MapService.TileSize,
+        Y: position.Y / MapService.TileSize
+    );
+}
diff --git a/TanksServer/Models/FloatPosition.cs b/TanksServer/Models/FloatPosition.cs
index fb0167a..0f47879 100644
--- a/TanksServer/Models/FloatPosition.cs
+++ b/TanksServer/Models/FloatPosition.cs
@@ -4,5 +4,4 @@ namespace TanksServer.Models;
 
 internal readonly record struct FloatPosition(double X, double Y)
 {
-    public PixelPosition ToPixelPosition() => new((int)X % MapService.PixelsPerRow, (int)Y % MapService.PixelsPerRow);
 }
diff --git a/TanksServer/Services/BulletManager.cs b/TanksServer/Services/BulletManager.cs
index b840144..5752668 100644
--- a/TanksServer/Services/BulletManager.cs
+++ b/TanksServer/Services/BulletManager.cs
@@ -1,21 +1,29 @@
 using System.Collections;
+using TanksServer.Helpers;
 using TanksServer.Models;
 
 namespace TanksServer.Services;
 
-internal sealed class BulletManager : ITickStep
+internal sealed class BulletManager(MapService map) : ITickStep
 {
     private readonly HashSet<Bullet> _bullets = new();
 
     public void Spawn(Bullet bullet) => _bullets.Add(bullet);
 
+    public IEnumerable<Bullet> GetAll() => _bullets;
+
     public Task TickAsync()
     {
+        HashSet<Bullet> bulletsToRemove = new();
         foreach (var bullet in _bullets)
         {
             MoveBullet(bullet);
+
+            if (BulletHitsWall(bullet))
+                bulletsToRemove.Add(bullet);
         }
 
+        _bullets.RemoveWhere(b => bulletsToRemove.Contains(b));
         return Task.CompletedTask;
     }
 
@@ -28,5 +36,8 @@ internal sealed class BulletManager : ITickStep
         );
     }
 
-    public IEnumerable<Bullet> GetAll() => _bullets;
+    private bool BulletHitsWall(Bullet bullet)
+    {
+        return map.IsCurrentlyWall(bullet.Position.ToPixelPosition().ToTilePosition());
+    }
 }