asset save fixes

Cheaterdev · Cheaterdev · commit f18211dbe645 · 2021-10-22T02:27:03.000+03:00
diff --git a/sources/Core/FlowGraph/FlowGraph.cpp b/sources/Core/FlowGraph/FlowGraph.cpp
diff --git a/sources/Core/FlowGraph/FlowGraph.ixx b/sources/Core/FlowGraph/FlowGraph.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module FlowGraph;
 
 
@@ -831,17 +832,17 @@ export
 
 }
 
-/*
-BOOST_CLASS_EXPORT_KEY(FlowGraph::window);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::Node);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::input);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::output);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::graph);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::graph_input);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::graph_output);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::parameter_type);
-BOOST_CLASS_EXPORT_KEY(FlowGraph::strict_parameter);
-*/
+
+BOOST_CLASS_EXPORT(FlowGraph::window);
+BOOST_CLASS_EXPORT(FlowGraph::Node);
+BOOST_CLASS_EXPORT(FlowGraph::input);
+BOOST_CLASS_EXPORT(FlowGraph::output);
+BOOST_CLASS_EXPORT(FlowGraph::graph);
+BOOST_CLASS_EXPORT(FlowGraph::graph_input);
+BOOST_CLASS_EXPORT(FlowGraph::graph_output);
+BOOST_CLASS_EXPORT(FlowGraph::parameter_type);
+BOOST_CLASS_EXPORT(FlowGraph::strict_parameter);
+
 module:private;
 
 namespace FlowGraph
diff --git a/sources/Core/Math/Primitives/AABB.ixx b/sources/Core/Math/Primitives/AABB.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module AABB;
 
 export import Constants;
@@ -42,6 +43,7 @@ private:
 	}
 };
 
+BOOST_CLASS_EXPORT(AABB);
 
 module: private;
 
diff --git a/sources/Core/Math/Primitives/Frustum.ixx b/sources/Core/Math/Primitives/Frustum.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module Frustum;
 
 export import Constants;
diff --git a/sources/Core/Math/Primitives/Intersections.ixx b/sources/Core/Math/Primitives/Intersections.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module Intersections;
 
 export import Constants;
diff --git a/sources/Core/Math/Primitives/Plane.ixx b/sources/Core/Math/Primitives/Plane.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module Plane;
 
 export import Constants;
diff --git a/sources/Core/Math/Primitives/Primitive.ixx b/sources/Core/Math/Primitives/Primitive.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module Primitive;
 
 export import Constants;
diff --git a/sources/Core/Math/Primitives/Ray.ixx b/sources/Core/Math/Primitives/Ray.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module Ray;
 
 export import Constants;
diff --git a/sources/Core/Math/Primitives/Sphere.ixx b/sources/Core/Math/Primitives/Sphere.ixx
@@ -1,5 +1,6 @@
 module;
 #include "Serialization/serialization_defines.h"
+#include "Serialization/serialization_archives.h"
 export module Sphere;
 
 export import Constants;
diff --git a/sources/Core/Utils/utils.ixx b/sources/Core/Utils/utils.ixx
@@ -229,30 +229,6 @@ export
 		}
 	};
 
-
-
-	struct guid_compare {
-		bool operator()(const Guid& l, const Guid& r) const {
-			auto& a = l.bytes();
-			auto& b = r.bytes();
-
-
-			for (unsigned int i = 0; i < b.size(); i++)
-			{
-				if (a[i] != b[i])
-					return a[i] < b[i];
-			}
-
-			return false;
-		}
-	};
-
-
-	using guid_set = std::set<Guid, guid_compare>;
-
-	template<class T>
-	using guid_map = std::map<Guid, T, guid_compare>;
-
 }
 
 module: private;
diff --git a/sources/Modules/crossguid/crossguid.h b/sources/Modules/crossguid/crossguid.h
@@ -1,3 +1,6 @@
+#define isValid() operator<(const Guid &rhs) const { return _bytes < rhs._bytes;} \
+bool isValid()
+
 #include <crossguid/guid.hpp>
 
-using Guid = xg::Guid;
+#undef isValid
diff --git a/sources/Modules/crossguid/crossguid.ixx b/sources/Modules/crossguid/crossguid.ixx
@@ -2,4 +2,5 @@ export module crossguid;
 
 export import "crossguid.h";
 
-export using Guid = xg::Guid;
+
+export using Guid = xg::Guid;
diff --git a/sources/RenderSystem/Assets/Asset.cpp b/sources/RenderSystem/Assets/Asset.cpp
@@ -748,9 +748,9 @@ void AssetStorage::save()
 {
 }
 
- guid_set AssetHolder::get_reference_ids()
+ std::set<Guid> AssetHolder::get_reference_ids()
 {
-	 guid_set r;
+	 std::set<Guid> r;
 	m.lock();
 
 	for (auto a : assets)
diff --git a/sources/RenderSystem/Assets/Asset.h b/sources/RenderSystem/Assets/Asset.h
@@ -303,7 +303,7 @@ class AssetHolder
 	protected:
 		virtual void on_asset_change(std::shared_ptr<Asset> asset);
 	public:
-		guid_set get_reference_ids();
+		std::set<Guid> get_reference_ids();
 
 		SERIALIZE()
 		{
@@ -416,7 +416,7 @@ class AssetStorage : public std::enable_shared_from_this<AssetStorage>, public E
 				Guid id;
 				std::wstring name;
 
-				guid_set references;
+				std::set<Guid> references;
 				std::set<std::wstring> additional_files;
 				Asset_Type type;
 
@@ -492,7 +492,7 @@ class AssetStorage : public std::enable_shared_from_this<AssetStorage>, public E
 		folder_item* get_folder();
 		static AssetStorage::ptr try_load(file::ptr f);
 
-		 guid_set get_references() 
+		 std::set<Guid> get_references() 
 	{
 		return header->references;
 	}
@@ -553,7 +553,7 @@ class AssetManager : public Singleton<AssetManager>, public EditContainer, publi
 
 		AssetManager();
 		~AssetManager();
-		guid_map<AssetStorage::ptr> assets;
+		std::map<Guid, AssetStorage::ptr> assets;
 		std::mutex m;
 		std::vector<std::function<void()>> funcs;
 		folder_item::ptr tree_folders;
@@ -653,7 +653,7 @@ class AssetManager : public Singleton<AssetManager>, public EditContainer, publi
 			return MessageBoxA(0, str.c_str(), "message", MB_YESNO) == IDOK;
 		};
 
-		guid_map<AssetStorage::ptr> get_assets()
+		std::map<Guid, AssetStorage::ptr> get_assets()
 		{
 			return assets;
 		}
@@ -748,8 +748,11 @@ class EngineAsset
 		auto data = Hasher::hash(convert(name));
 
 		std::array<unsigned char, 16> ids;
-		for (int i = 0; i < 16; i++)
+		for (int i = 0; i < data.size(); i++)
 			ids[i] = data[i];
+
+		for (int i = data.size(); i < 16; i++)
+			ids[i] = 0;
 		id = Guid(ids);
 
 	}
