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

Refactoring: another huge number of changes, renamed methods to start with lower-case.

Browse Source
This commit is contained in:
ejcoumans
2006-09-28 01:11:16 +00:00
parent d0f09040e9
commit 2b1657b1dd
185 changed files with 2103 additions and 2095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -72,7 +72,7 @@ void btDiscreteDynamicsWorld::stepSimulation(float timeStep)
predictUnconstraintMotion(timeStep);
///perform collision detection
PerformDiscreteCollisionDetection();
performDiscreteCollisionDetection();
calculateSimulationIslands();
@@ -104,7 +104,7 @@ void btDiscreteDynamicsWorld::updateVehicles(float timeStep)
for (int i=0;i<m_vehicles.size();i++)
{
btRaycastVehicle* vehicle = m_vehicles[i];
vehicle->UpdateVehicle( timeStep);
vehicle->updateVehicle( timeStep);
}
}
@@ -184,7 +184,7 @@ void btDiscreteDynamicsWorld::solveContactConstraints(btContactSolverInfo& solve
virtual void ProcessIsland(btPersistentManifold** manifolds,int numManifolds)
{
m_solver->SolveGroup( manifolds, numManifolds,m_solverInfo,m_debugDrawer);
m_solver->solveGroup( manifolds, numManifolds,m_solverInfo,m_debugDrawer);
}
};
@@ -194,7 +194,7 @@ void btDiscreteDynamicsWorld::solveContactConstraints(btContactSolverInfo& solve
/// solve all the contact points and contact friction
m_islandManager->BuildAndProcessIslands(GetCollisionWorld()->GetDispatcher(),GetCollisionWorld()->GetCollisionObjectArray(),&solverCallback);
m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld()->getCollisionObjectArray(),&solverCallback);
}
@@ -203,7 +203,7 @@ void btDiscreteDynamicsWorld::solveContactConstraints(btContactSolverInfo& solve
void btDiscreteDynamicsWorld::solveNoncontactConstraints(btContactSolverInfo& solverInfo)
{
#ifdef USE_QUICKPROF
Profiler::beginBlock("SolveConstraint");
Profiler::beginBlock("solveConstraint");
#endif //USE_QUICKPROF
@@ -215,7 +215,7 @@ void btDiscreteDynamicsWorld::solveNoncontactConstraints(btContactSolverInfo& so
for (i=0;i< numConstraints ; i++ )
{
btTypedConstraint* constraint = m_constraints[i];
constraint->BuildJacobian();
constraint->buildJacobian();
}
//solve the regular non-contact constraints (point 2 point, hinge, generic d6)
@@ -227,12 +227,12 @@ void btDiscreteDynamicsWorld::solveNoncontactConstraints(btContactSolverInfo& so
for (i=0;i< numConstraints ; i++ )
{
btTypedConstraint* constraint = m_constraints[i];
constraint->SolveConstraint( solverInfo.m_timeStep );
constraint->solveConstraint( solverInfo.m_timeStep );
}
}
#ifdef USE_QUICKPROF
Profiler::endBlock("SolveConstraint");
Profiler::endBlock("solveConstraint");
#endif //USE_QUICKPROF
}
@@ -244,7 +244,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands()
Profiler::beginBlock("IslandUnionFind");
#endif //USE_QUICKPROF
GetSimulationIslandManager()->UpdateActivationState(GetCollisionWorld(),GetCollisionWorld()->GetDispatcher());
getSimulationIslandManager()->updateActivationState(getCollisionWorld(),getCollisionWorld()->getDispatcher());
{
int i;
@@ -253,8 +253,8 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands()
{
btTypedConstraint* constraint = m_constraints[i];
const btRigidBody* colObj0 = &constraint->GetRigidBodyA();
const btRigidBody* colObj1 = &constraint->GetRigidBodyB();
const btRigidBody* colObj0 = &constraint->getRigidBodyA();
const btRigidBody* colObj1 = &constraint->getRigidBodyB();
if (((colObj0) && ((colObj0)->mergesSimulationIslands())) &&
((colObj1) && ((colObj1)->mergesSimulationIslands())))
@@ -262,7 +262,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands()
if (colObj0->IsActive() || colObj1->IsActive())
{
GetSimulationIslandManager()->GetUnionFind().unite((colObj0)->m_islandTag1,
getSimulationIslandManager()->getUnionFind().unite((colObj0)->m_islandTag1,
(colObj1)->m_islandTag1);
}
}
@@ -270,7 +270,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands()
}
//Store the island id in each body
GetSimulationIslandManager()->StoreIslandActivationState(GetCollisionWorld());
getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld());
#ifdef USE_QUICKPROF
Profiler::endBlock("IslandUnionFind");
@@ -290,9 +290,9 @@ void btDiscreteDynamicsWorld::updateAabbs()
if (body->IsActive() && (!body->IsStatic()))
{
btPoint3 minAabb,maxAabb;
colObj->m_collisionShape->GetAabb(colObj->m_worldTransform, minAabb,maxAabb);
colObj->m_collisionShape->getAabb(colObj->m_worldTransform, minAabb,maxAabb);
btSimpleBroadphase* bp = (btSimpleBroadphase*)m_pairCache;
bp->SetAabb(body->m_broadphaseHandle,minAabb,maxAabb);
bp->setAabb(body->m_broadphaseHandle,minAabb,maxAabb);
}
}
}

6
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
View File

@@ -77,17 +77,17 @@ public:
void removeVehicle(btRaycastVehicle* vehicle);
btSimulationIslandManager* GetSimulationIslandManager()
btSimulationIslandManager* getSimulationIslandManager()
{
return m_islandManager;
}
const btSimulationIslandManager* GetSimulationIslandManager() const
const btSimulationIslandManager* getSimulationIslandManager() const
{
return m_islandManager;
}
btCollisionWorld* GetCollisionWorld()
btCollisionWorld* getCollisionWorld()
{
return this;
}

6
src/BulletDynamics/Dynamics/btRigidBody.cpp
View File

@@ -60,7 +60,7 @@ void btRigidBody::setLinearVelocity(const btVector3& lin_vel)
void btRigidBody::predictIntegratedTransform(btScalar timeStep,btTransform& predictedTransform) const
{
btTransformUtil::IntegrateTransform(m_worldTransform,m_linearVelocity,m_angularVelocity,timeStep,predictedTransform);
btTransformUtil::integrateTransform(m_worldTransform,m_linearVelocity,m_angularVelocity,timeStep,predictedTransform);
}
void btRigidBody::saveKinematicState(btScalar timeStep)
@@ -69,7 +69,7 @@ void btRigidBody::saveKinematicState(btScalar timeStep)
if (m_kinematicTimeStep)
{
btVector3 linVel,angVel;
btTransformUtil::CalculateVelocity(m_interpolationWorldTransform,m_worldTransform,m_kinematicTimeStep,m_linearVelocity,m_angularVelocity);
btTransformUtil::calculateVelocity(m_interpolationWorldTransform,m_worldTransform,m_kinematicTimeStep,m_linearVelocity,m_angularVelocity);
//printf("angular = %f %f %f\n",m_angularVelocity.getX(),m_angularVelocity.getY(),m_angularVelocity.getZ());
}
@@ -81,7 +81,7 @@ void btRigidBody::saveKinematicState(btScalar timeStep)
void btRigidBody::getAabb(btVector3& aabbMin,btVector3& aabbMax) const
{
GetCollisionShape()->GetAabb(m_worldTransform,aabbMin,aabbMax);
getCollisionShape()->getAabb(m_worldTransform,aabbMin,aabbMax);
}

14
src/BulletDynamics/Dynamics/btRigidBody.h
View File

@@ -78,11 +78,11 @@ public:
void setDamping(btScalar lin_damping, btScalar ang_damping);
inline const btCollisionShape* GetCollisionShape() const {
inline const btCollisionShape* getCollisionShape() const {
return m_collisionShape;
}
inline btCollisionShape* GetCollisionShape() {
inline btCollisionShape* getCollisionShape() {
return m_collisionShape;
}
@@ -197,7 +197,7 @@ public:
inline float ComputeImpulseDenominator(const btPoint3& pos, const btVector3& normal) const
inline float computeImpulseDenominator(const btPoint3& pos, const btVector3& normal) const
{
btVector3 r0 = pos - getCenterOfMassPosition();
@@ -209,7 +209,7 @@ public:
}
inline float ComputeAngularImpulseDenominator(const btVector3& axis) const
inline float computeAngularImpulseDenominator(const btVector3& axis) const
{
btVector3 vec = axis * getInvInertiaTensorWorld();
return axis.dot(vec);
@@ -254,15 +254,15 @@ public:
const btBroadphaseProxy* GetBroadphaseProxy() const
const btBroadphaseProxy* getBroadphaseProxy() const
{
return m_broadphaseProxy;
}
btBroadphaseProxy* GetBroadphaseProxy()
btBroadphaseProxy* getBroadphaseProxy()
{
return m_broadphaseProxy;
}
void SetBroadphaseProxy(btBroadphaseProxy* broadphaseProxy)
void setBroadphaseProxy(btBroadphaseProxy* broadphaseProxy)
{
m_broadphaseProxy = broadphaseProxy;
}

10
src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
View File

@@ -54,15 +54,15 @@ void btSimpleDynamicsWorld::stepSimulation(float timeStep)
predictUnconstraintMotion(timeStep);
///perform collision detection
PerformDiscreteCollisionDetection();
performDiscreteCollisionDetection();
///solve contact constraints
btPersistentManifold** manifoldPtr = ((btCollisionDispatcher*)m_dispatcher1)->getInternalManifoldPointer();
int numManifolds = m_dispatcher1->GetNumManifolds();
int numManifolds = m_dispatcher1->getNumManifolds();
btContactSolverInfo infoGlobal;
infoGlobal.m_timeStep = timeStep;
btIDebugDraw* debugDrawer=0;
m_constraintSolver->SolveGroup(manifoldPtr, numManifolds,infoGlobal,debugDrawer);
m_constraintSolver->solveGroup(manifoldPtr, numManifolds,infoGlobal,debugDrawer);
///integrate transforms
integrateTransforms(timeStep);
@@ -85,9 +85,9 @@ void btSimpleDynamicsWorld::updateAabbs()
if (body->IsActive() && (!body->IsStatic()))
{
btPoint3 minAabb,maxAabb;
colObj->m_collisionShape->GetAabb(colObj->m_worldTransform, minAabb,maxAabb);
colObj->m_collisionShape->getAabb(colObj->m_worldTransform, minAabb,maxAabb);
btSimpleBroadphase* bp = (btSimpleBroadphase*)m_pairCache;
bp->SetAabb(body->m_broadphaseHandle,minAabb,maxAabb);
bp->setAabb(body->m_broadphaseHandle,minAabb,maxAabb);
}
}
}