diff options
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h')
-rw-r--r-- | extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h index 8575f8506f1..7ffa2c07ee6 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h +++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h @@ -23,12 +23,12 @@ class btOverlappingPairCache; class btConstraintSolver; class btSimulationIslandManager; class btTypedConstraint; -#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" +#include "../ConstraintSolver/btContactSolverInfo.h" class btRaycastVehicle; class btIDebugDraw; +#include "../../LinearMath/btAlignedObjectArray.h" -#include <vector> ///btDiscreteDynamicsWorld provides discrete rigid body simulation ///those classes replace the obsolete CcdPhysicsEnvironment/CcdPhysicsController @@ -40,14 +40,14 @@ protected: btSimulationIslandManager* m_islandManager; - std::vector<btTypedConstraint*> m_constraints; + btAlignedObjectArray<btTypedConstraint*> m_constraints; btIDebugDraw* m_debugDrawer; btVector3 m_gravity; //for variable timesteps - float m_localTime; + btScalar m_localTime; //for variable timesteps bool m_ownsIslandManager; @@ -56,29 +56,29 @@ protected: btContactSolverInfo m_solverInfo; - std::vector<btRaycastVehicle*> m_vehicles; + btAlignedObjectArray<btRaycastVehicle*> m_vehicles; int m_profileTimings; - void predictUnconstraintMotion(float timeStep); + void predictUnconstraintMotion(btScalar timeStep); - void integrateTransforms(float timeStep); + void integrateTransforms(btScalar timeStep); void calculateSimulationIslands(); void solveConstraints(btContactSolverInfo& solverInfo); - void updateActivationState(float timeStep); + void updateActivationState(btScalar timeStep); - void updateVehicles(float timeStep); + void updateVehicles(btScalar timeStep); - void startProfiling(float timeStep); + void startProfiling(btScalar timeStep); - virtual void internalSingleStepSimulation( float timeStep); + virtual void internalSingleStepSimulation( btScalar timeStep); void synchronizeMotionStates(); - void saveKinematicState(float timeStep); + void saveKinematicState(btScalar timeStep); public: @@ -90,7 +90,7 @@ public: virtual ~btDiscreteDynamicsWorld(); ///if maxSubSteps > 0, it will interpolate motion between fixedTimeStep's - virtual int stepSimulation( float timeStep,int maxSubSteps=1, float fixedTimeStep=1.f/60.f); + virtual int stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.)); virtual void updateAabbs(); |