Skip to content

Commit 71e1901

Browse files
committed
Fixing bug with some entity systems not cleaning up after themselves.
1 parent 1f341b8 commit 71e1901

13 files changed

+7
-54
lines changed

_version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "0.47.0"
2+
"version": "0.47.1"
33
}

src/core/ecs/system/entity_system.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class EntitySystem {
1414
return enabled;
1515
}
1616

17-
virtual void Initialize() = 0;
17+
virtual void Initialize() {}
1818

1919
virtual void Enable() {
2020
enabled = true;

src/core/ecs/system/systems/animated_sprite_rendering_entity_system.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ class AnimatedSpriteRenderingEntitySystem : public EntitySystem {
2222
sceneManager = GD::GetContainer()->sceneManager;
2323
enabled = true;
2424
}
25-
void Initialize() override {}
26-
void Enable() override {}
27-
void Disable() override {}
28-
29-
void OnEntityDestroyed(Entity entity) override {}
3025

3126
void Render() override {
3227
if (IsEnabled()) {

src/core/ecs/system/systems/collision_entity_system.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,10 @@ class CollisionEntitySystem : public EntitySystem {
7474
}
7575

7676
void Initialize() override {
77+
EntitySystem::Initialize();
7778
colliderTexture = GD::GetContainer()->assetManager->GetTexture(BLANK_WHITE_TEXTURE_ASSET_ID);
7879
}
7980

80-
void Enable() override {}
81-
82-
void Disable() override {}
83-
84-
void OnEntityDestroyed(Entity entity) override {}
85-
8681
void ProcessEntityCollisions(Entity sourceEntity, Vector2 offset = Vector2(0.0f, 0.0f)) {
8782
collisionContext->ClearCollisionData();
8883
std::vector<Entity> collidedEntities;

src/core/ecs/system/systems/directional_light_rendering_entity_system.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ class DirectionalLightRenderingEntitySystem : public EntitySystem {
1818
componentManager = GD::GetContainer()->componentManager;
1919
enabled = true;
2020
}
21-
void Initialize() override {}
22-
void Enable() override {}
23-
void Disable() override {}
24-
25-
void OnEntityDestroyed(Entity entity) override {}
2621

2722
void Render() override {
2823
if (IsEnabled()) {

src/core/ecs/system/systems/point_light_rendering_entity_system.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class PointLightRenderingEntitySystem : public EntitySystem {
1919
componentManager = GD::GetContainer()->componentManager;
2020
enabled = true;
2121
}
22-
void Initialize() override {}
23-
void Enable() override {}
24-
void Disable() override {}
25-
26-
void OnEntityDestroyed(Entity entity) override {}
2722

2823
void Render() override {
2924
if (IsEnabled()) {

src/core/ecs/system/systems/script_entity_system.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@ class ScriptEntitySystem : public EntitySystem {
1717
}
1818

1919
void Initialize() override {
20+
EntitySystem::Initialize();
2021
for (auto const &pair : scriptContexts) {
2122
auto const &scriptContext = pair.second;
2223
scriptContext->Initialize();
2324
}
2425
}
2526

26-
void Enable() override {}
27-
28-
void Disable() override {}
29-
3027
void OnEntityDestroyed(Entity entity) override {
3128
EntitySystem::OnEntityDestroyed(entity);
3229
assert(activeScriptContext != nullptr && "No active script context!");

src/core/ecs/system/systems/spot_light_rendering_entity_system.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class SpotLightRenderingEntitySystem : public EntitySystem {
1919
componentManager = GD::GetContainer()->componentManager;
2020
enabled = true;
2121
}
22-
void Initialize() override {}
23-
void Enable() override {}
24-
void Disable() override {}
25-
26-
void OnEntityDestroyed(Entity entity) override {}
2722

2823
void Render() override {
2924
if (IsEnabled()) {

src/core/ecs/system/systems/sprite_rendering_entity_system.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ class SpriteRenderingEntitySystem : public EntitySystem {
2222
enabled = true;
2323
}
2424

25-
void Initialize() override {}
26-
void Enable() override {}
27-
void Disable() override {}
28-
void OnEntityDestroyed(Entity entity) override {}
29-
3025
void Render() override {
3126
if (IsEnabled()) {
3227
for (Entity entity : entities) {

src/core/ecs/system/systems/text_rendering_entity_system.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,13 @@ class TextRenderingEntitySystem : public EntitySystem {
2424
enabled = true;
2525
}
2626

27-
void Initialize() override {}
28-
void Enable() override {}
29-
void Disable() override {}
30-
3127
void OnRegisterEntity(Entity entity) override {
3228
EntitySystem::OnRegisterEntity(entity);
3329
UpdateEntityText(entity, componentManager->GetComponent<TextLabelComponent>(entity));
3430
}
35-
void OnUnRegisterEntity(Entity entity) override {
36-
EntitySystem::OnUnRegisterEntity(entity);
37-
}
3831

3932
void OnEntityDestroyed(Entity entity) override {
33+
EntitySystem::OnEntityDestroyed(entity);
4034
textLines.erase(entity);
4135
}
4236

0 commit comments

Comments
 (0)