fix (./Scene): found a better way to get EntitySystem type

maelbecel · Jan 10, 2024 · 4c3f7dc · 4c3f7dc
1 parent db0b9b5
commit 4c3f7dc
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 30 deletions.
diff --git a/Assets/Scene/Menu.exodia b/Assets/Scene/Menu.exodia
@@ -1,6 +1,12 @@
 Scene: Menu
 Entities:
-  - Entity: 18114247486284332275
+  - Entity: 13929703132169399887
+    TransformComponent:
+      Translation: [0, 0, 15]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
     CameraComponent:
       Camera:
         ProjectionType: 0
@@ -12,27 +18,21 @@ Entities:
         OrthographicFar: 1
       Primary: true
       FixedAspectRatio: false
-    TagComponent:
-      Tag: Camera
+  - Entity: 7839090563277919771
     TransformComponent:
-      Translation: [0, 0, 15]
+      Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-  - Entity: 6399166993246459951
+    TagComponent:
+      Tag: Pata-Pata
     ScriptComponent:
       Name: PataPata
     RigidBody2DComponent:
       BodyType: Dynamic
       Velocity: [0, 0]
       GravityScale: 1
       Mass: 1
-    TagComponent:
-      Tag: Pata-Pata
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
 Prefabs:
   []
 Systems:
-  - System: MovingSystem
+  - System: MovingSystem
diff --git a/Examples/Entity-Component-System/src/FortniteEvent.hpp b/Examples/Entity-Component-System/src/FortniteEvent.hpp
@@ -58,10 +58,6 @@ namespace Exodia {
             // when unconfigure is called you usually want to unsubscribe from all events.
         }
 
-        virtual std::string GetTypeOfSystem() const override {
-            return "FortniteZone";
-        }
-
       private:
         // Attributes
         float _DamagePerSecond;

diff --git a/Examples/Entity-Component-System/src/GravitySystem.hpp b/Examples/Entity-Component-System/src/GravitySystem.hpp
@@ -28,8 +28,6 @@ namespace Exodia {
             });
         }
 
-        virtual std::string GetTypeOfSystem() const override { return "GravitySystem"; }
-
       private:
         // Attributes
         float _GravityAmount;

diff --git a/GameEngine/src/Exodia/Scene/Serializer/SceneSerializer.cpp b/GameEngine/src/Exodia/Scene/Serializer/SceneSerializer.cpp
@@ -55,8 +55,10 @@ namespace Exodia {
         out << YAML::Key << "Systems" << YAML::Value << YAML::BeginSeq;
         {
             for (auto &system : _Scene->_Systems) {
+                std::string typeName = extractTypeName(typeid(*system).name());
+
                 out << YAML::BeginMap;
-                out << YAML::Key << "System" << YAML::Value << system->GetTypeOfSystem();
+                out << YAML::Key << "System" << YAML::Value << typeName;
                 out << YAML::EndMap;
             }
         }

diff --git a/GameEngine/src/Exodia/Scene/System/Collision/CollisionSystem.hpp b/GameEngine/src/Exodia/Scene/System/Collision/CollisionSystem.hpp
@@ -60,8 +60,6 @@ namespace Exodia {
 
         virtual void Receive(World *world, const Events::OnCollisionEntered &event) override;
 
-        virtual std::string GetTypeOfSystem() const override { return "CollisionSystem"; }
-
       private:
         bool CheckCollision(ComponentHandle<BoxCollider2DComponent> collider1,
                             ComponentHandle<TransformComponent> transform1,

diff --git a/GameEngine/src/Exodia/Scene/System/Particle/ParticleSystem.hpp b/GameEngine/src/Exodia/Scene/System/Particle/ParticleSystem.hpp
@@ -23,7 +23,6 @@ namespace Exodia {
         /////////////
       public:
         virtual void Update(World *world, Timestep ts) override;
-        virtual std::string GetTypeOfSystem() const override { return "ParticleSystem"; }
     };
 }; // namespace Exodia
 

diff --git a/GameEngine/src/Exodia/Scene/System/Physics/GravitySystem.hpp b/GameEngine/src/Exodia/Scene/System/Physics/GravitySystem.hpp
@@ -33,7 +33,6 @@ namespace Exodia {
         /////////////
       public:
         void Update(World *world, Timestep ts) override;
-        std::string GetTypeOfSystem() const override { return "GravitySystem"; }
 
       private:
         void ApplyGravity(ComponentHandle<RigidBody2DComponent> rigidBody, Timestep ts);

diff --git a/GameEngine/src/Exodia/Scene/System/Physics/MovingSystem.hpp b/GameEngine/src/Exodia/Scene/System/Physics/MovingSystem.hpp
@@ -34,7 +34,6 @@ namespace Exodia {
         /////////////
       public:
         virtual void Update(World *world, Timestep ts) override;
-        virtual std::string GetTypeOfSystem() const override { return "MovingSystem"; }
 
       private:
         void ApplyVelocity(ComponentHandle<RigidBody2DComponent> rigidBody,

diff --git a/GameEngine/src/Exodia/Scene/System/Script/ScriptSystem.hpp b/GameEngine/src/Exodia/Scene/System/Script/ScriptSystem.hpp
@@ -31,7 +31,6 @@ namespace Exodia {
         /////////////
       public:
         virtual void Update(World *world, Timestep ts) override;
-        virtual std::string GetTypeOfSystem() const override { return "ScriptSystem"; }
     };
 }; // namespace Exodia
 

diff --git a/Library/Entity-Component-System/src/Interface/EntitySystem.hpp b/Library/Entity-Component-System/src/Interface/EntitySystem.hpp
@@ -31,8 +31,6 @@ namespace Exodia {
         virtual void Unconfigure(UNUSED(World *world)){};
 
         virtual void Update(UNUSED(World *world), UNUSED(Timestep ts)){};
-
-        virtual std::string GetTypeOfSystem() const = 0;
     };
 }; // namespace Exodia
 

diff --git a/R-Type/src/System/AnimationSystem.hpp b/R-Type/src/System/AnimationSystem.hpp
@@ -28,7 +28,6 @@ namespace RType {
       public:
         void Update(Exodia::World *world, Exodia::Timestep ts) override;
         void Receive(Exodia::World *world, const Events::AnimationEndingEvent &event) override;
-        std::string GetTypeOfSystem() const override { return "AnimationSystem"; }
     };
 }; // namespace RType
 

diff --git a/SandBox/Ethan/R-Type/src/Systems/AnimationSystem.hpp b/SandBox/Ethan/R-Type/src/Systems/AnimationSystem.hpp
@@ -28,7 +28,6 @@ namespace RType {
       public:
         void Update(Exodia::World *world, Exodia::Timestep ts) override;
         void Receive(Exodia::World *world, const Events::AnimationEndingEvent &event) override;
-        std::string GetTypeOfSystem() const override { return "AnimationSystem"; }
     };
 }; // namespace RType
 

diff --git a/SandBox/Ethan/R-Type/src/Systems/FadeSystem.hpp b/SandBox/Ethan/R-Type/src/Systems/FadeSystem.hpp
@@ -30,7 +30,6 @@ namespace RType {
         /////////////
       public:
         void Update(Exodia::World *world, Exodia::Timestep ts) override;
-        std::string GetTypeOfSystem() const override { return "FadeSystem"; }
     };
 }; // namespace RType