Fixed gameObjects properties

Great Merge Done!

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()
         {

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)
     {

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
+{
+
+}

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() { }
 
 }

ZoFo/GameCore/GameObjects/Projectile.cs

@@ -1,8 +0,0 @@
-using System;
-using ZoFo.GameCore.GameObjects.Entities.LivingEntities;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Projectile : LivingEntity
-{
-
-}