MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-19 19:26:36 +02:00
Code Issues Projects Releases Wiki Activity

update entt to v3.7.1

Browse Source
This commit is contained in:
Green Sky
2021-04-14 15:48:56 +02:00
parent 4e2dd51ad1
commit 7e1137732b
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/imgui/src/mm/imgui/widgets/camera.cpp
View File

@ -37,7 +37,7 @@ void Camera3D(MM::Scene& scene) {
MM::ImGuiWidgets::Entity(tracking, scene);
if (scene.valid(tracking)) {
if (scene.has<MM::Components::Transform2D>(tracking)) {
if (scene.all_of<MM::Components::Transform2D>(tracking)) {
camera->translation = {scene.get<MM::Components::Transform2D>(tracking).position, 0.f};
} else {
ImGui::TextUnformatted("error: Entity has no Transform");

2
framework/imgui/src/mm/imgui/widgets/entity.cpp
View File

@ -14,7 +14,7 @@ void Entity(MM::Entity& e, MM::Scene& ecs, bool dropTarget) {
ImGui::PushID(static_cast<int>(entt::to_integral(e)));
if (ecs.valid(e)) {
if (ecs.has<MM::Components::Name>(e)) {
if (ecs.all_of<MM::Components::Name>(e)) {
ImGui::Text(ICON_II_CUBE "E: %d v%d (%s)", entt::to_integral(ecs.entity(e)), ecs.version(e), ecs.get<MM::Components::Name>(e).str.c_str());
} else {
ImGui::Text(ICON_II_CUBE "E: %d v%d", entt::to_integral(ecs.entity(e)), ecs.version(e));