GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Optimize Serialization.h to have separate SerializationFwd.h for more lightweight types serialization impl

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-19 17:07:24 +01:00
parent 6d7bd78816
commit d866526dd8
2 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Source/Engine/Serialization/Serialization.h
View File

@@ -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;

76
Source/Engine/Serialization/SerializationFwd.h Normal file
View File

@@ -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; \
}