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

fix the bug when changing cell.

Browse source
This commit is contained in:
gugus 2011-03-23 22:49:23 +01:00
parent 1cada5032e
commit 32b475432f
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bullet/physic.cpp
View file

@ -247,13 +247,13 @@ namespace Physic
RigidBody* body = it->second; RigidBody* body = it->second;
if(body != NULL) if(body != NULL)
{ {
broadphase->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher); // broadphase->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
std::map<std::string,PhysicActor*>::iterator it = PhysicActorMap.begin(); /*std::map<std::string,PhysicActor*>::iterator it2 = PhysicActorMap.begin();
for(;it!=PhysicActorMap.end();it++) for(;it2!=PhysicActorMap.end();it++)
{ {
it->second->internalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher); it2->second->internalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
it->second->externalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher); it2->second->externalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
} }*/
dynamicsWorld->removeRigidBody(RigidBodyMap[name]); dynamicsWorld->removeRigidBody(RigidBodyMap[name]);
} }
} }
@ -268,9 +268,8 @@ namespace Physic
if(body != NULL) if(body != NULL)
{ {
delete body; delete body;
RigidBodyMap[name] = NULL;
RigidBodyMap.erase(it);
} }
RigidBodyMap.erase(it);
} }
} }
@ -322,9 +321,8 @@ namespace Physic
dynamicsWorld->removeCollisionObject(act->internalGhostObject); dynamicsWorld->removeCollisionObject(act->internalGhostObject);
dynamicsWorld->removeAction(act->mCharacter); dynamicsWorld->removeAction(act->mCharacter);
delete act; delete act;
PhysicActorMap[name] = NULL;
PhysicActorMap.erase(it);
} }
PhysicActorMap.erase(it);
} }
//std::cout << "ok"; //std::cout << "ok";
} }