feat(engine): import from ~/old in bridge samples

GameDevTecnico · Dec 17, 2023 · 5e0473a · 5e0473a
1 parent 8d547ad
commit 5e0473a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/engine/include/cubos/engine/assets/bridges/json.hpp b/engine/include/cubos/engine/assets/bridges/json.hpp
@@ -46,11 +46,6 @@ namespace cubos::engine
             // 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;
@@ -63,16 +58,11 @@ namespace cubos::engine
 
             // 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;
-            }
+            serializer.write(*data);
 
             // new JSONSerializer() does not receive a stream to write to, need to write to it manually
             auto jsonStr = serializer.output().dump();
-            stream.write(jsonStr.begin(), jsonStr.size());
+            stream.print(jsonStr);
             return true;
         }
     };

diff --git a/engine/samples/assets/json/main.cpp b/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(Write<Settings> settings)
 /// [Register bridge]
 static void bridgeSystem(Write<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();
-}
+}
diff --git a/engine/samples/assets/saving/main.cpp b/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(Write<Settings> settings)
 
 static void bridgeSystem(Write<Assets> assets)
 {
-    assets->registerBridge(".int", std::make_unique<JSONBridge<IntegerAsset>>());
+    assets->registerBridge(".int", std::make_unique<old::JSONBridge<IntegerAsset>>());
 }
 
 /// [Create a new asset]