Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix hotloading making models disappear.

Browse Source 
The actors were always hotloaded because of a bad logic change in
76acc4e146.

Fixes #6228

Differential Revision: https://code.wildfiregames.com/D4175
This was SVN commit r25805.
This commit is contained in:
wraitii 2021-06-17 07:52:50 +00:00
parent 8c7d77a610
commit a541f3a317
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/graphics/ObjectManager.cpp
View File

@ -157,10 +157,15 @@ void CObjectManager::UnloadObjects()
Status CObjectManager::ReloadChangedFile(const VfsPath& path)
{
bool changed = false;
// Mark old entries as outdated so we don't reload them from the cache
for (std::pair<const ObjectKey, Hotloadable<CObjectEntry>>& object : m_Objects)
if (!object.second.outdated && object.second.obj->m_Base->UsesFile(path))
{
object.second.outdated = true;
changed = true;
}
const CSimulation2::InterfaceListUnordered& cmps = m_Simulation.GetEntitiesWithInterfaceUnordered(IID_Visual);
@ -168,15 +173,23 @@ Status CObjectManager::ReloadChangedFile(const VfsPath& path)
for (std::pair<const CStrW, Hotloadable<CActorDef>>& actor : m_ActorDefs)
{
if (!actor.second.outdated && actor.second.obj->UsesFile(path))
{
actor.second.outdated = true;
changed = true;
// Slightly ugly hack: The graphics system doesn't preserve enough information to regenerate the
// object with all correct variations, and we don't want to waste space storing it just for the
// rare occurrence of hotloading, so we'll tell the component (which does preserve the information)
// to do the reloading itself
for (CSimulation2::InterfaceListUnordered::const_iterator eit = cmps.begin(); eit != cmps.end(); ++eit)
static_cast<ICmpVisual*>(eit->second)->Hotload(actor.first);
// Slightly ugly hack: The graphics system doesn't preserve enough information to regenerate the
// object with all correct variations, and we don't want to waste space storing it just for the
// rare occurrence of hotloading, so we'll tell the component (which does preserve the information)
// to do the reloading itself
for (CSimulation2::InterfaceListUnordered::const_iterator eit = cmps.begin(); eit != cmps.end(); ++eit)
static_cast<ICmpVisual*>(eit->second)->Hotload(actor.first);
}
}
if (changed)
// Trigger an interpolate call - needed because the game may be paused & if so, models disappear.
m_Simulation.Interpolate(0.f, 0.f, 0.f);
return INFO::OK;
}