diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs index 00ee287..cbef012 100644 --- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs +++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs @@ -11,10 +11,11 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager { public class CollisionComponent { - //поля + //==ПОЛЯ== + + public GameObject gameObject { get; set; } public Rectangle Bounds { get; set; } - //остановлен ли перс bool doesStop; Rectangle stopRectangle; diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs index 81bc36e..c8905f8 100644 --- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs +++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs @@ -14,18 +14,21 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager { public class CollisionManager { - public List CollisionComponent; - public List TriggerComponent; + //листики + + public List ObjectsWithCollisions; + public List EntitiesWithMovements; + public List ObjectsWithTriggers; - + //чекаем коллизии в листе public bool CheckComponentCollision(List collisionComponents, CollisionComponent component) { - foreach (var collisionComponent in collisionComponents) + foreach (var collision in collisionComponents) { - if (component.Bounds.IntersectsWith(collisionComponent.Bounds)) + if (component.Bounds.IntersectsWith(collision.Bounds)) { - Register(component); + //Register(component, ); return true; } } @@ -33,24 +36,28 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager return false; } - public void UpdateComponentCollision(List collisionComponents) + //обновление позиций + public void UpdateObjectPosition(List collisionComponents, CollisionComponent component) { - + } - public void UpdatePositions() - { - - } + //получение объекта на поле(карте) //public void GetObjectInArea(Rectangle area) //{ //} - public void Register(CollisionComponent component) + + //регистрация компонента(его коллизии) + public void Register(CollisionComponent component, GameObject gameObject) { - CollisionComponent.Add(component); + if (component.gameObject is Entity) + { + ObjectsWithCollisions.Add(component); + + } }