teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node (Fixes #2133)

Browse source
This commit is contained in:
scrawl 2015-01-11 20:34:26 +01:00
parent 82eaa9f1bc
commit 04d6cead3b
5 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
components/nifbullet/bulletnifloader.cpp
View file

@ -95,7 +95,7 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
return;
}
mShape->mHasCollisionNode = hasRootCollisionNode(node);
mShape->mAutogenerated = hasAutoGeneratedCollision(node);
//do a first pass
handleNode(node,0,false,false,false);
@ -152,12 +152,9 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
mShape->mRaycastingShape = new TriangleMeshShape(mStaticMesh,true);
}
bool ManualBulletShapeLoader::hasRootCollisionNode(Nif::Node const * node)
bool ManualBulletShapeLoader::hasAutoGeneratedCollision(Nif::Node const * rootNode)
{
if(node->recType == Nif::RC_RootCollisionNode)
return true;
const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(rootNode);
if(ninode)
{
const Nif::NodeList &list = ninode->children;
@ -165,14 +162,13 @@ bool ManualBulletShapeLoader::hasRootCollisionNode(Nif::Node const * node)
{
if(!list[i].empty())
{
if(hasRootCollisionNode(list[i].getPtr()))
return true;
}
}
}
if(list[i].getPtr()->recType == Nif::RC_RootCollisionNode)
return false;
}
}
}
return true;
}
void ManualBulletShapeLoader::handleNode(const Nif::Node *node, int flags,
bool isCollisionNode,
@ -230,8 +226,8 @@ void ManualBulletShapeLoader::handleNode(const Nif::Node *node, int flags,
}
}
if ( (isCollisionNode || (!mShape->mHasCollisionNode && !raycasting))
&& (!isMarker || (mShape->mHasCollisionNode && !raycasting)))
if ( (isCollisionNode || (mShape->mAutogenerated && !raycasting))
&& (!isMarker || (!mShape->mAutogenerated && !raycasting)))
{
// NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
// It must be ignored completely.

2
components/nifbullet/bulletnifloader.hpp
View file

@ -112,7 +112,7 @@ private:
/**
*Helper function
*/
bool hasRootCollisionNode(const Nif::Node *node);
bool hasAutoGeneratedCollision(const Nif::Node *rootNode);
/**
*convert a NiTriShape to a bullet trishape.

2
libs/openengine/bullet/BulletShapeLoader.cpp
View file

@ -19,7 +19,7 @@ Ogre::Resource(creator, name, handle, group, isManual, loader)
*/
mCollisionShape = NULL;
mRaycastingShape = NULL;
mHasCollisionNode = false;
mAutogenerated = true;
mCollide = true;
createParamDictionary("BulletShape");
}

5
libs/openengine/bullet/BulletShapeLoader.h
View file

@ -41,9 +41,8 @@ public:
btCollisionShape* mCollisionShape;
btCollisionShape* mRaycastingShape;
// Whether or not a NiRootCollisionNode was present in the .nif. If there is none, the collision behaviour
// depends on object type, so we need to expose this variable.
bool mHasCollisionNode;
// Does this .nif have an autogenerated collision mesh?
bool mAutogenerated;
Ogre::Vector3 mBoxTranslation;
Ogre::Quaternion mBoxRotation;

2
libs/openengine/bullet/physic.cpp
View file

@ -456,7 +456,7 @@ namespace Physic
BulletShapeManager::getSingletonPtr()->load(outputstring,"General");
BulletShapePtr shape = BulletShapeManager::getSingleton().getByName(outputstring,"General");
if (placeable && !raycasting && shape->mCollisionShape && !shape->mHasCollisionNode)
if (placeable && !raycasting && shape->mCollisionShape && shape->mAutogenerated)
return NULL;
if (!shape->mCollisionShape && !raycasting)