mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Access std::map using find() method

Browse Source
This commit is contained in:
Daniel Chappuis 2013-03-03 16:36:07 +01:00
parent b43f875cef
commit 03cddcf568
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/collision/CollisionDetection.cpp
View File

@ -169,7 +169,7 @@ void CollisionDetection::broadPhaseNotifyRemovedOverlappingPair(BodyPair* remove
bodyindexpair indexPair = removedPair->getBodiesIndexPair(); bodyindexpair indexPair = removedPair->getBodiesIndexPair();
// Get the broad-phase pair // Get the broad-phase pair
BroadPhasePair* broadPhasePair = mOverlappingPairs[indexPair]; BroadPhasePair* broadPhasePair = mOverlappingPairs.find(indexPair)->second;
assert(broadPhasePair != NULL); assert(broadPhasePair != NULL);
// Notify the world about the removed broad-phase pair // Notify the world about the removed broad-phase pair

4
src/collision/broadphase/SweepAndPruneAlgorithm.cpp
View File

@ -135,7 +135,7 @@ void SweepAndPruneAlgorithm::removeObject(CollisionBody* body) {
updateObject(body, aabb); updateObject(body, aabb);
// Get the corresponding box // Get the corresponding box
bodyindex boxIndex = mMapBodyToBoxIndex[body]; bodyindex boxIndex = mMapBodyToBoxIndex.find(body)->second;
BoxAABB* box = &mBoxes[boxIndex]; BoxAABB* box = &mBoxes[boxIndex];
// Add the box index into the list of free indices // Add the box index into the list of free indices
@ -152,7 +152,7 @@ void SweepAndPruneAlgorithm::updateObject(CollisionBody* body, const AABB& aabb)
AABBInt aabbInt(aabb); AABBInt aabbInt(aabb);
// Get the corresponding box // Get the corresponding box
bodyindex boxIndex = mMapBodyToBoxIndex[body]; bodyindex boxIndex = mMapBodyToBoxIndex.find(body)->second;
BoxAABB* box = &mBoxes[boxIndex]; BoxAABB* box = &mBoxes[boxIndex];
// Current axis // Current axis

7
src/engine/DynamicsWorld.cpp
View File

@ -122,7 +122,7 @@ void DynamicsWorld::updateRigidBodiesPositionAndOrientation() {
rigidBody->updateOldTransform(); rigidBody->updateOldTransform();
// Get the constrained velocity // Get the constrained velocity
uint indexArray = mMapBodyToConstrainedVelocityIndex[rigidBody]; uint indexArray = mMapBodyToConstrainedVelocityIndex.find(rigidBody)->second;
Vector3 newLinVelocity = mConstrainedLinearVelocities[indexArray]; Vector3 newLinVelocity = mConstrainedLinearVelocities[indexArray];
Vector3 newAngVelocity = mConstrainedAngularVelocities[indexArray]; Vector3 newAngVelocity = mConstrainedAngularVelocities[indexArray];
@ -297,6 +297,7 @@ void DynamicsWorld::notifyAddedOverlappingPair(const BroadPhasePair* addedPair)
assert(newPair != NULL); assert(newPair != NULL);
std::pair<map<bodyindexpair, OverlappingPair*>::iterator, bool> check = std::pair<map<bodyindexpair, OverlappingPair*>::iterator, bool> check =
mOverlappingPairs.insert(make_pair(indexPair, newPair)); mOverlappingPairs.insert(make_pair(indexPair, newPair));
assert(check.second);
} }
// Notify the world about a removed broad-phase overlapping pair // Notify the world about a removed broad-phase overlapping pair
@ -306,7 +307,7 @@ void DynamicsWorld::notifyRemovedOverlappingPair(const BroadPhasePair* removedPa
std::pair<bodyindex, bodyindex> indexPair = removedPair->getBodiesIndexPair(); std::pair<bodyindex, bodyindex> indexPair = removedPair->getBodiesIndexPair();
// Remove the overlapping pair from the memory pool // Remove the overlapping pair from the memory pool
mOverlappingPairs[indexPair]->OverlappingPair::~OverlappingPair(); mOverlappingPairs.find(indexPair)->second->OverlappingPair::~OverlappingPair();
mMemoryPoolOverlappingPairs.freeObject(mOverlappingPairs[indexPair]); mMemoryPoolOverlappingPairs.freeObject(mOverlappingPairs[indexPair]);
mOverlappingPairs.erase(indexPair); mOverlappingPairs.erase(indexPair);
} }
@ -329,7 +330,7 @@ void DynamicsWorld::notifyNewContact(const BroadPhasePair* broadPhasePair,
// Get the corresponding overlapping pair // Get the corresponding overlapping pair
pair<bodyindex, bodyindex> indexPair = broadPhasePair->getBodiesIndexPair(); pair<bodyindex, bodyindex> indexPair = broadPhasePair->getBodiesIndexPair();
OverlappingPair* overlappingPair = mOverlappingPairs[indexPair]; OverlappingPair* overlappingPair = mOverlappingPairs.find(indexPair)->second;
assert(overlappingPair != NULL); assert(overlappingPair != NULL);
// Add the contact to the contact cache of the corresponding overlapping pair // Add the contact to the contact cache of the corresponding overlapping pair