From 16a40586e73a317cbdf2ca9c259d2628aab1ca41 Mon Sep 17 00:00:00 2001 From: PetrKu09 Date: Thu, 15 Aug 2024 17:06:12 +0300 Subject: [PATCH] Add meet into CheckComponentCollision and Create UpdateComponentCollision --- .../GameManagers/CollisionManager/CollisionComponent.cs | 5 +++++ .../GameManagers/CollisionManager/CollisionManager.cs | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs index c5b3a0f..755fc11 100644 --- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs +++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs @@ -25,6 +25,11 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager //delegate public delegate void EventHandler(object sender, EventArgs e); + public CollisionComponent(int x, int y, int width, int height) + { + Bounds = new Rectangle(x, y, width, height); + } + //events public event EventHandler OnTriggerEnter; diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs index 0663b7f..75acc1b 100644 --- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs +++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs @@ -17,17 +17,16 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager public List CollisionComponent; public List TriggerComponent; - public bool CheckComponentCollision(List collisionComponents, CollisionComponent component) + public static bool CheckComponentCollision(List collisionComponents, CollisionComponent component) { - foreach (var obstacle in collisionComponents) + foreach (var collisionComponent in collisionComponents) { - if (component.Bounds.Intersects(obstacle.Bounds)) + if (component.Bounds.IntersectsWith(collisionComponent.Bounds)) { return true; } } - return false; }