From d866526dd852624cdaa70da9fe5cfd1851c19836 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 19 Feb 2021 17:07:24 +0100
Subject: [PATCH] Optimize Serialization.h to have separate SerializationFwd.h
 for more lightweight types serialization impl

---
 Source/Engine/Serialization/Serialization.h   | 73 +-----------------
 .../Engine/Serialization/SerializationFwd.h   | 76 +++++++++++++++++++
 2 files changed, 77 insertions(+), 72 deletions(-)
 create mode 100644 Source/Engine/Serialization/SerializationFwd.h

diff --git a/Source/Engine/Serialization/Serialization.h b/Source/Engine/Serialization/Serialization.h
index 039d9df3e..4aec76397 100644
--- a/Source/Engine/Serialization/Serialization.h
+++ b/Source/Engine/Serialization/Serialization.h
@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include "ISerializable.h"
-#include "ISerializeModifier.h"
-#include "Json.h"
-#include "JsonWriter.h"
+#include "SerializationFwd.h"
 #include "Engine/Core/Collections/Array.h"
 #include "Engine/Core/Collections/Dictionary.h"
 #include "Engine/Scripting/ScriptingObjectReference.h"
@@ -13,74 +10,6 @@
 #include "Engine/Content/AssetReference.h"
 #include "Engine/Content/WeakAssetReference.h"
 
-// The floating-point values serialization epsilon for equality checks precision
-#define SERIALIZE_EPSILON 0.0000001f
-
-// Helper macro to cast object on diff serialization
-#define SERIALIZE_GET_OTHER_OBJ(type) const auto other = static_cast<const type*>(otherObj)
-
-// Helper macro to use find member in the stream by name (skips strlen call if string is constant)
-#define SERIALIZE_FIND_MEMBER(stream, name) stream.FindMember(rapidjson_flax::Value(name, ARRAY_COUNT(name) - 1))
-
-// Serialization helper macro
-#define SERIALIZE(name) \
-    if (Serialization::ShouldSerialize(name, other ? &other->name : nullptr)) \
-	{ \
-		stream.JKEY(#name); \
-		Serialization::Serialize(stream, name, other ? &other->name : nullptr); \
-	}
-
-// Serialization helper macro (for private members, or with custom member name)
-#define SERIALIZE_MEMBER(name, member) \
-    if (Serialization::ShouldSerialize(member, other ? &other->member : nullptr)) \
-	{ \
-		stream.JKEY(#name); \
-		Serialization::Serialize(stream, member, other ? &other->member : nullptr); \
-	}
-
-// Deserialization helper macro
-#define DESERIALIZE(name)  \
-    { \
-        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
-        if (e != stream.MemberEnd()) \
-            Serialization::Deserialize(e->value, name, modifier); \
-    }
-
-// Deserialization helper macro (for private members, or with custom member name)
-#define DESERIALIZE_MEMBER(name, member) \
-    { \
-        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
-        if (e != stream.MemberEnd()) \
-            Serialization::Deserialize(e->value, member, modifier); \
-    }
-
-// Helper macros for bit fields
-
-#define SERIALIZE_BIT(name) \
-    if (!other || name != other->name) \
-	{ \
-		stream.JKEY(#name); \
-		stream.Bool(name != 0); \
-	}
-#define SERIALIZE_BIT_MEMBER(name, member) \
-    if (!other || member != other->member) \
-	{ \
-		stream.JKEY(#name); \
-		stream.Bool(member != 0); \
-	}
-#define DESERIALIZE_BIT(name) \
-    { \
-        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
-        if (e != stream.MemberEnd() && e->value.IsBool()) \
-            name = e->value.GetBool() ? 1 : 0; \
-    }
-#define DESERIALIZE_BIT_MEMBER(name, member) \
-    { \
-        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
-        if (e != stream.MemberEnd() && e->value.IsBool()) \
-            member = e->value.GetBool() ? 1 : 0; \
-    }
-
 struct Version;
 struct VariantType;
 
diff --git a/Source/Engine/Serialization/SerializationFwd.h b/Source/Engine/Serialization/SerializationFwd.h
new file mode 100644
index 000000000..db5c12e03
--- /dev/null
+++ b/Source/Engine/Serialization/SerializationFwd.h
@@ -0,0 +1,76 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+#pragma once
+
+#include "Engine/Core/ISerializable.h"
+#include "ISerializeModifier.h"
+#include "Json.h"
+#include "JsonWriter.h"
+
+// The floating-point values serialization epsilon for equality checks precision
+#define SERIALIZE_EPSILON 0.0000001f
+
+// Helper macro to cast object on diff serialization
+#define SERIALIZE_GET_OTHER_OBJ(type) const auto other = static_cast<const type*>(otherObj)
+
+// Helper macro to use find member in the stream by name (skips strlen call if string is constant)
+#define SERIALIZE_FIND_MEMBER(stream, name) stream.FindMember(rapidjson_flax::Value(name, ARRAY_COUNT(name) - 1))
+
+// Serialization helper macro
+#define SERIALIZE(name) \
+    if (Serialization::ShouldSerialize(name, other ? &other->name : nullptr)) \
+	{ \
+		stream.JKEY(#name); \
+		Serialization::Serialize(stream, name, other ? &other->name : nullptr); \
+	}
+
+// Serialization helper macro (for private members, or with custom member name)
+#define SERIALIZE_MEMBER(name, member) \
+    if (Serialization::ShouldSerialize(member, other ? &other->member : nullptr)) \
+	{ \
+		stream.JKEY(#name); \
+		Serialization::Serialize(stream, member, other ? &other->member : nullptr); \
+	}
+
+// Deserialization helper macro
+#define DESERIALIZE(name)  \
+    { \
+        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
+        if (e != stream.MemberEnd()) \
+            Serialization::Deserialize(e->value, name, modifier); \
+    }
+
+// Deserialization helper macro (for private members, or with custom member name)
+#define DESERIALIZE_MEMBER(name, member) \
+    { \
+        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
+        if (e != stream.MemberEnd()) \
+            Serialization::Deserialize(e->value, member, modifier); \
+    }
+
+// Helper macros for bit fields
+
+#define SERIALIZE_BIT(name) \
+    if (!other || name != other->name) \
+	{ \
+		stream.JKEY(#name); \
+		stream.Bool(name != 0); \
+	}
+#define SERIALIZE_BIT_MEMBER(name, member) \
+    if (!other || member != other->member) \
+	{ \
+		stream.JKEY(#name); \
+		stream.Bool(member != 0); \
+	}
+#define DESERIALIZE_BIT(name) \
+    { \
+        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
+        if (e != stream.MemberEnd() && e->value.IsBool()) \
+            name = e->value.GetBool() ? 1 : 0; \
+    }
+#define DESERIALIZE_BIT_MEMBER(name, member) \
+    { \
+        const auto e = SERIALIZE_FIND_MEMBER(stream, #name); \
+        if (e != stream.MemberEnd() && e->value.IsBool()) \
+            member = e->value.GetBool() ? 1 : 0; \
+    }