From 4ec8f98ab0aab46a3e7f7d7d515280642a70d225 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sat, 24 May 2025 22:33:48 +0200 Subject: [PATCH] update entt to v3.15.0 --- external/entt | 2 +- framework/imgui/src/mm/services/scene_tools.cpp | 2 +- framework/organizer_scene/src/mm/services/organizer_scene.cpp | 2 +- .../player_velocity/src/mm/systems/player_velocity2d_system.hpp | 2 ++ .../simple_velocity/src/mm/systems/simple_velocity_system2d.hpp | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/external/entt b/external/entt index 344e03a..d4014c7 160000 --- a/external/entt +++ b/external/entt @@ -1 +1 @@ -Subproject commit 344e03ac64a1f78424ab1150e2d4778e8df8431d +Subproject commit d4014c74dc3793aba95ae354d6e23a026c2796db diff --git a/framework/imgui/src/mm/services/scene_tools.cpp b/framework/imgui/src/mm/services/scene_tools.cpp index b3676ed..006a3a7 100644 --- a/framework/imgui/src/mm/services/scene_tools.cpp +++ b/framework/imgui/src/mm/services/scene_tools.cpp @@ -111,7 +111,7 @@ namespace MM::Services { if (ImGui::Begin("Scene Metrics##ImGuiSceneToolsService", &_show_scene_metrics)) { ImGui::Text("capacity: %zu", scene.storage<::MM::Entity>().capacity()); ImGui::Text("size: %zu", scene.storage<::MM::Entity>().size()); - ImGui::Text("alive: %zu", scene.storage<::MM::Entity>().in_use()); + ImGui::Text("alive: %zu", scene.storage<::MM::Entity>().free_list()); if (ImGui::CollapsingHeader("orphans")) { // iterating all entities is expensive size_t orphans = 0; diff --git a/framework/organizer_scene/src/mm/services/organizer_scene.cpp b/framework/organizer_scene/src/mm/services/organizer_scene.cpp index 3127931..74f7a56 100644 --- a/framework/organizer_scene/src/mm/services/organizer_scene.cpp +++ b/framework/organizer_scene/src/mm/services/organizer_scene.cpp @@ -23,7 +23,7 @@ static std::ostream& operator<<(std::ostream& out, const std::vector " << "n" << i << ";\n"; } } diff --git a/systems/player_velocity/src/mm/systems/player_velocity2d_system.hpp b/systems/player_velocity/src/mm/systems/player_velocity2d_system.hpp index 08dd9b5..a1544ce 100644 --- a/systems/player_velocity/src/mm/systems/player_velocity2d_system.hpp +++ b/systems/player_velocity/src/mm/systems/player_velocity2d_system.hpp @@ -4,6 +4,8 @@ #include #include +#include + namespace MM::Systems { // this system transforms the input from the input_service into velocity intent diff --git a/systems/simple_velocity/src/mm/systems/simple_velocity_system2d.hpp b/systems/simple_velocity/src/mm/systems/simple_velocity_system2d.hpp index 1e1a564..d0c55d1 100644 --- a/systems/simple_velocity/src/mm/systems/simple_velocity_system2d.hpp +++ b/systems/simple_velocity/src/mm/systems/simple_velocity_system2d.hpp @@ -7,6 +7,7 @@ #include #include +#include namespace MM::Systems {