Cleanup serialization

VTX-Molecular-Visualization · Sep 20, 2024 · c034a5f · c034a5f
1 parent 54b3330
commit c034a5f
Show file tree

Hide file tree

Showing 33 changed files with 467 additions and 516 deletions.
diff --git a/lib/app/include/app/application/ecs/component_meta_function.hpp b/lib/app/include/app/application/ecs/component_meta_function.hpp
@@ -5,7 +5,7 @@
 #include "app/application/ecs/registry_manager.hpp"
 #include "app/core/ecs/base_entity.hpp"
 #include "app/core/ecs/concepts.hpp"
-#include "app/core/serialization/serialization.hpp"
+#include "app/serialization/serialization_system.hpp"
 #include <functional>
 #include <map>
 #include <string>
@@ -25,7 +25,7 @@ namespace VTX::App::Application::ECS
 		{
 			_mapSerializer[ p_id ] = []( const Core::ECS::BaseEntity &				p_entity,
 										 const Application::ECS::RegistryManager &	p_registry,
-										 const Core::Serialization::Serialization & p_serializer )
+										 const Serialization::SerializationSystem & p_serializer )
 			{
 				const T & component = p_registry.getComponent<T>( p_entity );
 
@@ -40,7 +40,7 @@ namespace VTX::App::Application::ECS
 			};
 
 			_mapDeserializer[ p_id ] = []( Application::ECS::RegistryManager &		  p_registry,
-										   const Core::Serialization::Serialization & p_serializer,
+										   const Serialization::SerializationSystem & p_serializer,
 										   const Util::JSon::Object &				  p_json,
 										   const Core::ECS::BaseEntity &			  p_target )
 			{
@@ -66,10 +66,10 @@ namespace VTX::App::Application::ECS
 	  private:
 		using ComponentSerializerFunction = std::function<
 			const Util::JSon::
-				Object( const Core::ECS::BaseEntity &, const Application::ECS::RegistryManager &, const Core::Serialization::Serialization & )>;
+				Object( const Core::ECS::BaseEntity &, const Application::ECS::RegistryManager &, const Serialization::SerializationSystem & )>;
 
 		using ComponentDeserializerFunction = std::function<
-			void( Application::ECS::RegistryManager &, const Core::Serialization::Serialization &, const Util::JSon::Object &, const Core::ECS::BaseEntity & )>;
+			void( Application::ECS::RegistryManager &, const Serialization::SerializationSystem &, const Util::JSon::Object &, const Core::ECS::BaseEntity & )>;
 
 		std::map<ComponentStaticID, ComponentSerializerFunction> _mapSerializer
 			= std::map<ComponentStaticID, ComponentSerializerFunction>();

diff --git a/lib/app/include/app/application/settings/base_setting.hpp b/lib/app/include/app/application/settings/base_setting.hpp
@@ -1,7 +1,7 @@
 #ifndef __VTX_APP_APPLICATION_SETTINGS_BASE_SETTING__
 #define __VTX_APP_APPLICATION_SETTINGS_BASE_SETTING__
 
-#include "app/application/system/serializer.hpp"
+#include "app/serialization/serialization_system.hpp"
 #include <concepts>
 #include <memory>
 #include <optional>
@@ -37,10 +37,10 @@ namespace VTX::App::Application::Settings
 
 		void set( const T & p_value ) { _value = p_value; }
 
-		Util::JSon::BasicJSon serialize() const override { return SERIALIZER().serialize( _value ); }
+		Util::JSon::BasicJSon serialize() const override { return SERIALIZATION_SYSTEM().serialize( _value ); }
 		void				  deserialize( const Util::JSon::BasicJSon & p_json ) override
 		{
-			SERIALIZER().deserialize( p_json, _value );
+			SERIALIZATION_SYSTEM().deserialize( p_json, _value );
 		}
 
 		void reset() override

diff --git a/lib/app/include/app/application/system/serializer.hpp b/lib/app/include/app/application/system/serializer.hpp
diff --git a/lib/app/include/app/core/io/reader/serialized_object.hpp b/lib/app/include/app/core/io/reader/serialized_object.hpp
diff --git a/lib/app/include/app/core/io/writer/serialized_object.hpp b/lib/app/include/app/core/io/writer/serialized_object.hpp
diff --git a/lib/app/include/app/core/serialization/_fwd.hpp b/lib/app/include/app/core/serialization/_fwd.hpp
diff --git a/lib/app/include/app/core/serialization/serialization.hpp b/lib/app/include/app/core/serialization/serialization.hpp