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

Add content deprecation system that auto-saves assets in Editor that use old data format

Browse Source
This commit is contained in:
Wojtek Figat
2025-01-20 23:46:49 +01:00
parent 1497acef58
commit 8a7ceef288
67 changed files with 751 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Source/Engine/Content/JsonAsset.cpp
View File

@@ -161,25 +161,19 @@ void JsonAssetBase::GetReferences(const StringAnsiView& json, Array<Guid>& asset
FindIds(document, assets, files);
}
bool JsonAssetBase::Save(const StringView& path) const
bool JsonAssetBase::Save(const StringView& path)
{
// Validate state
if (WaitForLoaded())
{
LOG(Error, "Asset loading failed. Cannot save it.");
if (OnCheckSave(path))
return true;
}
if (IsVirtual() && path.IsEmpty())
{
LOG(Error, "To save virtual asset asset you need to specify the target asset path location.");
return true;
}
PROFILE_CPU();
ScopeLock lock(Locker);
// Serialize to json to the buffer
rapidjson_flax::StringBuffer buffer;
PrettyJsonWriter writerObj(buffer);
_isResaving = true;
Save(writerObj);
_isResaving = false;
// Save json to file
if (File::WriteAllBytes(path.HasChars() ? path : StringView(GetPath()), (byte*)buffer.GetString(), (int32)buffer.GetSize()))
@@ -193,12 +187,8 @@ bool JsonAssetBase::Save(const StringView& path) const
bool JsonAssetBase::Save(JsonWriter& writer) const
{
// Validate state
if (WaitForLoaded())
{
LOG(Error, "Asset loading failed. Cannot save it.");
if (OnCheckSave())
return true;
}
ScopeLock lock(Locker);
writer.StartObject();
@@ -348,6 +338,61 @@ uint64 JsonAsset::GetMemoryUsage() const
return result;
}
void JsonAsset::OnGetData(rapidjson_flax::StringBuffer& buffer) const
{
if (Instance && InstanceType && _isResaving)
{
// Serialize instance object that was loaded (from potentially deprecated data, serialize method is always up to date)
const ScriptingType& type = InstanceType.GetType();
PrettyJsonWriter writer(buffer);
bool got = false;
switch (type.Type)
{
case ScriptingTypes::Class:
case ScriptingTypes::Structure:
{
const ScriptingType::InterfaceImplementation* interface = type.GetInterface(ISerializable::TypeInitializer);
writer.StartObject();
((ISerializable*)((byte*)Instance + interface->VTableOffset))->Serialize(writer, nullptr);
got = true;
break;
}
case ScriptingTypes::Script:
{
writer.StartObject();
ToInterface<ISerializable>((ScriptingObject*)Instance)->Serialize(writer, nullptr);
got = true;
break;
}
}
if (got)
{
writer.EndObject();
// Parse json document (CreateInstance uses it to spawn object)
auto* self = const_cast<JsonAsset*>(this);
{
PROFILE_CPU_NAMED("Json.Parse");
self->Document.Parse(buffer.GetString(), buffer.GetSize());
}
if (self->Document.HasParseError())
{
self->Data = nullptr;
Log::JsonParseException(Document.GetParseError(), Document.GetErrorOffset());
}
else
{
self->Data = &self->Document;
self->DataEngineBuild = FLAXENGINE_VERSION_BUILD;
}
return;
}
}
JsonAssetBase::OnGetData(buffer);
}
Asset::LoadResult JsonAsset::loadAsset()
{
const auto result = JsonAssetBase::loadAsset();
@@ -387,6 +432,7 @@ void JsonAsset::onLoaded_MainThread()
JsonAssetBase::onLoaded_MainThread();
// Special case for Settings assets to flush them after edited and saved in Editor
// TODO: add interface for custom JsonAsset interaction of the instance class (eg. OnJsonLoaded, or similar to C# like OnDeserialized from Newtonsoft.Json)
const StringAsANSI<> dataTypeNameAnsi(DataTypeName.Get(), DataTypeName.Length());
const auto typeHandle = Scripting::FindScriptingType(StringAnsiView(dataTypeNameAnsi.Get(), DataTypeName.Length()));
if (Instance && typeHandle && typeHandle.IsSubclassOf(SettingsBase::TypeInitializer) && _isAfterReload)