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

Fixes for serialization problems with custom structures

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-23 12:29:25 +01:00
parent 20b65a08d9
commit b5e324673e
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,6 +345,24 @@ namespace Serialization
v.Deserialize(stream, modifier); v.Deserialize(stream, modifier);
} }
template<typename T>
inline typename TEnableIf<TIsBaseOf<ISerializable, T>::Value, bool>::Type ShouldSerialize(ISerializable& v, const void* otherObj)
{
return true;
}
template<typename T>
inline typename TEnableIf<TIsBaseOf<ISerializable, T>::Value>::Type Serialize(ISerializable::SerializeStream& stream, ISerializable& v, const void* otherObj)
{
stream.StartObject();
v.Serialize(stream, otherObj);
stream.EndObject();
}
template<typename T>
inline typename TEnableIf<TIsBaseOf<ISerializable, T>::Value>::Type Deserialize(ISerializable::DeserializeStream& stream, ISerializable& v, ISerializeModifier* modifier)
{
v.Deserialize(stream, modifier);
}
// Scripting Object // Scripting Object
template<typename T> template<typename T>
@@ -460,7 +478,7 @@ namespace Serialization
return true; return true;
for (int32 i = 0; i < v.Count(); i++) for (int32 i = 0; i < v.Count(); i++)
{ {
if (ShouldSerialize(v[i], &other->At(i))) if (ShouldSerialize((T&)v[i], (const void*)&other->At(i)))
return true; return true;
} }
return false; return false;
@@ -470,7 +488,7 @@ namespace Serialization
{ {
stream.StartArray(); stream.StartArray();
for (int32 i = 0; i < v.Count(); i++) for (int32 i = 0; i < v.Count(); i++)
Serialize(stream, v[i], nullptr); Serialize(stream, (T&)v[i], nullptr);
stream.EndArray(); stream.EndArray();
} }
template<typename T, typename AllocationType = HeapAllocation> template<typename T, typename AllocationType = HeapAllocation>
@@ -481,7 +499,7 @@ namespace Serialization
const auto& streamArray = stream.GetArray(); const auto& streamArray = stream.GetArray();
v.Resize(streamArray.Size()); v.Resize(streamArray.Size());
for (int32 i = 0; i < v.Count(); i++) for (int32 i = 0; i < v.Count(); i++)
Deserialize(streamArray[i], v[i], modifier); Deserialize(streamArray[i], (T&)v[i], modifier);
} }
// Dictionary // Dictionary
@@ -496,7 +514,7 @@ namespace Serialization
return true; return true;
for (auto& i : v) for (auto& i : v)
{ {
if (!other->ContainsKey(i.Key) || ShouldSerialize(i.Value, &other->At(i.Key))) if (!other->ContainsKey(i.Key) || ShouldSerialize(i.Value, (const void*)&other->At(i.Key)))
return true; return true;
} }
return false; return false;