Fixing bug with some entity systems not cleaning up after themselves.

Chukobyte · Jan 9, 2022 · 71e1901 · 71e1901
1 parent 1f341b8
commit 71e1901
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 54 deletions.
diff --git a/_version.json b/_version.json
@@ -1,3 +1,3 @@
 {
-	"version": "0.47.0"
+	"version": "0.47.1"
 }
diff --git a/src/core/ecs/system/entity_system.h b/src/core/ecs/system/entity_system.h
@@ -14,7 +14,7 @@ class EntitySystem {
         return enabled;
     }
 
-    virtual void Initialize() = 0;
+    virtual void Initialize() {}
 
     virtual void Enable() {
         enabled = true;

diff --git a/src/core/ecs/system/systems/animated_sprite_rendering_entity_system.h b/src/core/ecs/system/systems/animated_sprite_rendering_entity_system.h
@@ -22,11 +22,6 @@ class AnimatedSpriteRenderingEntitySystem : public EntitySystem {
         sceneManager = GD::GetContainer()->sceneManager;
         enabled = true;
     }
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-
-    void OnEntityDestroyed(Entity entity) override {}
 
     void Render() override {
         if (IsEnabled()) {

diff --git a/src/core/ecs/system/systems/collision_entity_system.h b/src/core/ecs/system/systems/collision_entity_system.h
@@ -74,15 +74,10 @@ class CollisionEntitySystem : public EntitySystem {
     }
 
     void Initialize() override {
+        EntitySystem::Initialize();
         colliderTexture = GD::GetContainer()->assetManager->GetTexture(BLANK_WHITE_TEXTURE_ASSET_ID);
     }
 
-    void Enable() override {}
-
-    void Disable() override {}
-
-    void OnEntityDestroyed(Entity entity) override {}
-
     void ProcessEntityCollisions(Entity sourceEntity, Vector2 offset = Vector2(0.0f, 0.0f)) {
         collisionContext->ClearCollisionData();
         std::vector<Entity> collidedEntities;

diff --git a/src/core/ecs/system/systems/directional_light_rendering_entity_system.h b/src/core/ecs/system/systems/directional_light_rendering_entity_system.h
@@ -18,11 +18,6 @@ class DirectionalLightRenderingEntitySystem : public EntitySystem {
         componentManager = GD::GetContainer()->componentManager;
         enabled = true;
     }
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-
-    void OnEntityDestroyed(Entity entity) override {}
 
     void Render() override {
         if (IsEnabled()) {

diff --git a/src/core/ecs/system/systems/point_light_rendering_entity_system.h b/src/core/ecs/system/systems/point_light_rendering_entity_system.h
@@ -19,11 +19,6 @@ class PointLightRenderingEntitySystem : public EntitySystem {
         componentManager = GD::GetContainer()->componentManager;
         enabled = true;
     }
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-
-    void OnEntityDestroyed(Entity entity) override {}
 
     void Render() override {
         if (IsEnabled()) {

diff --git a/src/core/ecs/system/systems/script_entity_system.h b/src/core/ecs/system/systems/script_entity_system.h
@@ -17,16 +17,13 @@ class ScriptEntitySystem : public EntitySystem {
     }
 
     void Initialize() override {
+        EntitySystem::Initialize();
         for (auto const &pair : scriptContexts) {
             auto const &scriptContext = pair.second;
             scriptContext->Initialize();
         }
     }
 
-    void Enable() override {}
-
-    void Disable() override {}
-
     void OnEntityDestroyed(Entity entity) override {
         EntitySystem::OnEntityDestroyed(entity);
         assert(activeScriptContext != nullptr && "No active script context!");

diff --git a/src/core/ecs/system/systems/spot_light_rendering_entity_system.h b/src/core/ecs/system/systems/spot_light_rendering_entity_system.h
@@ -19,11 +19,6 @@ class SpotLightRenderingEntitySystem : public EntitySystem {
         componentManager = GD::GetContainer()->componentManager;
         enabled = true;
     }
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-
-    void OnEntityDestroyed(Entity entity) override {}
 
     void Render() override {
         if (IsEnabled()) {

diff --git a/src/core/ecs/system/systems/sprite_rendering_entity_system.h b/src/core/ecs/system/systems/sprite_rendering_entity_system.h
@@ -22,11 +22,6 @@ class SpriteRenderingEntitySystem : public EntitySystem {
         enabled = true;
     }
 
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-    void OnEntityDestroyed(Entity entity) override {}
-
     void Render() override {
         if (IsEnabled()) {
             for (Entity entity : entities) {

diff --git a/src/core/ecs/system/systems/text_rendering_entity_system.h b/src/core/ecs/system/systems/text_rendering_entity_system.h
@@ -24,19 +24,13 @@ class TextRenderingEntitySystem : public EntitySystem {
         enabled = true;
     }
 
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-
     void OnRegisterEntity(Entity entity) override {
         EntitySystem::OnRegisterEntity(entity);
         UpdateEntityText(entity, componentManager->GetComponent<TextLabelComponent>(entity));
     }
-    void OnUnRegisterEntity(Entity entity) override {
-        EntitySystem::OnUnRegisterEntity(entity);
-    }
 
     void OnEntityDestroyed(Entity entity) override {
+        EntitySystem::OnEntityDestroyed(entity);
         textLines.erase(entity);
     }
 

diff --git a/src/core/ecs/system/systems/texture_cube_rendering_entity_system.h b/src/core/ecs/system/systems/texture_cube_rendering_entity_system.h
@@ -18,11 +18,6 @@ class TextureCubeRenderingEntitySystem : public EntitySystem {
         componentManager = GD::GetContainer()->componentManager;
         enabled = true;
     }
-    void Initialize() override {}
-    void Enable() override {}
-    void Disable() override {}
-
-    void OnEntityDestroyed(Entity entity) override {}
 
     void Render() override {
         if (IsEnabled()) {

diff --git a/src/core/ecs/system/systems/timer_entity_system.h b/src/core/ecs/system/systems/timer_entity_system.h
@@ -17,14 +17,12 @@ class TimerEntitySystem : public EntitySystem {
     }
 
     void Initialize() override {
+        EntitySystem::Initialize();
         timerManager->Initialize();
     }
 
-    void Enable() override {}
-
-    void Disable() override {}
-
     void OnEntityDestroyed(Entity entity) override {
+        EntitySystem::OnEntityDestroyed(entity);
         timerManager->RemoveTimer(entity);
     }
 

diff --git a/src/core/scripting/python/python_modules.cpp b/src/core/scripting/python/python_modules.cpp
@@ -1023,7 +1023,6 @@ PyObject* PythonModules::sprite_set_draw_source(PyObject *self, PyObject *args,
         SpriteComponent spriteComponent = entityComponentOrchestrator->GetComponent<SpriteComponent>(entity);
         spriteComponent.drawSource = Rect2(x, y, w, h);
         entityComponentOrchestrator->UpdateComponent<SpriteComponent>(entity, spriteComponent);
-        Logger::GetInstance()->Debug("sprite draw source");
         Py_RETURN_NONE;
     }
     return nullptr;