Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enabled the vehicle demo again (still needs lots of tuning before it drives well)

Browse Source 
fixed some warnings
This commit is contained in:
ejcoumans
2006-10-29 03:36:16 +00:00
parent caca3a1ca2
commit d6c6cbaee6
16 changed files with 179 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
View File

@@ -1,4 +1,6 @@
#include "LinearMath/btScalar.h"
#include "btSimulationIslandManager.h"
#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
@@ -51,7 +53,7 @@ void btSimulationIslandManager::findUnions(btDispatcher* dispatcher)
void btSimulationIslandManager::updateActivationState(btCollisionWorld* colWorld,btDispatcher* dispatcher)
{
initUnionFind(colWorld->getCollisionObjectArray().size());
initUnionFind( int (colWorld->getCollisionObjectArray().size()));
// put the index into m_controllers into m_tag
{
@@ -253,7 +255,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
}
}
int numManifolds = islandmanifold.size();
int numManifolds = int (islandmanifold.size());
// Sort manifolds, based on islands
// Sort the vector using predicate and std::sort