INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 14:58:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure assets need to be declared as temp block to be located in temp block to handle special case of iw3 stringtable not being in temp block

Browse Source
This commit is contained in:
Jan
2021-04-15 13:42:03 +02:00
parent 742cb596e6
commit dbcbb4a4b3
110 changed files with 194 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -908,16 +908,16 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
LINE("assert(atStreamStart);")
}
if (info->m_block)
if (computations.IsAsset())
{
LINE("")
LINE("m_stream->PushBlock(" << m_env.m_default_normal_block->m_name << ");")
}
else if (info->m_block)
{
LINE("")
LINE("m_stream->PushBlock("<<info->m_block->m_name<<");")
}
else if (computations.IsAsset())
{
LINE("")
LINE("m_stream->PushBlock("<<m_env.m_default_normal_block->m_name<<");")
}
for (const auto& member : info->m_ordered_members)
{
@ -934,8 +934,9 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
LINE("}")
}
void PrintLoadTempPtrMethod(StructureInformation* info)
void PrintLoadPtrMethod(StructureInformation* info)
{
const bool inTemp = info->m_block && info->m_block->m_type == FastFileBlockType::TEMP;
LINE("void "<<LoaderClassName(m_env.m_asset)<<"::LoadPtr_"<<MakeSafeTypeName(info->m_definition)<<"(const bool atStreamStart)")
LINE("{")
m_intendation++;
@ -949,24 +950,42 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
m_intendation--;
LINE("")
LINE("m_stream->PushBlock("<<m_env.m_default_temp_block->m_name<<");")
LINE("")
if (inTemp)
{
LINE("m_stream->PushBlock(" << m_env.m_default_temp_block->m_name << ");")
LINE("")
}
LINE("if(*"<< MakeTypePtrVarName(info->m_definition)<<" != nullptr)")
LINE("{")
m_intendation++;
LINE("if(*" << MakeTypePtrVarName(info->m_definition) << " == PTR_FOLLOWING || *" << MakeTypePtrVarName(info->m_definition) << " == PTR_INSERT)")
if (inTemp)
{
LINE("if(*" << MakeTypePtrVarName(info->m_definition) << " == PTR_FOLLOWING || *" << MakeTypePtrVarName(info->m_definition) << " == PTR_INSERT)")
}
else
{
LINE("if(*" << MakeTypePtrVarName(info->m_definition) << " == PTR_FOLLOWING)")
}
LINE("{")
m_intendation++;
LINE(info->m_definition->GetFullName() << "* ptr = *" << MakeTypePtrVarName(info->m_definition) << ";")
if (inTemp)
{
LINE(info->m_definition->GetFullName() << "* ptr = *" << MakeTypePtrVarName(info->m_definition) << ";")
}
LINE("*" << MakeTypePtrVarName(info->m_definition) << " = m_stream->Alloc<" << info->m_definition->GetFullName() << ">("<< info->m_definition->GetAlignment() <<");")
LINE("")
LINE(info->m_definition->GetFullName() << "** toInsert = nullptr;")
LINE("if(ptr == PTR_INSERT)")
m_intendation++;
LINE("toInsert = m_stream->InsertPointer<"<<info->m_definition->GetFullName()<<">();")
m_intendation--;
if (inTemp)
{
LINE("")
LINE(info->m_definition->GetFullName() << "** toInsert = nullptr;")
LINE("if(ptr == PTR_INSERT)")
m_intendation++;
LINE("toInsert = m_stream->InsertPointer<" << info->m_definition->GetFullName() << ">();")
m_intendation--;
}
auto startLoadSection = true;
@ -982,7 +1001,7 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
}
else
{
LINE("#error Temp method cannot have leaf type")
LINE("#error Ptr method cannot have leaf type")
}
if (info->m_post_load_action)
@ -997,15 +1016,18 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
LINE("LoadAsset_"<<MakeSafeTypeName(info->m_definition)<<"("<<MakeTypePtrVarName(info->m_definition)<<");")
}
if (!startLoadSection)
if (inTemp)
{
LINE("")
}
if (!startLoadSection)
{
LINE("")
}
LINE("if(toInsert != nullptr)")
m_intendation++;
LINE("*toInsert = *"<<MakeTypePtrVarName(info->m_definition)<<";")
m_intendation--;
LINE("if(toInsert != nullptr)")
m_intendation++;
LINE("*toInsert = *" << MakeTypePtrVarName(info->m_definition) << ";")
m_intendation--;
}
m_intendation--;
LINE("}")
@ -1013,7 +1035,14 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
LINE("{")
m_intendation++;
LINE("*"<<MakeTypePtrVarName(info->m_definition)<<" = m_stream->ConvertOffsetToAlias(*"<<MakeTypePtrVarName(info->m_definition)<<");")
if (inTemp)
{
LINE("*" << MakeTypePtrVarName(info->m_definition) << " = m_stream->ConvertOffsetToAlias(*" << MakeTypePtrVarName(info->m_definition) << ");")
}
else
{
LINE("*" << MakeTypePtrVarName(info->m_definition) << " = m_stream->ConvertOffsetToPointer(*" << MakeTypePtrVarName(info->m_definition) << ");")
}
m_intendation--;
LINE("}")
@ -1021,8 +1050,11 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
m_intendation--;
LINE("}")
LINE("")
LINE("m_stream->PopBlock();")
if (inTemp)
{
LINE("")
LINE("m_stream->PopBlock();")
}
m_intendation--;
LINE("}")
@ -1249,7 +1281,7 @@ public:
LINE("")
PrintLoadMethod(m_env.m_asset);
LINE("")
PrintLoadTempPtrMethod(m_env.m_asset);
PrintLoadPtrMethod(m_env.m_asset);
LINE("")
PrintLoadAssetMethod(m_env.m_asset);
LINE("")

43
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
View File

@ -267,7 +267,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
void WriteMember_DynamicArray(StructureInformation* info, MemberInformation* member, const DeclarationModifierComputations& modifier) const
{
std::string memberAccess;
if(!(info->m_definition->GetType() == DataDefinitionType::UNION && StructureComputations(info).GetDynamicMember()))
if (!(info->m_definition->GetType() == DataDefinitionType::UNION && StructureComputations(info).GetDynamicMember()))
memberAccess = MakeMemberAccess("originalData", info, member, modifier);
else
memberAccess = MakeMemberAccess(info, member, modifier);
@ -418,11 +418,11 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
return;
}
if(writeType == MemberWriteType::ARRAY_POINTER)
if (writeType == MemberWriteType::ARRAY_POINTER)
{
LINE("m_stream->ReusableAddOffset("<<MakeMemberAccess(info, member, modifier)<<", "<<MakeEvaluation(modifier.GetArrayPointerCountEvaluation())<<");")
}
else if(writeType == MemberWriteType::POINTER_ARRAY)
else if (writeType == MemberWriteType::POINTER_ARRAY)
{
LINE("m_stream->ReusableAddOffset("<<MakeMemberAccess(info, member, modifier)<<", "<<MakeEvaluation(modifier.GetPointerArrayCountEvaluation())<<");")
}
@ -755,7 +755,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
{
LINE("")
if(dynamicMember)
if (dynamicMember)
{
LINE("auto* originalData = "<<MakeTypeVarName(info->m_definition)<<";")
}
@ -785,16 +785,16 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
LINE("assert(atStreamStart);")
}
if (info->m_block)
{
LINE("")
LINE("m_stream->PushBlock(" << info->m_block->m_name << ");")
}
else if (computations.IsAsset())
if (computations.IsAsset())
{
LINE("")
LINE("m_stream->PushBlock(" << m_env.m_default_normal_block->m_name << ");")
}
else if (info->m_block)
{
LINE("")
LINE("m_stream->PushBlock(" << info->m_block->m_name << ");")
}
for (const auto& member : info->m_ordered_members)
{
@ -811,8 +811,9 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
LINE("}")
}
void PrintWriteTempPtrMethod(StructureInformation* info)
void PrintWritePtrMethod(StructureInformation* info)
{
const bool inTemp = info->m_block && info->m_block->m_type == FastFileBlockType::TEMP;
LINE("void " << WriterClassName(m_env.m_asset) << "::WritePtr_" << MakeSafeTypeName(info->m_definition) << "(const bool atStreamStart)")
LINE("{")
m_intendation++;
@ -826,8 +827,11 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
m_intendation--;
LINE("")
LINE("m_stream->PushBlock(" << m_env.m_default_temp_block->m_name << ");")
LINE("")
if (inTemp)
{
LINE("m_stream->PushBlock(" << m_env.m_default_temp_block->m_name << ");")
LINE("")
}
LINE("if(m_stream->ReusableShouldWrite(" << MakeTypePtrVarName(info->m_definition) << "))")
LINE("{")
m_intendation++;
@ -842,7 +846,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
}
else
{
LINE("#error Temp method cannot have leaf type")
LINE("#error Ptr method cannot have leaf type")
}
LINE("")
@ -851,8 +855,11 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
m_intendation--;
LINE("}")
LINE("")
LINE("m_stream->PopBlock();")
if (inTemp)
{
LINE("")
LINE("m_stream->PopBlock();")
}
m_intendation--;
LINE("}")
@ -915,7 +922,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
{
LINE("m_stream->Align("<<def->GetAlignment()<<");")
if(reusable)
if (reusable)
{
LINE("m_stream->ReusableAddOffset(*"<<MakeTypePtrVarName(def)<< ");")
}
@ -1166,7 +1173,7 @@ public:
LINE("")
PrintWriteMethod(m_env.m_asset);
LINE("")
PrintWriteTempPtrMethod(m_env.m_asset);
PrintWritePtrMethod(m_env.m_asset);
LINE("")
PrintMainWriteMethod();
LINE("")