R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Engine: improve level pak unload logic

Browse Source 
Only handle level related paks and data when we are processing the level pak (the 4th pak in the list).
This commit is contained in:
Kawe Mazidjatari 2024-10-07 11:17:16 +02:00
parent e925f4cb6e
commit 046c37f160
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/engine/cmodel_bsp.cpp
View File

@ -230,8 +230,9 @@ void Mod_QueuedPakCacheFrame()
const int numToProcess = startIndex;
if (startIndex <= 4)
if (startIndex <= CommonPakData_t::PAK_TYPE_LEVEL)
{
bool keepLoaded = false;
int numLeftToProcess = 4;
CommonPakData_t* data = &g_commonPakData[4];
@ -242,10 +243,6 @@ void Mod_QueuedPakCacheFrame()
PakLoadedInfo_s* const pakInfo = Pak_GetPakInfo(data->pakId);
PakStatus_e status;
// TODO: revisit this, this appears incorrect but also the way
// respawn does this. it this always supposed to be true on
// retail builds?
bool keepLoaded = true;
data->keepLoaded = true;
if (pakInfo->handle == data->pakId)
@ -287,26 +284,18 @@ void Mod_QueuedPakCacheFrame()
break;
}
// The old gather props is set if a model couldn't be
// loaded properly. If we unload level assets, we just
// enable the new implementation again and re-evaluate
// on the next level load. If we load a missing/bad
// model again, we toggle the old implementation as
// otherwise the fallback models won't render; the new
// gather props solution does not attempt to obtain
// studio hardware data on bad mdl handles. See
// 'GatherStaticPropsSecondPass_PreInit()' for details.
g_StudioMdlFallbackHandler.DisableLegacyGatherProps();
g_pakLoadApi->UnloadAsync(data->pakId);
Mod_UnloadPakFile(); // Unload mod pak files.
if (s_pLevelSetKV)
if (numLeftToProcess == CommonPakData_t::PAK_TYPE_LEVEL)
{
// Delete current level settings if we drop all paks..
s_pLevelSetKV->DeleteThis();
s_pLevelSetKV = nullptr;
Mod_UnloadPakFile(); // Unload mod pak files.
if (s_pLevelSetKV)
{
// Delete current level settings if we drop all paks..
s_pLevelSetKV->DeleteThis();
s_pLevelSetKV = nullptr;
}
}
}
@ -519,6 +508,17 @@ void Mod_UnloadPakFile(void)
g_StudioMdlFallbackHandler.ClearBadModelHandleCache();
g_StudioMdlFallbackHandler.ClearSuppresionList();
// The old gather props is set if a model couldn't be
// loaded properly. If we unload level assets, we just
// enable the new implementation again and re-evaluate
// on the next level load. If we load a missing/bad
// model again, we toggle the old implementation as
// otherwise the fallback models won't render; the new
// gather props solution does not attempt to obtain
// studio hardware data on bad mdl handles. See
// 'GatherStaticPropsSecondPass_PreInit()' for details.
g_StudioMdlFallbackHandler.DisableLegacyGatherProps();
}
void VModel_BSP::Detour(const bool bAttach) const