Merge pull request #73 from progtime-net/ObjectDeletion

Object delete allowed + minor collision fix

ZoFo/GameCore/Client.cs

@@ -172,9 +172,17 @@ namespace ZoFo.GameCore
             else if (update is UpdateAnimation)
             {
                 var ent = FindEntityById(update.IdEntity);
-
+                if (ent != null)
                     ((ent as Entity).graphicsComponent as AnimatedGraphicsComponent).StartAnimation((update as UpdateAnimation).animationId);
-                DebugHUD.Instance.Log("new Animation " + ent.position); 
+               //DebugHUD.Instance.Log("new Animation " + ent.position);
+            }
+            else if (update is UpdateGameObjectDeleted)
+            {
+                var ent = FindEntityById(update.IdEntity);
+
+                if (ent != null)
+                    DeleteObject(ent);
+
             }
         }
 
@@ -193,6 +201,16 @@ namespace ZoFo.GameCore
             }
             return null;
         }
+        public void DeleteObject(Entity entity)
+        {
+
+            if (gameObjects.Contains(entity))
+                gameObjects.Remove(entity);
+            //if (entities.Contains(entity))
+            //    entities.Remove(entity);
+            if (players.Contains(entity))
+                players.Remove(entity as Player);
+        }
 
     }
 }

ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs

@@ -26,18 +26,25 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
 
 
         //чекаем коллизии в листе
+        
+        /// <summary>
+        /// минимальный накоп изменения перед перевдижением
+        /// </summary>
+        const float minimalValueToChange = 4;
         public void CheckComponentCollision(CollisionComponent componentOfEntity)
         {
             var entity = componentOfEntity.gameObject as LivingEntity;
             //for (int i = 0; i < ObjectsWithCollisions.Count; i++)
             //{
             var currentRect = entity.collisionComponent.stopRectangle;//задаём РЕК
-            currentRect.X+=(int)entity.position.X;
+            currentRect.X += (int)entity.position.X;
-            currentRect.Y+=(int)entity.position.Y;
+            currentRect.Y += (int)entity.position.Y;
 
             var newRect = currentRect; // задаём значение старого РЕК новому РЕК 
 
 
+            if (Math.Abs((int)entity.velocity.X) > minimalValueToChange ) //TODO
+            {
                 var collidedX = false; // соприкосновение
                 var tryingRectX = currentRect;//переменная для попытки перемещения по X
 
@@ -71,11 +78,16 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
                     newRect.X = tryingRectX.X;//значение по X для нового РЕК приравниваем к значению испытуемого РЕК
                 }
 
+                entity.velocity.X = 0;
+            }
             //==ПОВТОРЯЕМ ТОЖЕ САМОЕ ДЛЯ Y==
 
             var collidedY = false; // соприкосновение
             var tryingRectY = currentRect;//переменная для попытки перемещения по X
 
+            if (Math.Abs((int)entity.velocity.Y)> minimalValueToChange) //TODO
+            {
+
                 tryingRectY.Offset(new Point(0, (int)entity.velocity.Y));//задаём значения для tryingRectX по X и по Y 
 
                 foreach (var item in ObjectsWithCollisions)//фильтрация 
@@ -103,12 +115,14 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
                     entity.position.Y += entity.velocity.Y;
                     newRect.Y = tryingRectY.Y;//значение по X для нового РЕК приравниваем к значению испытуемого РЕК
                 }
+                entity.velocity.Y = 0;
+            }
+
 
             entity.graphicsComponent.ObjectDrawRectangle.X = (int)entity.position.X;
             entity.graphicsComponent.ObjectDrawRectangle.Y = (int)entity.position.Y;
             AppManager.Instance.server.AddData(new UpdatePosition() { NewPosition = entity.position, IdEntity = entity.Id });
             AppManager.Instance.debugHud.Set("testPos", entity.position.ToString()); //TODO remove
-            entity.velocity = Vector2.Zero;
         }
 
         public void UpdateTriggerZones(Player player)
@@ -120,13 +134,15 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
             currentRect.Y += (int)entity.position.Y;
 
 
+            for (int i = 0; i < ObjectsWithTriggers.Count; i++)
+            {
+                int c = ObjectsWithTriggers.Count;
 
-            foreach (var item in ObjectsWithTriggers)//фильтрация 
+                if (ObjectsWithTriggers[i].triggerRectangle.SetOrigin(ObjectsWithTriggers[i].gameObject.position).Intersects(currentRect))
                 {
-                if (item.triggerRectangle.SetOrigin(item.gameObject.position).Intersects(currentRect))
+                    ObjectsWithTriggers[i].PlayerInZone(player);
-                {
-                    item.PlayerInZone(player);
                 }
+                i -= c - ObjectsWithTriggers.Count;
             }
         }
 
@@ -163,6 +179,18 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
                 EntitiesWithMovements.Add(component);
             }
         }
+        public void Deregister(CollisionComponent component)
+        {
+            if (ObjectsWithCollisions.Contains(component))
+                ObjectsWithCollisions.Remove(component);
+            if (ObjectsWithTriggers.Contains(component))
+                ObjectsWithTriggers.Remove(component);
+            if (component.gameObject is LivingEntity)
+            {
+                if (EntitiesWithMovements.Contains(component))
+                    EntitiesWithMovements.Remove(component);
+            }
+        }
 
         public Player[] GetPlayersInZone(Rectangle rectangle)
         {

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Zombie.cs

@@ -25,7 +25,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies
             Vector2 duration = Vector2.Normalize(
                 AppManager.Instance.server.players[0].position - position
                 );
-            velocity=new Vector2(duration.X * speed, duration.Y*speed);
+            velocity+=new Vector2(duration.X * speed, duration.Y*speed);
             if (Random.Shared.NextDouble() > 0.9)
             {
 

ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs

@@ -19,6 +19,7 @@ public class LivingEntity : Entity
     public LivingEntity(Vector2 position) : base(position)
     {
         inputManager = new InputManager();
+        collisionComponent.hasCollision = true;
     }
 
     public override GraphicsComponent graphicsComponent { get; } = null;
@@ -35,6 +36,20 @@ public class LivingEntity : Entity
         
     }
 
+    public override void UpdateAnimations()
+    {
+        base.UpdateAnimations();
+    }
+    Vector2 prevPosition_forClient;
+    public override void Draw(SpriteBatch spriteBatch)
+    {
+        if ((position - prevPosition_forClient).X< 0)
+            graphicsComponent.Flip = SpriteEffects.FlipHorizontally;
+        else if((position - prevPosition_forClient).X > 0)
+            graphicsComponent.Flip = SpriteEffects.None;
+        base.Draw(spriteBatch);
+        prevPosition_forClient = position;
+    }
 
 }
 

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs

@@ -29,6 +29,8 @@ public class Player : LivingEntity
         //InputPlayerRotation = new Vector2(0, 0);
         graphicsComponent.ObjectDrawRectangle = new Rectangle(0, 0, 100, 100);
         collisionComponent.stopRectangle = new Rectangle(0, 0, 100, 100);
+
+        StartAnimation("player_look_down");
     }
 
 
@@ -40,17 +42,16 @@ public class Player : LivingEntity
     float t;
     public void MovementLogic()
     { 
-        IsTryingToShoot = true; 
+        IsTryingToShoot = true; //gslkjfsnblkjsdfnnlkjbn;zkcjnb;kkjnzx;cjkb;kzjxb;kSErgo 
-        StartAnimation("player_look_down");//gslkjfsnblkjsdfnnlkjbn;zkcjnb;kkjnzx;cjkb;kzjxb;kSErgo 
         //velocity.X = 3+(float)Math.Sin(t);
         t++;
         if (InputPlayerRotation.X > 0.9)
         {
         }
-        if (Keyboard.GetState().IsKeyDown(Keys.D)) velocity.X = 5;
+        if (Keyboard.GetState().IsKeyDown(Keys.D)) velocity.X += 5;
-        if (Keyboard.GetState().IsKeyDown(Keys.A)) velocity.X = -5;
+        if (Keyboard.GetState().IsKeyDown(Keys.A)) velocity.X += -5;
-        if (Keyboard.GetState().IsKeyDown(Keys.S)) velocity.Y = 5;
+        if (Keyboard.GetState().IsKeyDown(Keys.S)) velocity.Y += 5;
-        if (Keyboard.GetState().IsKeyDown(Keys.W)) velocity.Y = -5;
+        if (Keyboard.GetState().IsKeyDown(Keys.W)) velocity.Y += -5;
     }
     public void HandleNewInput(UpdateInput updateInput)
     {

ZoFo/GameCore/Server.cs

@@ -212,12 +212,18 @@ namespace ZoFo.GameCore
         /// Удаляет игровой объект
         /// </summary>
         /// <param name="gameObject"></param>
-        public void DeleteObject(GameObject gameObject)
+        public void DeleteObject(Entity entity)
         {
-            gameObjects.Remove(gameObject);
+            if (gameObjects.Contains(entity))
+                gameObjects.Remove(entity);
+            if (entities.Contains(entity))
+                entities.Remove(entity);
+            if (players.Contains(entity))
+                players.Remove(entity as Player);
             AddData(new UpdateGameObjectDeleted()
-                { GameObjectType = gameObject.GetType().Name}
+                { GameObjectType = entity.GetType().Name, IdEntity = entity .Id}
             );
+            collisionManager.Deregister(entity.collisionComponent);
         }
     }