From 31e24b9c04aa4874c85c539d04146b093fb02288 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 21 May 2025 11:53:59 +0200 Subject: [PATCH] fix due to spdlog(fmt) and json updates implement workaround until https://github.com/nlohmann/json/issues/4261 gets fixed --- .../organizer_scene/src/mm/services/organizer_scene.cpp | 7 ++++--- framework/tilemap/src/mm/tilemap.cpp | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/framework/organizer_scene/src/mm/services/organizer_scene.cpp b/framework/organizer_scene/src/mm/services/organizer_scene.cpp index f72a5ba..3127931 100644 --- a/framework/organizer_scene/src/mm/services/organizer_scene.cpp +++ b/framework/organizer_scene/src/mm/services/organizer_scene.cpp @@ -1,5 +1,4 @@ #include "./organizer_scene.hpp" -#include "mm/engine.hpp" #include @@ -35,6 +34,8 @@ static std::ostream& operator<<(std::ostream& out, const std::vector struct fmt::formatter> : fmt::ostream_formatter {}; + namespace MM::Services { bool OrganizerSceneService::enable(Engine& engine, std::vector& task_array) { @@ -119,7 +120,7 @@ void OrganizerSceneService::changeSceneNow(std::unique_ptr&& new_scene) { } void OrganizerSceneService::updateOrganizerVertices(Scene& scene) { - scene.ctx().emplace>() = + const auto& graph = scene.ctx().emplace>() = scene.ctx().emplace().graph(); if (!scene.ctx().contains()) { @@ -127,7 +128,7 @@ void OrganizerSceneService::updateOrganizerVertices(Scene& scene) { } // TODO: use entt::dot instead - SPDLOG_DEBUG("graph:\n{}", scene.ctx().get>()); + SPDLOG_DEBUG("graph:\n{}", graph); } void OrganizerSceneService::resetTime(void) { diff --git a/framework/tilemap/src/mm/tilemap.cpp b/framework/tilemap/src/mm/tilemap.cpp index b968c4f..6447edf 100644 --- a/framework/tilemap/src/mm/tilemap.cpp +++ b/framework/tilemap/src/mm/tilemap.cpp @@ -25,6 +25,11 @@ #define LOG_DEBUG(...) __LOG_DEBUG("Tilemap", __VA_ARGS__) #define LOG_TRACE(...) __LOG_TRACE("Tilemap", __VA_ARGS__) +// HACK: https://github.com/nlohmann/json/issues/4261 +namespace nlohmann { +auto format_as(const json& j) { return j.dump(); } +} // nlohmann + namespace MM { Tilemap::Tilemap(void) {