mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:15:32 +00:00
Code Issues Releases Wiki Activity

Revert "animateCollisionShape checks if the shape is really animated"

Browse source 
This reverts commit cbf344663f.

Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
This commit is contained in:
scrawl 2016-08-16 17:42:07 +02:00
parent b26478b860
commit 8a4722cb84
1 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -591,7 +591,7 @@ namespace MWPhysics
btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape()); btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
for (std::map<int, int>::iterator it = mShapeInstance->mAnimatedShapes.begin(); it != mShapeInstance->mAnimatedShapes.end();) for (std::map<int, int>::const_iterator it = mShapeInstance->mAnimatedShapes.begin(); it != mShapeInstance->mAnimatedShapes.end(); ++it)
{ {
int recIndex = it->first; int recIndex = it->first;
int shapeIndex = it->second; int shapeIndex = it->second;
@ -606,24 +606,6 @@ namespace MWPhysics
osg::NodePath path = visitor.mFoundPath; osg::NodePath path = visitor.mFoundPath;
path.erase(path.begin()); path.erase(path.begin());
// Attempt to remove "animated" shapes that are not actually animated
// We may get these because the BulletNifLoader does not know if a .kf file with additional controllers will be attached later on.
// On the first animateCollisionShapes call, we'll consider the graph completely loaded (with extra controllers and what not),
// so now we can better decide if the shape is really animated.
bool animated = false;
for (osg::NodePath::iterator nodePathIt = path.begin(); nodePathIt != path.end(); ++nodePathIt)
{
osg::Node* node = *nodePathIt;
if (node->getUpdateCallback())
animated = true;
}
if (!animated)
{
mShapeInstance->mAnimatedShapes.erase(it++);
break;
}
osg::Matrixf matrix = osg::computeLocalToWorld(path); osg::Matrixf matrix = osg::computeLocalToWorld(path);
osg::Vec3f scale = matrix.getScale(); osg::Vec3f scale = matrix.getScale();
matrix.orthoNormalize(matrix); matrix.orthoNormalize(matrix);
@ -636,8 +618,6 @@ namespace MWPhysics
compound->getChildShape(shapeIndex)->setLocalScaling(compound->getLocalScaling() * toBullet(scale)); compound->getChildShape(shapeIndex)->setLocalScaling(compound->getLocalScaling() * toBullet(scale));
compound->updateChildTransform(shapeIndex, transform); compound->updateChildTransform(shapeIndex, transform);
++it;
} }
collisionWorld->updateSingleAabb(mCollisionObject.get()); collisionWorld->updateSingleAabb(mCollisionObject.get());