Fixed removal during iteration in resource managers

src/framework/components/collider_component.cpp

@@ -67,19 +67,20 @@ void resolve_collision(Vector2 direction, ColliderComponent *coll1, ColliderComp
     }
 }
 // Collider rectangle init
-ColliderComponent::ColliderComponent(Entity *entity, float width, float height):
+ColliderComponent::ColliderComponent(Entity *entity, Vector2 pos, float width, float height):
     Component(CompType::COLLIDER, entity),
     shape {nullptr},
     is_rectangle {true},
     is_circle {false},
     collision_direction {0, 0},
-    position {0, 0}
+    position {pos}
 {
     shape = new Rectangle{0, 0, width, height};
+    update_shape_position();
 }
 
 // Collider circle init (crashes due to unimplemented circles)
-ColliderComponent::ColliderComponent(Entity *entity, float radius):
+ColliderComponent::ColliderComponent(Entity *entity, Vector2 pos, float radius):
     Component(CompType::COLLIDER, entity),
     shape {nullptr},
     is_rectangle {false},

src/framework/components/collider_component.hpp

@@ -29,9 +29,9 @@ class ColliderComponent: public Component {
     void *shape;
     Vector2 position;
 
-    ColliderComponent(Vector2 pos);
-    ColliderComponent(Entity *entity, float width, float height);
-    ColliderComponent(Entity *entity, float radius);
+    ColliderComponent(Vector2 pos={0, 0});
+    ColliderComponent(Entity *entity, Vector2 pos, float width, float height);
+    ColliderComponent(Entity *entity, Vector2 pos, float radius);
 
     /// @brief Sets the layers
     /// @param new_layers Set of layers

src/framework/entities/tilemap_entity.cpp

@@ -68,8 +68,7 @@ void Tilemap::set_tile(int x, int y, int type) {
     changed_chunks.insert({chunk_pos.first + 1, chunk_pos.second - 1});
 
     // Build tile collider
-    ColliderComponent collider = ColliderComponent(this, tilesize.x, tilesize.y);
-    collider.position = {x * tilesize.x, y * tilesize.y};
+    ColliderComponent collider = ColliderComponent(this, {x * tilesize.x, y * tilesize.y}, tilesize.x, tilesize.y);
     collider.set_layer((int)ColliderIndex::TILEMAP, true);
     collider.process(0);
 
@@ -197,8 +196,7 @@ void Tilemap::build_chunk(std::pair<int, int> chunk_pos) {
         bitmap += get_tile(pos.first + .5f, pos.second + .5f) == -1 ? "." : "#";
 
         // Tile's collider, position and texture position data
-        ColliderComponent collider = ColliderComponent(this, tilesize.x, tilesize.y);
-        collider.position = {pos.first, pos.second};
+        ColliderComponent collider = ColliderComponent(this, {pos.first, pos.second}, tilesize.x, tilesize.y);
 
         TileData data {{pos.first, pos.second}, {0, 0}};
 
@@ -263,7 +261,11 @@ void Tilemap::build_chunk(std::pair<int, int> chunk_pos) {
     }
 }
 
-void Tilemap::process(float delta) {}
+void Tilemap::process(float delta) {
+    if (IsKeyPressed(KEY_ENTER)) {
+        save("test.json");
+    }
+}
 
 // Draws the tilemap (spatial partitioning and camera culling at play)
 void Tilemap::draw(float delta) {

src/framework/objects/audio.cpp

@@ -103,19 +103,22 @@ void AudioManager::unload_sfx(std::string name) {
 
 // Unloads all sounds and tracks that aren't being referanced 
 void AudioManager::unload_unused() {
-    for (auto &sound_pair: sound_map) {
+    std::vector<std::string> to_unload {};
 
+    for (auto &sound_pair: sound_map) {
         if (sound_pair.second.use_count() == 1) {
-            unload_sfx(sound_pair.first);
+            to_unload.push_back(sound_pair.first);
         }
     }
+    for (auto to: to_unload) unload_sfx(to);
+    to_unload.clear();
 
     for (auto &music_pair: music_map) {
-
         if (music_pair.second.use_count() == 1 && !IsMusicStreamPlaying(*music_pair.second.get())) {
-            unload_track(music_pair.first);
+            to_unload.push_back(music_pair.first);
         }
     }
+    for (auto to: to_unload) unload_track(to);
 }
 // Ticks down a timer which calls "unload_unused()" when it hits 0 every "tick" seconds
 void AudioManager::unload_check() {

src/framework/objects/drawables.cpp

@@ -30,12 +30,14 @@ void TextureManager::unload(std::string name) {
 
 // Unloads all textures that aren't being referanced 
 void TextureManager::unload_unused() {
-    for (auto& texture_pair: texture_map) {
+    std::vector<std::string> to_unload {};
 
+    for (auto& texture_pair: texture_map) {
         if (texture_pair.second.use_count() == 1) {
-            unload(texture_pair.first);
+            to_unload.push_back(texture_pair.first);
         }
     }
+    for (auto to: to_unload) unload(to);
 }
 // Ticks down a timer which calls "unload_unused()" when it hits 0 every "tick" seconds
 void TextureManager::unload_check() {
@@ -96,12 +98,14 @@ void ShaderManager::unload(std::string name) {
 
 // Unloads all shaders which aren't being referanced
 void ShaderManager::unload_unused() {
-    for (auto& texture_pair: shader_map) {
+    std::vector<std::string> to_unload {};
 
+    for (auto& texture_pair: shader_map) {
         if (texture_pair.second.use_count() == 1) {
-            unload(texture_pair.first);
+            to_unload.push_back(texture_pair.first);
         }
     }
+    for (auto to: to_unload) unload(to);
 }
 
 // Ticks down timer which will call "unload_unused()" after "tick" seconds

src/framework/objects/particles.cpp

@@ -42,8 +42,8 @@ void ParticleDataManager::unload(std::string name) {
 // Unloads all particle data that isn't being referanced 
 void ParticleDataManager::unload_unused() {
     std::vector<std::string> to_unload {};
+
     for (auto& texture_pair: particle_data_map) {
-
         if (texture_pair.second.use_count() == 1) {
             to_unload.push_back(texture_pair.first);
         }