janwas
a859562ea7
- properly differentiate between buffer/offset alignment and length alignment (relevant since block size has been increased to 256k) - use VfsPath for most game paths instead of CStr - clean up timer interface and implementation - self-tests no longer crash - file_cache.cpp: fix for the case where allocation fails (prevent deleter from seeing a null pointer) - allocators: move all shared_ptr-related stuff to its own component; add DummySharedPtr - codec: disable checksums (important for performance at work) - File: made into an interface class to avoid export problems. not entirely sure about this.. - vfs_path.h, path.h, os_path.h: proper fix for using fs::change_extension and similar utility functions with derivatives of basic_path - lib_api: automatically link against import lib if building lib/ as a DLL - path_util: remove unused functions (this component is deprecated) - compiler.h: add INLINE - Xeromyces.cpp: pass PIVFS so that GetXMBPath works in self-test (should do this mostly everywhere rather than have one singleton g_VFS) This was SVN commit r5537.
85 lines
2.5 KiB
C++
85 lines
2.5 KiB
C++
/**
|
|
* =========================================================================
|
|
* File : SkeletonAnimManager.cpp
|
|
* Project : 0 A.D.
|
|
* Description : Owner of all skeleton animations
|
|
* =========================================================================
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "SkeletonAnimManager.h"
|
|
|
|
#include "graphics/ColladaManager.h"
|
|
#include "graphics/Model.h"
|
|
#include "graphics/SkeletonAnimDef.h"
|
|
#include "ps/CLogger.h"
|
|
#include "ps/FileUnpacker.h"
|
|
|
|
#define LOG_CATEGORY "graphics"
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// CSkeletonAnimManager constructor
|
|
CSkeletonAnimManager::CSkeletonAnimManager(CColladaManager& colladaManager)
|
|
: m_ColladaManager(colladaManager)
|
|
{
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// CSkeletonAnimManager destructor
|
|
CSkeletonAnimManager::~CSkeletonAnimManager()
|
|
{
|
|
typedef std::map<CStr,CSkeletonAnimDef*>::iterator Iter;
|
|
for (Iter i = m_Animations.begin(); i != m_Animations.end(); ++i)
|
|
delete i->second;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// GetAnimation: return a given animation by filename; return null if filename
|
|
// doesn't refer to valid animation file
|
|
CSkeletonAnimDef* CSkeletonAnimManager::GetAnimation(const CStr& filename)
|
|
{
|
|
// Strip a three-letter file extension (if there is one) from the filename
|
|
CStr name;
|
|
if (filename.length() > 4 && filename[filename.length()-4] == '.')
|
|
name = filename.substr(0, filename.length()-4);
|
|
else
|
|
name = filename;
|
|
|
|
// Find if it's already been loaded
|
|
std::map<CStr, CSkeletonAnimDef*>::iterator iter = m_Animations.find(name);
|
|
if (iter != m_Animations.end())
|
|
return iter->second;
|
|
|
|
CSkeletonAnimDef* def = NULL;
|
|
|
|
// Find the file to load
|
|
VfsPath psaFilename = m_ColladaManager.GetLoadableFilename(name, CColladaManager::PSA);
|
|
|
|
if (psaFilename.empty())
|
|
{
|
|
LOG(CLogger::Error, LOG_CATEGORY, "Could not load animation '%s'", filename.c_str());
|
|
def = NULL;
|
|
}
|
|
else
|
|
{
|
|
try
|
|
{
|
|
def = CSkeletonAnimDef::Load(psaFilename);
|
|
}
|
|
catch (PSERROR_File&)
|
|
{
|
|
// ignore errors (they'll be logged elsewhere)
|
|
}
|
|
}
|
|
|
|
if (def)
|
|
LOG(CLogger::Normal, LOG_CATEGORY, "CSkeletonAnimManager::GetAnimation(%s): Loaded successfully", filename.c_str());
|
|
else
|
|
LOG(CLogger::Error, LOG_CATEGORY, "CSkeletonAnimManager::GetAnimation(%s): Failed loading, marked file as bad", filename.c_str());
|
|
|
|
// Add to map
|
|
m_Animations[name] = def; // NULL if failed to load - we won't try loading it again
|
|
return def;
|
|
}
|