diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-11 02:49:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-11 02:49:50 +0400 |
commit | 8c1cb10cfd5e6f5edcb23a8a28db2287ed463eb4 (patch) | |
tree | 12aadbcd438d9b7bc13a9537a4c84c34f92ae03c /source/gameengine/Physics/Bullet | |
parent | 3b399edf7d903674a1c577bc69053e37f4d35933 (diff) |
code cleanup: unused vars, make other vars static.
Diffstat (limited to 'source/gameengine/Physics/Bullet')
-rw-r--r-- | source/gameengine/Physics/Bullet/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 10 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 9 |
3 files changed, 2 insertions, 19 deletions
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt index c5b601361d9..89d7f41ab4d 100644 --- a/source/gameengine/Physics/Bullet/CMakeLists.txt +++ b/source/gameengine/Physics/Bullet/CMakeLists.txt @@ -59,7 +59,7 @@ set(SRC ) if(WITH_BULLET) - list(APPEND INC + list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} ) add_definitions(-DWITH_BULLET) diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 08ea9706eba..111cfdb2c44 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -64,8 +64,6 @@ float gLinearSleepingTreshold; float gAngularSleepingTreshold; -btVector3 startVel(0,0,0);//-10000); - BlenderBulletCharacterController::BlenderBulletCharacterController(btMotionState *motionState, btPairCachingGhostObject *ghost, btConvexShape* shape, float stepHeight) : btKinematicCharacterController(ghost,shape,stepHeight,2), m_motionState(motionState), @@ -144,14 +142,6 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) m_characterController = 0; CreateRigidbody(); - - -///??? -/*#ifdef WIN32 - if (GetRigidBody() && !GetRigidBody()->isStaticObject()) - GetRigidBody()->setLinearVelocity(startVel); -#endif*/ - } btTransform& CcdPhysicsController::GetTransformFromMotionState(PHY_IMotionState* motionState) diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 29b526067fd..e92f7bd1268 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -45,14 +45,12 @@ subject to the following restrictions: #define CCD_CONSTRAINT_DISABLE_LINKED_COLLISION 0x80 -bool useIslands = true; - #ifdef NEW_BULLET_VEHICLE_SUPPORT #include "BulletDynamics/Vehicle/btRaycastVehicle.h" #include "BulletDynamics/Vehicle/btVehicleRaycaster.h" #include "BulletDynamics/Vehicle/btWheelInfo.h" #include "PHY_IVehicle.h" -btRaycastVehicle::btVehicleTuning gTuning; +static btRaycastVehicle::btVehicleTuning gTuning; #endif //NEW_BULLET_VEHICLE_SUPPORT #include "LinearMath/btAabbUtil2.h" @@ -2352,11 +2350,6 @@ PHY_ICharacter* CcdPhysicsEnvironment::getCharacterController(KX_GameObject *ob) return NULL; } -int currentController = 0; -int numController = 0; - - - PHY_IPhysicsController* CcdPhysicsEnvironment::CreateSphereController(float radius,const MT_Vector3& position) { |