From 1b77e35c32ed5eb85e83ae3c2dabe364e9eecc24 Mon Sep 17 00:00:00 2001
From: PetrKu09 <petr.ku09@gmail.com>
Date: Sat, 17 Aug 2024 11:36:18 +0300
Subject: [PATCH] Resolve issues

---
 .../CollisionManager/CollisionComponent.cs      | 15 +++++++++------
 .../CollisionManager/CollisionManager.cs        | 17 ++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
index f22b906..880e159 100644
--- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
+++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
@@ -1,10 +1,11 @@
-using System;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
+using ZoFo.GameCore.GameObjects;
 using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
 
 namespace ZoFo.GameCore.GameManagers.CollisionManager
@@ -13,17 +14,19 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
     {
         //==ПОЛЯ==
 
-        //public GameObject gameObject { get; set; }
+        public GameObject gameObject { get; set; }
         //public Rectangle Bounds { get; set; }
 
-        public Rectangle Rectangle => new Rectangle();
+        //public Rectangle Rectangle => new Rectangle();
+
+
 
         bool doesStop;
-        Rectangle stopRectangle;
+        public Rectangle stopRectangle;
 
         // triggers for rectangle
         bool isTrigger;
-        Rectangle triggerRectangle;
+        public Rectangle triggerRectanglee;
 
         //delegate
         public delegate void EventHandler(object sender, EventArgs e);
diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs
index 943694f..96c9cbc 100644
--- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs
+++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs
@@ -1,7 +1,6 @@
 using Microsoft.VisualBasic;
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -28,7 +27,7 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
         {
             //for (int i = 0; i < ObjectsWithCollisions.Count; i++)
             //{
-                var currentRect = entity.Rectangle;//задаём РЕК
+                var currentRect = entity.collisionComponent.stopRectangle;//задаём РЕК
                 var newRect = currentRect; // задаём значение старого РЕК новому РЕК
                 bool flagRemovedObject = false; //флаг удаления 
 
@@ -40,9 +39,9 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
 
                 foreach (var item in ObjectsWithCollisions)//фильтрация 
                 {
-                    if (Math.Abs(item.Pos.X - entity.Pos.X) < 550 
-                        && Math.Abs(item.Pos.Y - entity.Pos.Y) < 550
-                        && tryingRectX.Intersect(item.Rectangle))
+                    if (Math.Abs(item.stopRectangle.X - entity.collisionComponent.stopRectangle.X) < 550 
+                        && Math.Abs(item.stopRectangle.Y - entity.collisionComponent.stopRectangle.Y) < 550
+                        && tryingRectX.Intersects(item.stopRectangle))
 
                     {
                         collidedX = true;// меняем значение соприкосновения на true
@@ -66,13 +65,13 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
             var collidedY = false; // соприкосновение
             var tryingRectY = currentRect;//переменная для попытки перемещения по X
 
-            tryingRectY.Offset((int)(0, entity.velocity.Y));//задаём значения для tryingRectX по X и по Y 
+            tryingRectY.Offset(new Point(0, (int)entity.velocity.Y));//задаём значения для tryingRectX по X и по Y 
 
             foreach (var item in ObjectsWithCollisions)//фильтрация 
             {
-                if (Math.Abs(item.Pos.X - entity.Pos.X) < 550
-                    && Math.Abs(item.Pos.Y - entity.Pos.Y) < 550
-                    && tryingRectY.Intersect(item.Rectangle))
+                if (Math.Abs(item.stopRectangle.X - entity.collisionComponent.stopRectangle.X) < 550
+                    && Math.Abs(item.stopRectangle.Y - entity.collisionComponent.stopRectangle.Y) < 550
+                    && tryingRectY.Intersects(item.stopRectangle))
 
                 {
                     collidedY = true;// меняем значение соприкосновения на true