zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-28 15:21:57 +00:00
Code Activity

feat: recognize indirect asset refs when marking assets

Browse Source
This commit is contained in:
Jan
2024-02-07 00:53:52 +01:00
parent 2dd4eaf54f
commit fef815e708
14 changed files with 175 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
View File

@ -1075,7 +1075,8 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
LINE("marker.Mark(*pAsset);")
LINE("")
LINE("m_asset_info = reinterpret_cast<XAssetInfo<"
<< info->m_definition->GetFullName() << ">*>(LinkAsset(GetAssetName(*pAsset), *pAsset, marker.GetUsedScriptStrings(), marker.GetDependencies()));")
<< info->m_definition->GetFullName()
<< ">*>(LinkAsset(GetAssetName(*pAsset), *pAsset, marker.GetDependencies(), marker.GetUsedScriptStrings(), marker.GetIndirectAssetReferences()));")
LINE("*pAsset = m_asset_info->Asset();")
m_intendation--;

28
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
View File

@ -225,6 +225,27 @@ class ZoneMarkTemplate::Internal final : BaseTemplate
}
}
void MarkMember_AssetRef(StructureInformation* info,
MemberInformation* member,
const DeclarationModifierComputations& modifier,
const MemberLoadType loadType) const
{
if (loadType == MemberLoadType::POINTER_ARRAY)
{
LINE("MarkArray_IndirectAssetRef(" << member->m_asset_ref->m_name << ", " << MakeMemberAccess(info, member, modifier) << ", "
<< MakeEvaluation(modifier.GetArrayPointerCountEvaluation()) << ");")
}
else if (loadType == MemberLoadType::SINGLE_POINTER)
{
LINE("Mark_IndirectAssetRef(" << member->m_asset_ref->m_name << ", " << MakeMemberAccess(info, member, modifier) << ");")
}
else
{
assert(false);
LINE("#error unsupported loadType " << static_cast<int>(loadType) << " for scriptstring")
}
}
void MarkMember_Asset(StructureInformation* info,
MemberInformation* member,
const DeclarationModifierComputations& modifier,
@ -308,6 +329,10 @@ class ZoneMarkTemplate::Internal final : BaseTemplate
{
MarkMember_ScriptString(info, member, modifier, loadType);
}
else if (member->m_asset_ref)
{
MarkMember_AssetRef(info, member, modifier, loadType);
}
else if (member->m_type && StructureComputations(member->m_type).IsAsset())
{
MarkMember_Asset(info, member, modifier, loadType);
@ -541,7 +566,8 @@ class ZoneMarkTemplate::Internal final : BaseTemplate
if (computations.ShouldIgnore() || computations.IsInRuntimeBlock())
return;
if (member->m_is_script_string || member->m_type && (member->m_type->m_requires_marking || StructureComputations(member->m_type).IsAsset()))
if (member->m_is_script_string || member->m_asset_ref
|| member->m_type && (member->m_type->m_requires_marking || StructureComputations(member->m_type).IsAsset()))
{
if (info->m_definition->GetType() == DataDefinitionType::UNION)
MarkMember_Condition_Union(info, member);