chrisbell/Tiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Player collision

Browse Source
This commit is contained in:
Chris Bell 2024-11-20 16:59:15 -06:00
parent df7c05c2e3
commit f0734e27be
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tiles/Game.cs
View File

@ -46,7 +46,7 @@ public class Game
Player = new Player("Player") Player = new Player("Player")
{ {
Position = World.GetGlobalPositionFromGrid(500, 500) Position = World.GetGlobalPositionFromGrid(500, 200)
}; };
CameraController = new CameraController(); CameraController = new CameraController();

51
Tiles/Player.cs
View File

@ -10,8 +10,9 @@ public class Player
public Vector2 Position { get; set; } public Vector2 Position { get; set; }
public float Speed { get; set; } = 2f; public float Speed { get; set; } = 2f;
public Texture2D Texture { get; private set; } public Texture2D Texture { get; private set; }
public Vector2 PointerPosition { get; private set; } public Vector2 PointerPosition { get; private set; }
public bool IsColliding { get; private set; } = false;
public bool IsOnGround { get; private set; }
private readonly string _imagePath; private readonly string _imagePath;
@ -25,6 +26,8 @@ public class Player
private Rectangle _currentRect; private Rectangle _currentRect;
private Vector2 _newPosition = Vector2.Zero;
public Player(string name, int id = 0, string imagePath = "data/core/player/dude.png") public Player(string name, int id = 0, string imagePath = "data/core/player/dude.png")
{ {
Name = name; Name = name;
@ -57,24 +60,33 @@ public class Player
private void HandleInput() private void HandleInput()
{ {
_newPosition = Position;
// WASD // WASD
if (Raylib.IsKeyDown(KeyboardKey.W)) Position += new Vector2(0, -1) * Speed; if (Raylib.IsKeyDown(KeyboardKey.W)) _newPosition += new Vector2(0, -1) * Speed;
if (Raylib.IsKeyDown(KeyboardKey.A)) if (Raylib.IsKeyDown(KeyboardKey.A))
{ {
Position += new Vector2(-1, 0) * Speed; _newPosition += new Vector2(-1, 0) * Speed;
_direction = 0; _direction = 0;
} }
if (Raylib.IsKeyDown(KeyboardKey.S)) Position += new Vector2(0, 1) * Speed; if (Raylib.IsKeyDown(KeyboardKey.S)) _newPosition += new Vector2(0, 1) * Speed;
if (Raylib.IsKeyDown(KeyboardKey.D)) if (Raylib.IsKeyDown(KeyboardKey.D))
{ {
Position += new Vector2(1, 0) * Speed; _newPosition += new Vector2(1, 0) * Speed;
_direction = 1; _direction = 1;
} }
HandleCollision(_newPosition);
if (!IsColliding)
{
Position = _newPosition;
}
// Speed control // Speed control
if (Raylib.IsKeyReleased(KeyboardKey.Up)) Speed += 1f; if (Raylib.IsKeyReleased(KeyboardKey.Up)) Speed += 1f;
if (Raylib.IsKeyReleased(KeyboardKey.Down)) Speed -= 1f; if (Raylib.IsKeyReleased(KeyboardKey.Down)) Speed -= 1f;
// Select tiles // Select tiles
if (Raylib.IsKeyReleased(KeyboardKey.Right)) if (Raylib.IsKeyReleased(KeyboardKey.Right))
{ {
@ -118,4 +130,29 @@ public class Player
Raylib.DrawRectangle((int)PointerPosition.X*Game.Instance.World.TileSize, (int)PointerPosition.Y*Game.Instance.World.TileSize, Game.Instance.World.TileSize, Game.Instance.World.TileSize, new Color(255, 255, 0, 80)); Raylib.DrawRectangle((int)PointerPosition.X*Game.Instance.World.TileSize, (int)PointerPosition.Y*Game.Instance.World.TileSize, Game.Instance.World.TileSize, Game.Instance.World.TileSize, new Color(255, 255, 0, 80));
} }
private void HandleCollision(Vector2 newPosition)
{
var gridPos = Game.Instance.World.GetGridPositionFromGlobalPosition((int)newPosition.X, (int)newPosition.Y);
int tileSize = Game.Instance.World.TileSize;
int startX = (int)gridPos.X;
int startY = (int)gridPos.Y;
int endX = (int)((newPosition.X + _currentRect.Width) / tileSize);
int endY = (int)((newPosition.Y + _currentRect.Height) / tileSize);
IsColliding = false;
for (int x = startX; x <= endX; x++)
{
for (int y = startY; y <= endY; y++)
{
if (Game.Instance.World.GetTile(x, y) != 0)
{
IsColliding = true;
return;
}
}
}
}
} }