From a8492abe60179006d9eb5e6a588fafe2cd5affde Mon Sep 17 00:00:00 2001
From: SergoDobro <optimgrey@yandex.ru>
Date: Fri, 16 Aug 2024 09:44:31 +0300
Subject: [PATCH] Fixed gameObjects properties

Great Merge Done!
---
 ZoFo/GameCore/GameObjects/Entities/Entity.cs      |  4 ++++
 .../Entities/LivingEntities/LivingEntity.cs       |  3 ++-
 .../LivingEntities/Projectiles/Projectile.cs      |  7 +++++++
 ZoFo/GameCore/GameObjects/GameObject.cs           | 15 ++++++++++++---
 ZoFo/GameCore/GameObjects/Projectile.cs           |  8 --------
 5 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Projectile.cs
 delete mode 100644 ZoFo/GameCore/GameObjects/Projectile.cs

diff --git a/ZoFo/GameCore/GameObjects/Entities/Entity.cs b/ZoFo/GameCore/GameObjects/Entities/Entity.cs
index b6b6865..10283c5 100644
--- a/ZoFo/GameCore/GameObjects/Entities/Entity.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/Entity.cs
@@ -3,11 +3,15 @@ using System.Collections.Generic;
 using System.Text;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using ZoFo.GameCore.GameManagers.CollisionManager;
+using ZoFo.GameCore.ZoFo_graphics;
 
 namespace ZoFo.GameCore.GameObjects.Entities
 {
     public abstract class Entity : GameObject
     {
+        protected override GraphicsComponent graphicsComponent => null;
+        public CollisionComponent collisionComponent { get; protected set; }
         public int Id { get; set; }
         public void CollisionComponent()
         {
diff --git a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
index 2f9cf7a..d09be3a 100644
--- a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
@@ -2,12 +2,13 @@
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using ZoFo.GameCore.GameObjects.Entities;
+using ZoFo.GameCore.ZoFo_graphics;
 
 namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities;
 public class LivingEntity : Entity
 {
     public Vector2 velocity;
-    public Vector2 position;
+
 
     public void TextureLoad(SpriteBatch spriteBatch)
     {
diff --git a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Projectile.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Projectile.cs
new file mode 100644
index 0000000..dba7dae
--- /dev/null
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Projectile.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Projectiles;
+public class Projectile : LivingEntity
+{
+
+}
diff --git a/ZoFo/GameCore/GameObjects/GameObject.cs b/ZoFo/GameCore/GameObjects/GameObject.cs
index 510f160..813c583 100644
--- a/ZoFo/GameCore/GameObjects/GameObject.cs
+++ b/ZoFo/GameCore/GameObjects/GameObject.cs
@@ -1,6 +1,15 @@
-namespace ZoFo.GameCore.GameObjects;
+
+using Microsoft.Xna.Framework;
+using ZoFo.GameCore.ZoFo_graphics;
 
-public class GameObject
+namespace ZoFo.GameCore.GameObjects;
+
+public abstract class GameObject
 {
-    
+    public Vector2 position;
+    public Vector2 rotation;
+
+    protected abstract GraphicsComponent graphicsComponent { get; }
+    public void Draw() { }
+
 }
\ No newline at end of file
diff --git a/ZoFo/GameCore/GameObjects/Projectile.cs b/ZoFo/GameCore/GameObjects/Projectile.cs
deleted file mode 100644
index c8df157..0000000
--- a/ZoFo/GameCore/GameObjects/Projectile.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-using ZoFo.GameCore.GameObjects.Entities.LivingEntities;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Projectile : LivingEntity
-{
-
-}