From 7e1137732b7a8b9321384fa7590016cdcfe91264 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 14 Apr 2021 15:48:56 +0200 Subject: [PATCH] update entt to v3.7.1 --- external/entt | 2 +- framework/imgui/src/mm/imgui/widgets/camera.cpp | 2 +- framework/imgui/src/mm/imgui/widgets/entity.cpp | 2 +- .../src/mm/opengl/render_tasks/batched_spritesheet.cpp | 2 +- .../opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp | 2 +- .../src/mm/opengl/render_tasks/simple_sprite.cpp | 2 +- .../src/mm/opengl/render_tasks/simple_spritesheet.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/external/entt b/external/entt index 7a949dd..5d15a3d 160000 --- a/external/entt +++ b/external/entt @@ -1 +1 @@ -Subproject commit 7a949dd32849e8230b15a5ff8ad1104c7f748c2a +Subproject commit 5d15a3d69f433a0e3fce266caaeb87c77c10453c diff --git a/framework/imgui/src/mm/imgui/widgets/camera.cpp b/framework/imgui/src/mm/imgui/widgets/camera.cpp index 149bb19..b242950 100644 --- a/framework/imgui/src/mm/imgui/widgets/camera.cpp +++ b/framework/imgui/src/mm/imgui/widgets/camera.cpp @@ -37,7 +37,7 @@ void Camera3D(MM::Scene& scene) { MM::ImGuiWidgets::Entity(tracking, scene); if (scene.valid(tracking)) { - if (scene.has(tracking)) { + if (scene.all_of(tracking)) { camera->translation = {scene.get(tracking).position, 0.f}; } else { ImGui::TextUnformatted("error: Entity has no Transform"); diff --git a/framework/imgui/src/mm/imgui/widgets/entity.cpp b/framework/imgui/src/mm/imgui/widgets/entity.cpp index ed7a1f4..dcbbdf1 100644 --- a/framework/imgui/src/mm/imgui/widgets/entity.cpp +++ b/framework/imgui/src/mm/imgui/widgets/entity.cpp @@ -14,7 +14,7 @@ void Entity(MM::Entity& e, MM::Scene& ecs, bool dropTarget) { ImGui::PushID(static_cast(entt::to_integral(e))); if (ecs.valid(e)) { - if (ecs.has(e)) { + if (ecs.all_of(e)) { ImGui::Text(ICON_II_CUBE "E: %d v%d (%s)", entt::to_integral(ecs.entity(e)), ecs.version(e), ecs.get(e).str.c_str()); } else { ImGui::Text(ICON_II_CUBE "E: %d v%d", entt::to_integral(ecs.entity(e)), ecs.version(e)); diff --git a/framework/opengl_renderer/src/mm/opengl/render_tasks/batched_spritesheet.cpp b/framework/opengl_renderer/src/mm/opengl/render_tasks/batched_spritesheet.cpp index f5d18f7..3c2bc6e 100644 --- a/framework/opengl_renderer/src/mm/opengl/render_tasks/batched_spritesheet.cpp +++ b/framework/opengl_renderer/src/mm/opengl/render_tasks/batched_spritesheet.cpp @@ -104,7 +104,7 @@ void BatchedSpriteSheet::render(Services::OpenGLRenderer& rs, Engine& engine) { } auto* tmp_col_ptr = &default_color; - if (scene.has(e)) { + if (scene.all_of(e)) { tmp_col_ptr = &scene.get(e).color; } diff --git a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp index ad97938..59e2d66 100644 --- a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp +++ b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp @@ -83,7 +83,7 @@ void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) { _shader->setUniformMat4f("_WVP", vp * t.getTransform4(t.position.y/10.f + 500.f)); - if (scene.has(e)) { + if (scene.all_of(e)) { _shader->setUniform4f("_color", scene.get(e).color); } else { _shader->setUniform4f("_color", default_color); diff --git a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_sprite.cpp b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_sprite.cpp index 68b164e..45c28d6 100644 --- a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_sprite.cpp +++ b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_sprite.cpp @@ -90,7 +90,7 @@ void SimpleSprite::render(Services::OpenGLRenderer& rs, Engine& engine) { _shader->setUniformMat4f("_WVP", vp * t.getTransform4(t.position.y/10.f + 500.f)); - if (scene.has(e)) { + if (scene.all_of(e)) { _shader->setUniform4f("_color", scene.get(e).color); } else { _shader->setUniform4f("_color", default_color); diff --git a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_spritesheet.cpp b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_spritesheet.cpp index e5b65ad..77541ce 100644 --- a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_spritesheet.cpp +++ b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_spritesheet.cpp @@ -101,7 +101,7 @@ void SimpleSpriteSheet::render(Services::OpenGLRenderer& rs, Engine& engine) { _shader->setUniform2ui("_tileCount", spr.sp.tile_count.x, spr.sp.tile_count.y); _shader->setUniform1ui("_atlasIndex", spr.tile_index); - if (scene.has(e)) { + if (scene.all_of(e)) { _shader->setUniform4f("_color", scene.get(e).color); } else { _shader->setUniform4f("_color", default_color);