mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 06:14:05 +00:00
Code Issues Releases Wiki Activity

Remove BulletNifLoader dependency on keyframe manager

Browse source 
This will make threaded loading easier.
This commit is contained in:
scrawl 2015-06-11 17:59:49 +02:00
parent f81c3bcd6d
commit cdc47fa874
3 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
components/nifbullet/bulletnifloader.cpp
View file

@ -66,11 +66,6 @@ BulletNifLoader::~BulletNifLoader()
{ {
} }
void BulletNifLoader::setAnimatedNodes(const std::set<std::string> &animatedNodes)
{
mAnimatedNodes = animatedNodes;
}
osg::ref_ptr<BulletShape> BulletNifLoader::load(const Nif::NIFFilePtr nif) osg::ref_ptr<BulletShape> BulletNifLoader::load(const Nif::NIFFilePtr nif)
{ {
mShape = new BulletShape; mShape = new BulletShape;
@ -110,7 +105,20 @@ osg::ref_ptr<BulletShape> BulletNifLoader::load(const Nif::NIFFilePtr nif)
else else
{ {
bool autogenerated = hasAutoGeneratedCollision(node); bool autogenerated = hasAutoGeneratedCollision(node);
handleNode(node, 0, autogenerated, false, autogenerated); bool isAnimated = false;
// files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see Animation::addAnimSource).
// assume all nodes in the file will be animated
std::string filename = nif->getFilename();
size_t slashpos = filename.find_last_of("/\\");
if (slashpos == std::string::npos)
slashpos = 0;
if (slashpos+1 < filename.size() && (filename[slashpos+1] == 'x' || filename[slashpos+1] == 'X'))
{
isAnimated = true;
}
handleNode(node, 0, autogenerated, isAnimated, autogenerated);
if (mCompoundShape) if (mCompoundShape)
{ {
@ -192,9 +200,6 @@ void BulletNifLoader::handleNode(const Nif::Node *node, int flags,
&& (node->controller->flags & Nif::NiNode::ControllerFlag_Active)) && (node->controller->flags & Nif::NiNode::ControllerFlag_Active))
isAnimated = true; isAnimated = true;
if (mAnimatedNodes.find(node->name) != mAnimatedNodes.end())
isAnimated = true;
isCollisionNode = isCollisionNode || (node->recType == Nif::RC_RootCollisionNode); isCollisionNode = isCollisionNode || (node->recType == Nif::RC_RootCollisionNode);
// Don't collide with AvoidNode shapes // Don't collide with AvoidNode shapes

4
components/nifbullet/bulletnifloader.hpp
View file

@ -91,8 +91,6 @@ public:
abort(); abort();
} }
void setAnimatedNodes(const std::set<std::string>& animatedNodes);
osg::ref_ptr<BulletShape> load(const Nif::NIFFilePtr file); osg::ref_ptr<BulletShape> load(const Nif::NIFFilePtr file);
private: private:
@ -108,8 +106,6 @@ private:
btTriangleMesh* mStaticMesh; btTriangleMesh* mStaticMesh;
std::set<std::string> mAnimatedNodes;
osg::ref_ptr<BulletShape> mShape; osg::ref_ptr<BulletShape> mShape;
}; };

13
components/nifbullet/bulletshapemanager.cpp
View file

@ -34,20 +34,7 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
// TODO: add support for non-NIF formats // TODO: add support for non-NIF formats
std::string kfname = normalized;
if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
kfname.replace(kfname.size()-4, 4, ".kf");
std::set<std::string> animatedNodes;
if (mVFS->exists(kfname))
{
osg::ref_ptr<const NifOsg::KeyframeHolder> keyframes = mSceneManager->getKeyframes(kfname);
for (NifOsg::KeyframeHolder::KeyframeControllerMap::const_iterator it = keyframes->mKeyframeControllers.begin();
it != keyframes->mKeyframeControllers.end(); ++it)
animatedNodes.insert(it->first);
}
BulletNifLoader loader; BulletNifLoader loader;
loader.setAnimatedNodes(animatedNodes);
// might be worth sharing NIFFiles with SceneManager in some way // might be worth sharing NIFFiles with SceneManager in some way
shape = loader.load(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized))); shape = loader.load(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)));