mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 01:45:31 +00:00
Code Issues Releases Wiki Activity

throw an exception instead of crashing (ray test bug)

Browse source
This commit is contained in:
Marc Zinnschlag 2011-03-07 14:55:18 +01:00
parent aa0100bc08
commit 3f0b610f2c
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bullet/physic.cpp
View file

@ -219,6 +219,13 @@ namespace Physic
RigidBody* body = RigidBodyMap[name]; RigidBody* body = RigidBodyMap[name];
if(body != NULL) if(body != NULL)
{ {
broadphase->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
std::map<std::string,PhysicActor*>::iterator it = PhysicActorMap.begin();
for(;it!=PhysicActorMap.end();it++)
{
it->second->internalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
it->second->externalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
}
dynamicsWorld->removeRigidBody(RigidBodyMap[name]); dynamicsWorld->removeRigidBody(RigidBodyMap[name]);
} }
} }
@ -291,11 +298,11 @@ namespace Physic
{ {
if(resultCallback.m_collisionFilterGroup == COL_WORLD) if(resultCallback.m_collisionFilterGroup == COL_WORLD)
{ {
name = static_cast<RigidBody*>(resultCallback.m_collisionObject)->mName; name = dynamic_cast<RigidBody&>(*resultCallback.m_collisionObject).mName;
} }
if(resultCallback.m_collisionFilterGroup == COL_ACTOR_EXTERNAL || resultCallback.m_collisionFilterGroup == COL_ACTOR_INTERNAL) if(resultCallback.m_collisionFilterGroup == COL_ACTOR_EXTERNAL || resultCallback.m_collisionFilterGroup == COL_ACTOR_INTERNAL)
{ {
name = static_cast<PairCachingGhostObject*>(resultCallback.m_collisionObject)->mName; name = dynamic_cast<PairCachingGhostObject&>(*resultCallback.m_collisionObject).mName;
} }
d = resultCallback.m_closestHitFraction; d = resultCallback.m_closestHitFraction;
} }