Changeset 8393 for code/trunk/src/external/bullet/BulletDynamics/Character
- Timestamp:
- May 3, 2011, 5:07:42 AM (14 years ago)
- Location:
- code/trunk/src/external/bullet/BulletDynamics/Character
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/external/bullet/BulletDynamics/Character/btCharacterControllerInterface.h
r8351 r8393 14 14 */ 15 15 16 #ifndef CHARACTER_CONTROLLER_INTERFACE_H17 #define CHARACTER_CONTROLLER_INTERFACE_H16 #ifndef BT_CHARACTER_CONTROLLER_INTERFACE_H 17 #define BT_CHARACTER_CONTROLLER_INTERFACE_H 18 18 19 19 #include "LinearMath/btVector3.h" … … 43 43 }; 44 44 45 #endif 45 #endif //BT_CHARACTER_CONTROLLER_INTERFACE_H 46 -
code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp
r8351 r8393 85 85 { 86 86 ///need to transform normal into worldspace 87 hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;87 hitNormalWorld = convexResult.m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal; 88 88 } 89 89 -
code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.h
r8351 r8393 15 15 16 16 17 #ifndef KINEMATIC_CHARACTER_CONTROLLER_H18 #define KINEMATIC_CHARACTER_CONTROLLER_H17 #ifndef BT_KINEMATIC_CHARACTER_CONTROLLER_H 18 #define BT_KINEMATIC_CHARACTER_CONTROLLER_H 19 19 20 20 #include "LinearMath/btVector3.h" … … 160 160 }; 161 161 162 #endif // KINEMATIC_CHARACTER_CONTROLLER_H162 #endif // BT_KINEMATIC_CHARACTER_CONTROLLER_H
Note: See TracChangeset
for help on using the changeset viewer.