macros in modules

Cheaterdev · Cheaterdev · commit b6dfa8b18aae · 2021-10-21T23:13:42.000+03:00
diff --git a/sources/Core/Data/Data.ixx b/sources/Core/Data/Data.ixx
@@ -1,6 +1,4 @@
 module;
-
-#include "utils/utils_macros.h"
 #include "Serialization/serialization_defines.h"
 
 export module Data;
diff --git a/sources/Core/FileSystem/FileDepender.ixx b/sources/Core/FileSystem/FileDepender.ixx
@@ -1,6 +1,6 @@
 module;
 
-#include "utils/utils_macros.h"
+
 export module FileDepender;
 
 import Utils;
diff --git a/sources/Core/FileSystem/FileSystem.ixx b/sources/Core/FileSystem/FileSystem.ixx
@@ -1,6 +1,6 @@
 module;
 
-#include "utils/utils_macros.h"
+
 export module FileSystem;
 
 import Utils;
diff --git a/sources/Core/FileSystem/ResourceManager.h b/sources/Core/FileSystem/ResourceManager.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "utils/utils_macros.h"
+
 
 #include "Serialization/Serializer.h"
 import Utils;
diff --git a/sources/Core/FlowGraph/FlowGraph.cpp b/sources/Core/FlowGraph/FlowGraph.cpp
@@ -0,0 +1,22 @@
+import FlowGraph;
+import serialization;
+
+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_IMPLEMENT(FlowGraph::window);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::Node);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::input);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::output);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::graph);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::graph_input);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::graph_output);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::parameter_type);
+BOOST_CLASS_EXPORT_IMPLEMENT(FlowGraph::strict_parameter);
diff --git a/sources/Core/FlowGraph/FlowGraph.ixx b/sources/Core/FlowGraph/FlowGraph.ixx
@@ -831,6 +831,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);
+*/
 module:private;
 
 namespace FlowGraph
@@ -1776,20 +1787,3 @@ namespace FlowGraph
 }
 
 
-
-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);
-
diff --git a/sources/Core/Math/Math.cpp b/sources/Core/Math/Math.cpp
@@ -0,0 +1,17 @@
+#include "Math.h"
+import serialization;
+
+BOOST_CLASS_EXPORT_KEY(AABB)
+BOOST_CLASS_EXPORT_KEY(Frustum)
+BOOST_CLASS_EXPORT_KEY(Plane)
+BOOST_CLASS_EXPORT_KEY(Primitive)
+BOOST_CLASS_EXPORT_KEY(Ray)
+BOOST_CLASS_EXPORT_KEY(Sphere)
+
+
+BOOST_CLASS_EXPORT_IMPLEMENT(AABB)
+BOOST_CLASS_EXPORT_IMPLEMENT(Frustum)
+BOOST_CLASS_EXPORT_IMPLEMENT(Plane)
+BOOST_CLASS_EXPORT_IMPLEMENT(Primitive)
+BOOST_CLASS_EXPORT_IMPLEMENT(Ray)
+BOOST_CLASS_EXPORT_IMPLEMENT(Sphere)
diff --git a/sources/Core/Math/Primitives/AABB.ixx b/sources/Core/Math/Primitives/AABB.ixx
@@ -46,7 +46,7 @@ private:
 module: private;
 
 
-//BOOST_CLASS_EXPORT(AABB)
+
 
 
 AABB::AABB(Primitive* other) :min(other->get_min()), max(other->get_max())
diff --git a/sources/Core/Math/Primitives/Frustum.ixx b/sources/Core/Math/Primitives/Frustum.ixx
@@ -146,5 +146,5 @@ std::shared_ptr<Primitive> Frustum::clone()
 	return std::shared_ptr<Primitive>(new Frustum(*this));
 };
 
-//BOOST_CLASS_EXPORT(Frustum)
+
 
diff --git a/sources/Core/Math/Primitives/Plane.ixx b/sources/Core/Math/Primitives/Plane.ixx
@@ -85,4 +85,3 @@ Plane::operator Vector<vec4_t<float>>() const
     return vec4(n, d);
 }
 
-//BOOST_CLASS_EXPORT(Plane)
diff --git a/sources/Core/Math/Primitives/Primitive.ixx b/sources/Core/Math/Primitives/Primitive.ixx
@@ -64,6 +64,3 @@ void Primitive::apply_transform(ptr, mat4x4&)
 void Primitive::set(Primitive*, mat4x4&)
 {}
 
-
-//BOOST_CLASS_EXPORT(Primitive)
-
diff --git a/sources/Core/Math/Primitives/Ray.ixx b/sources/Core/Math/Primitives/Ray.ixx
@@ -56,4 +56,3 @@ inline bool Ray::intersect(Plane& p, vec3& res)
 inline Ray::Ray() = default;
 
 
-//BOOST_CLASS_EXPORT(Ray)
diff --git a/sources/Core/Math/Primitives/Sphere.ixx b/sources/Core/Math/Primitives/Sphere.ixx
@@ -62,7 +62,7 @@ private:
 	}
 };
 
-//BOOST_CLASS_EXPORT(Sphere)
+
 
 module: private;
 
diff --git a/sources/Core/Serialization/serialization.ixx b/sources/Core/Serialization/serialization.ixx
@@ -1,6 +1,7 @@
 module;
-#include "serialization_defines.h"
+
 export module serialization;
+export import "serialization_defines.h";
 export import boost.serialization;
 export import stl.core;
 export import stl.threading;
diff --git a/sources/Core/Utils/Allocators/Allocators.ixx b/sources/Core/Utils/Allocators/Allocators.ixx
@@ -2,10 +2,11 @@ export module Allocators;
 
 
 import Debug;
+import Utils;
 import Constants;
 import stl.core;
 import stl.threading;
-#include "Utils/utils_macros.h"
+
 
 
 export
diff --git a/sources/Core/Utils/utils.ixx b/sources/Core/Utils/utils.ixx
@@ -1,7 +1,7 @@
 module;
-#include "utils/utils_macros.h"
 export module Utils;
 
+export import "utils/utils_macros.h";
 export import stl.core;
 export import magic_enum;
 import crossguid;
diff --git a/sources/Core/Utils/utils_macros.h b/sources/Core/Utils/utils_macros.h
@@ -44,5 +44,3 @@
 #define THREAD_SCOPE(x) ;
 #define CHECK_THREAD(x) ;
 #endif
-
-#include "Serialization/serialization_defines.h"
diff --git a/sources/DirectXFramework/D3D/Shaders.ixx b/sources/DirectXFramework/D3D/Shaders.ixx
@@ -1,13 +1,14 @@
 module;
 
-#include "utils/utils_macros.h"
+
 export module D3D.Shaders;
 
 import Singleton;
 import FileSystem;
 import FileDepender;
 import DXCompiler;
 import serialization;
+import Utils;
 
 export
 {
diff --git a/sources/DirectXFramework/DX12/CommandList.ixx b/sources/DirectXFramework/DX12/CommandList.ixx
@@ -1,5 +1,5 @@
 module;
-#include "utils/utils_macros.h"
+
 #include "dx12_types.h"
 export module CommandList;
 
diff --git a/sources/DirectXFramework/DX12/CommandListCompiler.cpp b/sources/DirectXFramework/DX12/CommandListCompiler.cpp
@@ -1,5 +1,5 @@
 #include "pch_dx.h"
-#include "utils/utils_macros.h"
+
 
 import CommandListCompiler;
 import Device;
diff --git a/sources/DirectXFramework/DX12/CommandListCompiler.ixx b/sources/DirectXFramework/DX12/CommandListCompiler.ixx
@@ -1,6 +1,6 @@
 module;
 #include "pch_dx.h"
-#include "Utils/utils_macros.h"
+
 export module CommandListCompiler;
 
 import Vectors;
diff --git a/sources/DirectXFramework/DX12/Descriptors.cpp b/sources/DirectXFramework/DX12/Descriptors.cpp
@@ -1,5 +1,5 @@
 #include "pch_dx.h"
-#include "utils/utils_macros.h"
+//
 import Device;
 import Resource;
 import Descriptors;
diff --git a/sources/DirectXFramework/DX12/Descriptors.ixx b/sources/DirectXFramework/DX12/Descriptors.ixx
@@ -1,5 +1,5 @@
 module;
-#include "utils/utils_macros.h"
+
 export module Descriptors;
 
 
diff --git a/sources/DirectXFramework/DX12/Device12.ixx b/sources/DirectXFramework/DX12/Device12.ixx
@@ -1,5 +1,5 @@
 module;
-#include "utils/utils_macros.h"
+
 #include "helper.h"
 
 #include "dx12_types.h"
diff --git a/sources/DirectXFramework/DX12/Fence.cpp b/sources/DirectXFramework/DX12/Fence.cpp
@@ -1,5 +1,5 @@
 #include "pch_dx.h"
-#include "Utils/utils_macros.h"
+
 import Device;
 import Profiling;
 import Fence;
diff --git a/sources/DirectXFramework/DX12/IndirectCommand.ixx b/sources/DirectXFramework/DX12/IndirectCommand.ixx
@@ -1,11 +1,12 @@
 module;
 #include "pch_dx.h"
-#include "Utils/utils_macros.h"
+
 export module IndirectCommand;
 
 import RootSignature;
 import Device;
 import d3d12;
+import Utils;
 
 export
 {
diff --git a/sources/DirectXFramework/DX12/Memory.cpp b/sources/DirectXFramework/DX12/Memory.cpp
@@ -1,5 +1,5 @@
 #include "pch_dx.h"
-#include "utils/utils_macros.h"
+
 #include "Memory.h"
 import Device;
 import Resource;
diff --git a/sources/DirectXFramework/DX12/Memory.ixx b/sources/DirectXFramework/DX12/Memory.ixx
@@ -1,5 +1,5 @@
 module;
-#include "Utils/utils_macros.h"
+
 #include "dx12_types.h"
 export module Memory;
 
diff --git a/sources/DirectXFramework/DX12/Resource.cpp b/sources/DirectXFramework/DX12/Resource.cpp
@@ -1,6 +1,6 @@
 #include "pch_dx.h"
 
-#include "utils/utils_macros.h"
+
 
 #include "helper.h"
 import Resource;
diff --git a/sources/DirectXFramework/DX12/Resource.ixx b/sources/DirectXFramework/DX12/Resource.ixx
@@ -1,6 +1,6 @@
 module;
 
-#include "utils/utils_macros.h"
+
 export module Resource;
 
 export import Memory;
@@ -10,6 +10,7 @@ export import States;
 export import Device;
 import d3d12;
 import stl.memory;
+import Utils;
 export
 {
 	namespace DX12
diff --git a/sources/DirectXFramework/DX12/RootSignature.cpp b/sources/DirectXFramework/DX12/RootSignature.cpp
@@ -1,5 +1,5 @@
 #include "pch_dx.h"
-#include "utils/utils_macros.h"
+
 
 import RootSignature;
 import Log;
diff --git a/sources/DirectXFramework/DX12/States.ixx b/sources/DirectXFramework/DX12/States.ixx
@@ -1,6 +1,6 @@
 module;
 #include "pch_dx.h"
-#include "Utils/utils_macros.h"
+
 
 #include "dx12_types.h"
 export module States;
diff --git a/sources/DirectXFramework/DX12/Tiling.ixx b/sources/DirectXFramework/DX12/Tiling.ixx
@@ -1,6 +1,6 @@
 module;
 #include "pch_dx.h"
-#include "Utils/utils_macros.h"
+
 #include "dx12_types.h"
 export module Tiling;
 
diff --git a/sources/DirectXFramework/Resource/TextureData.ixx b/sources/DirectXFramework/Resource/TextureData.ixx
@@ -6,6 +6,7 @@ export module TextureData;
 
 import FileSystem;
 import serialization;
+import Utils;
 
 export
 {
diff --git a/sources/DirectXFramework/SIG/PSO.ixx b/sources/DirectXFramework/SIG/PSO.ixx
@@ -1,7 +1,7 @@
 module;
 #include "DX12/dx12_types.h"
 #include "DX12/PipelineState.h"
-#include "utils/utils_macros.h"
+
 export module PSO;
 
 import Data;
diff --git a/sources/DirectXFramework/SIG/PSO_sig.cpp b/sources/DirectXFramework/SIG/PSO_sig.cpp
@@ -1,7 +1,7 @@
 #include "pch_dx.h"
 #include "DX12/dx12_types.h"
 #include "DX12/PipelineState.h"
-#include "utils/utils_macros.h"
+
 import Enums;
 import PSO;
 import Data;
diff --git a/sources/DirectXFramework/SIG/SIG.ixx b/sources/DirectXFramework/SIG/SIG.ixx
@@ -1,6 +1,6 @@
 module;
 
-#include "Utils/utils_macros.h"
+
 
 export module SIG;
 import stl.core;
diff --git a/sources/DirectXFramework/autogen/enums.ixx b/sources/DirectXFramework/autogen/enums.ixx
@@ -1,5 +1,5 @@
 module;
-#include "utils/utils_macros.h"
+
 export module Enums;
 
 import crc32;
diff --git a/sources/DirectXFramework/d3d12_types.ixx b/sources/DirectXFramework/d3d12_types.ixx
@@ -1,5 +1,5 @@
 module;
-#include "utils/utils_macros.h"
+
 
 export module d3d12_types;
 
diff --git a/sources/DirectXFramework/helper.h b/sources/DirectXFramework/helper.h
@@ -3,7 +3,7 @@
 import Singleton;
 import d3d12;
 
-#include "utils/utils_macros.h"
+import Utils;
 import serialization;
 
 typedef ComPtr<IDXGISwapChain1>		DXGI_SwapChain;
diff --git a/sources/DirectXFramework/pch_dx.h b/sources/DirectXFramework/pch_dx.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch_core.h"
-#include "utils/utils_macros.h"
+
 
 import d3d12;
 
diff --git a/sources/RenderSystem/FrameGraph/FrameGraph.h b/sources/RenderSystem/FrameGraph/FrameGraph.h
diff --git a/sources/RenderSystem/GUI/Elements/FlowGraph/ComponentWindow.h b/sources/RenderSystem/GUI/Elements/FlowGraph/ComponentWindow.h
diff --git a/sources/RenderSystem/GUI/Elements/FlowGraph/FlowManager.h b/sources/RenderSystem/GUI/Elements/FlowGraph/FlowManager.h
diff --git a/sources/RenderSystem/Materials/Values.h b/sources/RenderSystem/Materials/Values.h
diff --git a/sources/Spectrum/main.cpp b/sources/Spectrum/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,3 @@ Plane::operator Vector<vec4_t<float>>() const`
`85`	`85`	`return vec4(n, d);`
`86`	`86`	`}`
`87`	`87`
`88`		`-//BOOST_CLASS_EXPORT(Plane)`