zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-07 13:04:58 +00:00
Code Issues Packages Projects Wiki Activity

refactor: make ZoneInputStream a reference in zone loading

Browse Source
This commit is contained in:
Jan 2025-05-03 16:29:36 +01:00
parent 9425fe4775
commit 2132716e34
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
8 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@ namespace
void PrintLoadPtrArrayMethod_Loading(const DataDefinition* def, const StructureInformation* info) const
{
LINEF("*{0} = m_stream->Alloc<{1}>({2});", MakeTypePtrVarName(def), def->GetFullName(), def->GetAlignment())
LINEF("*{0} = m_stream.Alloc<{1}>({2});", MakeTypePtrVarName(def), def->GetFullName(), def->GetAlignment())
if (info && !info->m_is_leaf)
{
@ -350,7 +350,7 @@ namespace
}
else
{
LINEF("m_stream->Load<{0}>(*{1});", def->GetFullName(), MakeTypePtrVarName(def))
LINEF("m_stream.Load<{0}>(*{1});", def->GetFullName(), MakeTypePtrVarName(def))
}
}
@ -362,7 +362,7 @@ namespace
if (info && StructureComputations(info).IsAsset())
{
LINEF("{0} loader(m_zone, *m_stream);", LoaderClassName(info))
LINEF("{0} loader(m_zone, m_stream);", LoaderClassName(info))
LINEF("loader.Load({0});", MakeTypePtrVarName(def))
}
else
@ -381,7 +381,7 @@ namespace
LINE("{")
m_intendation++;
LINEF("*{0} = m_stream->ConvertOffsetToPointerNative(*{0});", MakeTypePtrVarName(def))
LINEF("*{0} = m_stream.ConvertOffsetToPointerNative(*{0});", MakeTypePtrVarName(def))
m_intendation--;
LINE("}")
@ -407,7 +407,7 @@ namespace
LINE("if (atStreamStart)")
m_intendation++;
LINEF("m_stream->Load<{0}*>({1}, count);", def->GetFullName(), MakeTypePtrVarName(def))
LINEF("m_stream.Load<{0}*>({1}, count);", def->GetFullName(), MakeTypePtrVarName(def))
m_intendation--;
LINE("")
@ -437,7 +437,7 @@ namespace
LINE("")
LINE("if (atStreamStart)")
m_intendation++;
LINEF("m_stream->Load<{0}>({1}, count);", def->GetFullName(), MakeTypeVarName(def))
LINEF("m_stream.Load<{0}>({1}, count);", def->GetFullName(), MakeTypeVarName(def))
m_intendation--;
LINE("")
@ -464,7 +464,7 @@ namespace
{
if (loadType == MemberLoadType::SINGLE_POINTER)
{
LINEF("{0} loader(m_zone, *m_stream);", LoaderClassName(member->m_type))
LINEF("{0} loader(m_zone, m_stream);", LoaderClassName(member->m_type))
LINEF("loader.Load(&{0});", MakeMemberAccess(info, member, modifier))
}
else if (loadType == MemberLoadType::POINTER_ARRAY)
@ -538,7 +538,7 @@ namespace
}
else
{
LINEF("m_stream->Load<{0}{1}>({2}, {3});",
LINEF("m_stream.Load<{0}{1}>({2}, {3});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
MakeFollowingReferences(modifier.GetFollowingDeclarationModifiers()),
MakeMemberAccess(info, member, modifier),
@ -598,7 +598,7 @@ namespace
}
else if (computations.IsAfterPartialLoad())
{
LINEF("m_stream->Load<{0}{1}>({2}, {3});",
LINEF("m_stream.Load<{0}{1}>({2}, {3});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
MakeFollowingReferences(modifier.GetFollowingDeclarationModifiers()),
MakeMemberAccess(info, member, modifier),
@ -617,7 +617,7 @@ namespace
}
else
{
LINEF("m_stream->Load<{0}{1}>({2}, {3});",
LINEF("m_stream.Load<{0}{1}>({2}, {3});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
MakeFollowingReferences(modifier.GetFollowingDeclarationModifiers()),
MakeMemberAccess(info, member, modifier),
@ -655,7 +655,7 @@ namespace
}
else if (computations.IsAfterPartialLoad())
{
LINEF("m_stream->Load<{0}{1}>(&{2});",
LINEF("m_stream.Load<{0}{1}>(&{2});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
MakeFollowingReferences(modifier.GetFollowingDeclarationModifiers()),
MakeMemberAccess(info, member, modifier))
@ -684,7 +684,7 @@ namespace
}
else
{
LINEF("m_stream->Load<{0}{1}>({2});",
LINEF("m_stream.Load<{0}{1}>({2});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
MakeFollowingReferences(modifier.GetFollowingDeclarationModifiers()),
MakeMemberAccess(info, member, modifier))
@ -790,7 +790,7 @@ namespace
// allocating. This is more reliable when being used with different compilers and the value used can be seen in the source code directly
if (member->m_alloc_alignment)
{
LINEF("{0} = m_stream->Alloc<{1}{2}>({3});",
LINEF("{0} = m_stream.Alloc<{1}{2}>({3});",
MakeMemberAccess(info, member, modifier),
typeDecl,
followingReferences,
@ -798,7 +798,7 @@ namespace
}
else
{
LINEF("{0} = m_stream->Alloc<{1}{2}>({3});", MakeMemberAccess(info, member, modifier), typeDecl, followingReferences, modifier.GetAlignment())
LINEF("{0} = m_stream.Alloc<{1}{2}>({3});", MakeMemberAccess(info, member, modifier), typeDecl, followingReferences, modifier.GetAlignment())
}
if (computations.IsInTempBlock())
@ -807,7 +807,7 @@ namespace
LINEF("{0}** toInsert = nullptr;", member->m_member->m_type_declaration->m_type->GetFullName())
LINE("if (ptr == PTR_INSERT)")
m_intendation++;
LINEF("toInsert = m_stream->InsertPointerNative<{0}>();", member->m_member->m_type_declaration->m_type->GetFullName())
LINEF("toInsert = m_stream.InsertPointerNative<{0}>();", member->m_member->m_type_declaration->m_type->GetFullName())
m_intendation--;
LINE("")
}
@ -865,7 +865,7 @@ namespace
LINE("{")
m_intendation++;
LINEF("{0} = m_stream->ConvertOffsetToAliasNative({0});", MakeMemberAccess(info, member, modifier))
LINEF("{0} = m_stream.ConvertOffsetToAliasNative({0});", MakeMemberAccess(info, member, modifier))
m_intendation--;
LINE("}")
@ -884,7 +884,7 @@ namespace
LINE("{")
m_intendation++;
LINEF("{0} = m_stream->ConvertOffsetToPointerNative({0});", MakeMemberAccess(info, member, modifier))
LINEF("{0} = m_stream.ConvertOffsetToPointerNative({0});", MakeMemberAccess(info, member, modifier))
m_intendation--;
LINE("}")
@ -938,14 +938,14 @@ namespace
const auto notInDefaultNormalBlock = computations.IsNotInDefaultNormalBlock();
if (notInDefaultNormalBlock)
{
LINEF("m_stream->PushBlock({0});", member->m_fast_file_block->m_name)
LINEF("m_stream.PushBlock({0});", member->m_fast_file_block->m_name)
}
LoadMember_PointerCheck(info, member, modifier, loadType);
if (notInDefaultNormalBlock)
{
LINE("m_stream->PopBlock();")
LINE("m_stream.PopBlock();")
}
}
@ -1129,14 +1129,14 @@ namespace
if (dynamicMember == nullptr)
{
LINEF("m_stream->Load<{0}>({1}); // Size: {2}",
LINEF("m_stream.Load<{0}>({1}); // Size: {2}",
info->m_definition->GetFullName(),
MakeTypeVarName(info->m_definition),
info->m_definition->GetSize())
}
else
{
LINEF("m_stream->LoadPartial<{0}>({1}, offsetof({0}, {2}));",
LINEF("m_stream.LoadPartial<{0}>({1}, offsetof({0}, {2}));",
info->m_definition->GetFullName(),
MakeTypeVarName(info->m_definition),
dynamicMember->m_member->m_name)
@ -1150,7 +1150,7 @@ namespace
m_intendation++;
LINEF("{0} = m_memory.Alloc<{1}>();", MakeTypeVarName(info->m_definition), info->m_definition->m_name)
LINEF("FillStruct_{0}(m_stream->LoadWithFill({1}));", MakeSafeTypeName(info->m_definition), info->m_definition->GetSize())
LINEF("FillStruct_{0}(m_stream.LoadWithFill({1}));", MakeSafeTypeName(info->m_definition), info->m_definition->GetSize())
m_intendation--;
LINE("}")
@ -1164,12 +1164,12 @@ namespace
if (computations.IsAsset())
{
LINE("")
LINEF("m_stream->PushBlock({0});", m_env.m_default_normal_block->m_name)
LINEF("m_stream.PushBlock({0});", m_env.m_default_normal_block->m_name)
}
else if (info->m_block)
{
LINE("")
LINEF("m_stream->PushBlock({0});", info->m_block->m_name)
LINEF("m_stream.PushBlock({0});", info->m_block->m_name)
}
for (const auto& member : info->m_ordered_members)
@ -1180,7 +1180,7 @@ namespace
if (info->m_block || computations.IsAsset())
{
LINE("")
LINE("m_stream->PopBlock();")
LINE("m_stream.PopBlock();")
}
m_intendation--;
@ -1199,13 +1199,13 @@ namespace
LINE("if (atStreamStart)")
m_intendation++;
LINEF("m_stream->Load<{0}*>({1});", info->m_definition->GetFullName(), MakeTypePtrVarName(info->m_definition))
LINEF("m_stream.Load<{0}*>({1});", info->m_definition->GetFullName(), MakeTypePtrVarName(info->m_definition))
m_intendation--;
LINE("")
if (inTemp)
{
LINEF("m_stream->PushBlock({0});", m_env.m_default_temp_block->m_name)
LINEF("m_stream.PushBlock({0});", m_env.m_default_temp_block->m_name)
LINE("")
}
@ -1228,7 +1228,7 @@ namespace
{
LINEF("{0}* ptr = *{1};", info->m_definition->GetFullName(), MakeTypePtrVarName(info->m_definition))
}
LINEF("*{0} = m_stream->Alloc<{1}>({2});",
LINEF("*{0} = m_stream.Alloc<{1}>({2});",
MakeTypePtrVarName(info->m_definition),
info->m_definition->GetFullName(),
info->m_definition->GetAlignment())
@ -1239,7 +1239,7 @@ namespace
LINEF("{0}** toInsert = nullptr;", info->m_definition->GetFullName())
LINE("if (ptr == PTR_INSERT)")
m_intendation++;
LINEF("toInsert = m_stream->InsertPointerNative<{0}>();", info->m_definition->GetFullName())
LINEF("toInsert = m_stream.InsertPointerNative<{0}>();", info->m_definition->GetFullName())
m_intendation--;
}
@ -1293,11 +1293,11 @@ namespace
if (inTemp)
{
LINEF("*{0} = m_stream->ConvertOffsetToAliasNative(*{0});", MakeTypePtrVarName(info->m_definition))
LINEF("*{0} = m_stream.ConvertOffsetToAliasNative(*{0});", MakeTypePtrVarName(info->m_definition))
}
else
{
LINEF("*{0} = m_stream->ConvertOffsetToPointerNative(*{0});", MakeTypePtrVarName(info->m_definition))
LINEF("*{0} = m_stream.ConvertOffsetToPointerNative(*{0});", MakeTypePtrVarName(info->m_definition))
}
m_intendation--;
@ -1309,7 +1309,7 @@ namespace
if (inTemp)
{
LINE("")
LINE("m_stream->PopBlock();")
LINE("m_stream.PopBlock();")
}
m_intendation--;

22
src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp
View File

@ -41,16 +41,16 @@ ContentLoader::ContentLoader(Zone& zone, ZoneInputStream& stream)
void ContentLoader::LoadScriptStringList(const bool atStreamStart)
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
if (atStreamStart)
m_stream->Load<ScriptStringList>(varScriptStringList);
m_stream.Load<ScriptStringList>(varScriptStringList);
if (varScriptStringList->strings != nullptr)
{
assert(varScriptStringList->strings == PTR_FOLLOWING);
varScriptStringList->strings = m_stream->Alloc<const char*>(alignof(const char*));
varScriptStringList->strings = m_stream.Alloc<const char*>(alignof(const char*));
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
@ -58,7 +58,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
m_zone.m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
}
m_stream->PopBlock();
m_stream.PopBlock();
assert(m_zone.m_script_strings.Count() <= SCR_STRING_MAX + 1);
}
@ -68,7 +68,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \
{ \
Loader_##typeName loader(m_zone, *m_stream); \
Loader_##typeName loader(m_zone, m_stream); \
loader.Load(&varXAsset->header.headerEntry); \
break; \
}
@ -79,7 +79,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset);
m_stream.Load<XAsset>(varXAsset);
switch (varXAsset->type)
{
@ -125,7 +125,7 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count);
m_stream.Load<XAsset>(varXAsset, count);
for (size_t index = 0; index < count; index++)
{
@ -136,10 +136,10 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
void ContentLoader::Load()
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
XAssetList assetList{};
m_stream->LoadDataRaw(&assetList, sizeof(assetList));
m_stream.LoadDataRaw(&assetList, sizeof(assetList));
varScriptStringList = &assetList.stringList;
LoadScriptStringList(false);
@ -148,10 +148,10 @@ void ContentLoader::Load()
{
assert(assetList.assets == PTR_FOLLOWING);
assetList.assets = m_stream->Alloc<XAsset>(alignof(XAsset));
assetList.assets = m_stream.Alloc<XAsset>(alignof(XAsset));
varXAsset = assetList.assets;
LoadXAssetArray(true, assetList.assetCount);
}
m_stream->PopBlock();
m_stream.PopBlock();
}

16
src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
View File

@ -73,7 +73,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
{
assert(varScriptStringList->strings == PTR_FOLLOWING);
varScriptStringList->strings = m_stream->Alloc<const char*>(4);
varScriptStringList->strings = m_stream.Alloc<const char*>(4);
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
@ -89,7 +89,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \
{ \
Loader_##typeName loader(m_zone, *m_stream); \
Loader_##typeName loader(m_zone, m_stream); \
loader.Load(&varXAsset->header.headerEntry); \
break; \
}
@ -100,7 +100,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset);
m_stream.Load<XAsset>(varXAsset);
switch (varXAsset->type)
{
@ -156,7 +156,7 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count);
m_stream.Load<XAsset>(varXAsset, count);
for (size_t index = 0; index < count; index++)
{
@ -170,9 +170,9 @@ void ContentLoader::Load()
XAssetList assetList{};
varXAssetList = &assetList;
FillStruct_XAssetList(m_stream->LoadWithFill(16u));
FillStruct_XAssetList(m_stream.LoadWithFill(16u));
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
varScriptStringList = &assetList.stringList;
LoadScriptStringList(false);
@ -181,10 +181,10 @@ void ContentLoader::Load()
{
assert(assetList.assets == PTR_FOLLOWING);
assetList.assets = m_stream->Alloc<XAsset>(alignof(XAsset));
assetList.assets = m_stream.Alloc<XAsset>(alignof(XAsset));
varXAsset = assetList.assets;
LoadXAssetArray(true, assetList.assetCount);
}
m_stream->PopBlock();
m_stream.PopBlock();
}

22
src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp
View File

@ -56,16 +56,16 @@ ContentLoader::ContentLoader(Zone& zone, ZoneInputStream& stream)
void ContentLoader::LoadScriptStringList(const bool atStreamStart)
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
if (atStreamStart)
m_stream->Load<ScriptStringList>(varScriptStringList);
m_stream.Load<ScriptStringList>(varScriptStringList);
if (varScriptStringList->strings != nullptr)
{
assert(varScriptStringList->strings == PTR_FOLLOWING);
varScriptStringList->strings = m_stream->Alloc<const char*>(alignof(const char*));
varScriptStringList->strings = m_stream.Alloc<const char*>(alignof(const char*));
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
@ -73,7 +73,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
m_zone.m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
}
m_stream->PopBlock();
m_stream.PopBlock();
assert(m_zone.m_script_strings.Count() <= SCR_STRING_MAX + 1);
}
@ -83,7 +83,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \
{ \
Loader_##typeName loader(m_zone, *m_stream); \
Loader_##typeName loader(m_zone, m_stream); \
loader.Load(&varXAsset->header.headerEntry); \
break; \
}
@ -94,7 +94,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset);
m_stream.Load<XAsset>(varXAsset);
switch (varXAsset->type)
{
@ -154,7 +154,7 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
assert(count == 0 || varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count);
m_stream.Load<XAsset>(varXAsset, count);
for (size_t index = 0; index < count; index++)
{
@ -165,10 +165,10 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
void ContentLoader::Load()
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
XAssetList assetList{};
m_stream->LoadDataRaw(&assetList, sizeof(assetList));
m_stream.LoadDataRaw(&assetList, sizeof(assetList));
varScriptStringList = &assetList.stringList;
LoadScriptStringList(false);
@ -177,10 +177,10 @@ void ContentLoader::Load()
{
assert(assetList.assets == PTR_FOLLOWING);
assetList.assets = m_stream->Alloc<XAsset>(alignof(XAsset));
assetList.assets = m_stream.Alloc<XAsset>(alignof(XAsset));
varXAsset = assetList.assets;
LoadXAssetArray(true, assetList.assetCount);
}
m_stream->PopBlock();
m_stream.PopBlock();
}

22
src/ZoneLoading/Game/T5/ContentLoaderT5.cpp
View File

@ -48,16 +48,16 @@ ContentLoader::ContentLoader(Zone& zone, ZoneInputStream& stream)
void ContentLoader::LoadScriptStringList(const bool atStreamStart)
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
if (atStreamStart)
m_stream->Load<ScriptStringList>(varScriptStringList);
m_stream.Load<ScriptStringList>(varScriptStringList);
if (varScriptStringList->strings != nullptr)
{
assert(varScriptStringList->strings == PTR_FOLLOWING);
varScriptStringList->strings = m_stream->Alloc<const char*>(alignof(const char*));
varScriptStringList->strings = m_stream.Alloc<const char*>(alignof(const char*));
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
@ -65,7 +65,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
m_zone.m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
}
m_stream->PopBlock();
m_stream.PopBlock();
assert(m_zone.m_script_strings.Count() <= SCR_STRING_MAX + 1);
}
@ -75,7 +75,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \
{ \
Loader_##typeName loader(m_zone, *m_stream); \
Loader_##typeName loader(m_zone, m_stream); \
loader.Load(&varXAsset->header.headerEntry); \
break; \
}
@ -86,7 +86,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset);
m_stream.Load<XAsset>(varXAsset);
switch (varXAsset->type)
{
@ -138,7 +138,7 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count);
m_stream.Load<XAsset>(varXAsset, count);
for (size_t index = 0; index < count; index++)
{
@ -149,10 +149,10 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
void ContentLoader::Load()
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
XAssetList assetList{};
m_stream->LoadDataRaw(&assetList, sizeof(assetList));
m_stream.LoadDataRaw(&assetList, sizeof(assetList));
varScriptStringList = &assetList.stringList;
LoadScriptStringList(false);
@ -161,10 +161,10 @@ void ContentLoader::Load()
{
assert(assetList.assets == PTR_FOLLOWING);
assetList.assets = m_stream->Alloc<XAsset>(alignof(XAsset));
assetList.assets = m_stream.Alloc<XAsset>(alignof(XAsset));
varXAsset = assetList.assets;
LoadXAssetArray(true, assetList.assetCount);
}
m_stream->PopBlock();
m_stream.PopBlock();
}

24
src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
View File

@ -64,16 +64,16 @@ ContentLoader::ContentLoader(Zone& zone, ZoneInputStream& stream)
void ContentLoader::LoadScriptStringList(const bool atStreamStart)
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
if (atStreamStart)
m_stream->Load<ScriptStringList>(varScriptStringList);
m_stream.Load<ScriptStringList>(varScriptStringList);
if (varScriptStringList->strings != nullptr)
{
assert(varScriptStringList->strings == PTR_FOLLOWING);
varScriptStringList->strings = m_stream->Alloc<const char*>(alignof(const char*));
varScriptStringList->strings = m_stream.Alloc<const char*>(alignof(const char*));
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
@ -81,7 +81,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
m_zone.m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
}
m_stream->PopBlock();
m_stream.PopBlock();
assert(m_zone.m_script_strings.Count() <= SCR_STRING_MAX + 1);
}
@ -91,7 +91,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \
{ \
Loader_##typeName loader(m_zone, *m_stream); \
Loader_##typeName loader(m_zone, m_stream); \
loader.Load(&varXAsset->header.headerEntry); \
break; \
}
@ -99,7 +99,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset);
m_stream.Load<XAsset>(varXAsset);
switch (varXAsset->type)
{
@ -167,7 +167,7 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count);
m_stream.Load<XAsset>(varXAsset, count);
for (size_t index = 0; index < count; index++)
{
@ -178,10 +178,10 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
void ContentLoader::Load()
{
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
XAssetList assetList{};
m_stream->LoadDataRaw(&assetList, sizeof(assetList));
m_stream.LoadDataRaw(&assetList, sizeof(assetList));
varScriptStringList = &assetList.stringList;
LoadScriptStringList(false);
@ -190,7 +190,7 @@ void ContentLoader::Load()
{
assert(assetList.depends == PTR_FOLLOWING);
assetList.depends = m_stream->Alloc<const char*>(alignof(const char*));
assetList.depends = m_stream.Alloc<const char*>(alignof(const char*));
varXString = assetList.depends;
LoadXStringArray(true, assetList.dependCount);
}
@ -199,10 +199,10 @@ void ContentLoader::Load()
{
assert(assetList.assets == PTR_FOLLOWING);
assetList.assets = m_stream->Alloc<XAsset>(alignof(XAsset));
assetList.assets = m_stream.Alloc<XAsset>(alignof(XAsset));
varXAsset = assetList.assets;
LoadXAssetArray(true, assetList.assetCount);
}
m_stream->PopBlock();
m_stream.PopBlock();
}

12
src/ZoneLoading/Loading/ContentLoaderBase.cpp
View File

@ -9,7 +9,7 @@ ContentLoaderBase::ContentLoaderBase(Zone& zone, ZoneInputStream& stream)
: varXString(nullptr),
m_zone(zone),
m_memory(zone.Memory()),
m_stream(&stream)
m_stream(stream)
{
}
@ -18,18 +18,18 @@ void ContentLoaderBase::LoadXString(const bool atStreamStart) const
assert(varXString != nullptr);
if (atStreamStart)
m_stream->Load<const char*>(varXString);
m_stream.Load<const char*>(varXString);
if (*varXString != nullptr)
{
if (*varXString == PTR_FOLLOWING)
{
*varXString = m_stream->Alloc<const char>(alignof(const char));
m_stream->LoadNullTerminated(const_cast<char*>(*varXString));
*varXString = m_stream.Alloc<const char>(alignof(const char));
m_stream.LoadNullTerminated(const_cast<char*>(*varXString));
}
else
{
*varXString = m_stream->ConvertOffsetToPointerNative<const char>(*varXString);
*varXString = m_stream.ConvertOffsetToPointerNative<const char>(*varXString);
}
}
}
@ -39,7 +39,7 @@ void ContentLoaderBase::LoadXStringArray(const bool atStreamStart, const size_t
assert(varXString != nullptr);
if (atStreamStart)
m_stream->Load<const char*>(varXString, count);
m_stream.Load<const char*>(varXString, count);
for (size_t index = 0; index < count; index++)
{

2
src/ZoneLoading/Loading/ContentLoaderBase.h
View File

@ -26,5 +26,5 @@ protected:
Zone& m_zone;
MemoryManager& m_memory;
ZoneInputStream* m_stream; // TODO: Change this to reference
ZoneInputStream& m_stream;
};