Add a new jsonbridge which uses the new serializers

.gitmodules

@@ -27,4 +27,4 @@
 	url = https://github.com/Dav1dde/glad.git
 [submodule "engine/lib/implot"]
 	path = engine/lib/implot
-	url = git@github.com:epezent/implot.git
+	url = https://github.com/epezent/implot.git

engine/include/cubos/engine/assets/bridges/json.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <cubos/core/data/old/json_deserializer.hpp>
-#include <cubos/core/data/old/json_serializer.hpp>
+#include <cubos/core/data/des/json.hpp>
+#include <cubos/core/data/ser/json.hpp>
 #include <cubos/core/log.hpp>
 #include <cubos/core/reflection/reflect.hpp>
 
@@ -26,28 +26,37 @@ namespace cubos::engine
     {
     public:
         /// @brief Constructs a bridge.
-        ///
-        /// If the @p indentation level is set to -1, all whitespace is removed.
-        ///
-        /// @param indentation Indentation level to use when saving the JSON file.
-        JSONBridge(int indentation = 4)
+        JSONBridge()
             : FileBridge(core::reflection::reflect<T>())
-            , mIndentation{indentation}
         {
         }
 
     protected:
         bool loadFromFile(Assets& assets, const AnyAsset& handle, core::memory::Stream& stream) override
         {
             // Dump the file stream into a string and initialize a JSON deserializer with it.
-            std::string json{};
-            stream.readUntil(json, nullptr);
-            core::data::old::JSONDeserializer deserializer{json};
+            std::string jsonStr;
+            stream.readUntil(jsonStr, nullptr);
+
+            // Parse JSON from the string.
+            nlohmann::json json{};
+            try
+            {
+                json = nlohmann::json::parse(jsonStr);
+            }
+            catch (nlohmann::json::parse_error& e)
+            {
+                CUBOS_ERROR("{}", e.what());
+                return false;
+            }
+
+            // Feed the parsed JSON to a JSON deserializer.
+            core::data::JSONDeserializer deserializer{};
+            deserializer.feed(json);
 
             // Deserialize the asset and store it in the asset manager.
             T data{};
-            deserializer.read(data);
-            if (deserializer.failed())
+            if (deserializer.read(data))
             {
                 CUBOS_ERROR("Could not deserialize asset from JSON file");
                 return false;
@@ -60,21 +69,19 @@ namespace cubos::engine
         bool saveToFile(const Assets& assets, const AnyAsset& handle, core::memory::Stream& stream) override
         {
             // Initialize a JSON serializer with the file stream.
-            core::data::old::JSONSerializer serializer{stream, mIndentation};
+            core::data::JSONSerializer serializer{};
 
             // Read the asset from the asset manager and serialize it to the file stream.
             auto data = assets.read<T>(handle);
-            serializer.write(*data, nullptr); // JSON serializer does not use names.
-            if (serializer.failed())
+            if (serializer.write(*data))
             {
                 CUBOS_ERROR("Could not serialize asset to JSON file");
                 return false;
             }
 
+            auto jsonStr = serializer.output().dump();
+            stream.print(jsonStr);
             return true;
         }
-
-    private:
-        int mIndentation;
     };
 } // namespace cubos::engine

engine/include/cubos/engine/assets/bridges/old/json.hpp

@@ -0,0 +1,80 @@
+/// @file
+/// @brief Class @ref cubos::engine::JSONBridge.
+/// @ingroup assets-plugin
+
+#pragma once
+
+#include <cubos/core/data/old/json_deserializer.hpp>
+#include <cubos/core/data/old/json_serializer.hpp>
+#include <cubos/core/log.hpp>
+#include <cubos/core/reflection/reflect.hpp>
+
+#include <cubos/engine/assets/bridges/file.hpp>
+
+namespace cubos::engine::old
+{
+    /// @brief Bridge for loading and saving assets which are serialized to and from a JSON file.
+    ///
+    /// This bridge automatically serializes and deserializes assets of type @p T to and from a
+    /// JSON file. Thus, @p T must be serializable and deserializable. No additional context is
+    /// given to the serializer or deserializer.
+    ///
+    /// @tparam T Type of asset to load and save. Must be default constructible.
+    /// @ingroup assets-plugin
+    template <typename T>
+    class JSONBridge : public FileBridge
+    {
+    public:
+        /// @brief Constructs a bridge.
+        ///
+        /// If the @p indentation level is set to -1, all whitespace is removed.
+        ///
+        /// @param indentation Indentation level to use when saving the JSON file.
+        JSONBridge(int indentation = 4)
+            : FileBridge(core::reflection::reflect<T>())
+            , mIndentation{indentation}
+        {
+        }
+
+    protected:
+        bool loadFromFile(Assets& assets, const AnyAsset& handle, core::memory::Stream& stream) override
+        {
+            // Dump the file stream into a string and initialize a JSON deserializer with it.
+            std::string json{};
+            stream.readUntil(json, nullptr);
+            core::data::old::JSONDeserializer deserializer{json};
+
+            // Deserialize the asset and store it in the asset manager.
+            T data{};
+            deserializer.read(data);
+            if (deserializer.failed())
+            {
+                CUBOS_ERROR("Could not deserialize asset from JSON file");
+                return false;
+            }
+
+            assets.store(handle, std::move(data));
+            return true;
+        }
+
+        bool saveToFile(const Assets& assets, const AnyAsset& handle, core::memory::Stream& stream) override
+        {
+            // Initialize a JSON serializer with the file stream.
+            core::data::old::JSONSerializer serializer{stream, mIndentation};
+
+            // Read the asset from the asset manager and serialize it to the file stream.
+            auto data = assets.read<T>(handle);
+            serializer.write(*data, nullptr); // JSON serializer does not use names.
+            if (serializer.failed())
+            {
+                CUBOS_ERROR("Could not serialize asset to JSON file");
+                return false;
+            }
+
+            return true;
+        }
+
+    private:
+        int mIndentation;
+    };
+} // namespace cubos::engine::old

engine/samples/assets/json/main.cpp

@@ -7,7 +7,7 @@
 #include <cubos/core/reflection/traits/fields.hpp>
 #include <cubos/core/reflection/type.hpp>
 
-#include <cubos/engine/assets/bridges/json.hpp>
+#include <cubos/engine/assets/bridges/old/json.hpp>
 #include <cubos/engine/assets/plugin.hpp>
 #include <cubos/engine/settings/settings.hpp>
 
@@ -60,7 +60,7 @@ static void configSystem(Settings& settings)
 /// [Register bridge]
 static void bridgeSystem(Assets& assets)
 {
-    assets.registerBridge(".strings", std::make_unique<JSONBridge<Strings>>());
+    assets.registerBridge(".strings", std::make_unique<old::JSONBridge<Strings>>());
 }
 /// [Register bridge]
 
@@ -89,4 +89,4 @@ int main()
 
     cubos.startupSystem(configSystem).tagged("cubos.settings");
     cubos.run();
-}
+}

engine/samples/assets/saving/main.cpp

@@ -4,7 +4,7 @@
 #include <cubos/core/reflection/traits/fields.hpp>
 #include <cubos/core/reflection/type.hpp>
 
-#include <cubos/engine/assets/bridges/json.hpp>
+#include <cubos/engine/assets/bridges/old/json.hpp>
 #include <cubos/engine/assets/plugin.hpp>
 #include <cubos/engine/settings/settings.hpp>
 
@@ -58,7 +58,7 @@ static void configSystem(Settings& settings)
 
 static void bridgeSystem(Assets& assets)
 {
-    assets.registerBridge(".int", std::make_unique<JSONBridge<IntegerAsset>>());
+    assets.registerBridge(".int", std::make_unique<old::JSONBridge<IntegerAsset>>());
 }
 
 /// [Create a new asset]