gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Cache the model-animation bounds more efficiently.

Browse Source 
To render models, we need to know the maximum bounds it takes over the
course of an animation. This depends only on the ModelDef and the
AnimationDef (and thus the SkeletonDef).
Currently, we recompute this data for each model, which is inefficient.
Caching it in ModelDef is faster, particularly avoiding lag spikes at
game start on some maps.
The animations are referred by a unique ID to avoid pointer-related
issues. I would have preferred weak_ptr, but that cannot be stably
hashed for now.

While at it, switch to unique_ptr/vectors.

Differential Revision: https://code.wildfiregames.com/D2967
This was SVN commit r25306.
This commit is contained in:
wraitii
2021-04-23 14:26:59 +00:00
parent 52258ce48b
commit f73fa05542
7 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/SkeletonAnimManager.cpp
+5 -14
View File
@@ -40,9 +40,6 @@ CSkeletonAnimManager::CSkeletonAnimManager(CColladaManager& colladaManager)
// CSkeletonAnimManager destructor
CSkeletonAnimManager::~CSkeletonAnimManager()
{
using Iter = std::unordered_map<VfsPath,CSkeletonAnimDef*>::iterator;
for (Iter i = m_Animations.begin(); i != m_Animations.end(); ++i)
delete i->second;
}
///////////////////////////////////////////////////////////////////////////////
@@ -53,22 +50,18 @@ CSkeletonAnimDef* CSkeletonAnimManager::GetAnimation(const VfsPath& pathname)
VfsPath name = pathname.ChangeExtension(L"");
// Find if it's already been loaded
std::unordered_map<VfsPath, CSkeletonAnimDef*>::iterator iter = m_Animations.find(name);
std::unordered_map<VfsPath, std::unique_ptr<CSkeletonAnimDef>>::iterator iter = m_Animations.find(name);
if (iter != m_Animations.end())
return iter->second;
return iter->second.get();
CSkeletonAnimDef* def = NULL;
std::unique_ptr<CSkeletonAnimDef> def;
// Find the file to load
VfsPath psaFilename = m_ColladaManager.GetLoadablePath(name, CColladaManager::PSA);
if (psaFilename.empty())
{
LOGERROR("Could not load animation '%s'", pathname.string8());
def = NULL;
}
else
{
try
{
def = CSkeletonAnimDef::Load(psaFilename);
@@ -77,14 +70,12 @@ CSkeletonAnimDef* CSkeletonAnimManager::GetAnimation(const VfsPath& pathname)
{
LOGERROR("Could not load animation '%s'", psaFilename.string8());
}
}
if (def)
LOGMESSAGE("CSkeletonAnimManager::GetAnimation(%s): Loaded successfully", pathname.string8());
else
LOGERROR("CSkeletonAnimManager::GetAnimation(%s): Failed loading, marked file as bad", pathname.string8());
// Add to map
m_Animations[name] = def; // NULL if failed to load - we won't try loading it again
return def;
// Add to map, NULL if failed to load - we won't try loading it again
return m_Animations.insert_or_assign(name, std::move(def)).first->second.get();
}