zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reallocate assets before adding to zone pool when loading from

Browse Source 
fastfile
This commit is contained in:
Jan 2024-12-31 14:17:42 +01:00
parent da7a60221c
commit ffac925410
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1098,9 +1098,12 @@ class ZoneLoadTemplate::Internal final : BaseTemplate
LINE(MarkerClassName(m_env.m_asset) << " marker(m_zone);") LINE(MarkerClassName(m_env.m_asset) << " marker(m_zone);")
LINE("marker.Mark(*pAsset);") LINE("marker.Mark(*pAsset);")
LINE("") LINE("")
LINE("m_asset_info = reinterpret_cast<XAssetInfo<" LINE("auto* reallocatedAsset = m_zone->GetMemory()->Alloc<" << info->m_definition->GetFullName() << ">();")
<< info->m_definition->GetFullName() LINE("std::memcpy(reallocatedAsset, *pAsset, sizeof(" << info->m_definition->GetFullName() << "));")
<< ">*>(LinkAsset(GetAssetName(*pAsset), *pAsset, marker.GetDependencies(), marker.GetUsedScriptStrings(), marker.GetIndirectAssetReferences()));") LINE("")
LINE("m_asset_info = reinterpret_cast<XAssetInfo<" << info->m_definition->GetFullName()
<< ">*>(LinkAsset(GetAssetName(*pAsset), reallocatedAsset, marker.GetDependencies(), "
"marker.GetUsedScriptStrings(), marker.GetIndirectAssetReferences()));")
LINE("*pAsset = m_asset_info->Asset();") LINE("*pAsset = m_asset_info->Asset();")
m_intendation--; m_intendation--;
@ -1275,6 +1278,7 @@ public:
LINE("#include \"" << Lower(m_env.m_asset->m_definition->m_name) << "_load_db.h\"") LINE("#include \"" << Lower(m_env.m_asset->m_definition->m_name) << "_load_db.h\"")
LINE("#include \"" << Lower(m_env.m_asset->m_definition->m_name) << "_mark_db.h\"") LINE("#include \"" << Lower(m_env.m_asset->m_definition->m_name) << "_mark_db.h\"")
LINE("#include <cassert>") LINE("#include <cassert>")
LINE("#include <cstring>")
LINE("") LINE("")
if (!m_env.m_referenced_assets.empty()) if (!m_env.m_referenced_assets.empty())