Showing the changes to libraries/physics/src/CharacterController.cpp (1 of 122 files). Show all
Unified · Split
| @@ -36,7 +36,7 @@ public: · 35 unmodified lines | |||
| 36 | m_collisionFilterGroup = BULLET_COLLISION_GROUP_MY_AVATAR; | 36 | m_collisionFilterGroup = BULLET_COLLISION_GROUP_MY_AVATAR; |
| 37 | m_collisionFilterMask = BULLET_COLLISION_MASK_MY_AVATAR; | 37 | m_collisionFilterMask = BULLET_COLLISION_MASK_MY_AVATAR; |
| 38 | } | 38 | } |
| 39 | virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace) { | 39 | virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace) override { |
| 40 | if (rayResult.m_collisionObject == _me) { | 40 | if (rayResult.m_collisionObject == _me) { |
| 41 | return 1.0f; | 41 | return 1.0f; |
| 42 | } | 42 | } |