From 9ac1443b8329e5ed85bfe20dda3b7e07685da00f Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Tue, 5 Jun 2018 11:17:17 -0700 Subject: [PATCH 1/3] Use optimized Bullet raytest function in CharacterGhostObject::rayTest() --- libraries/physics/src/CharacterGhostObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/CharacterGhostObject.cpp b/libraries/physics/src/CharacterGhostObject.cpp index a771a52384..0e1ea22375 100755 --- a/libraries/physics/src/CharacterGhostObject.cpp +++ b/libraries/physics/src/CharacterGhostObject.cpp @@ -69,7 +69,7 @@ bool CharacterGhostObject::rayTest(const btVector3& start, const btVector3& end, CharacterRayResult& result) const { if (_world && _inWorld) { - _world->rayTest(start, end, result); + this->btGhostObject::rayTest(start, end, result); } return result.hasHit(); } From d4d8f36e442230b5bada305e6bb35fcd9a860431 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Mon, 11 Jun 2018 15:40:39 -0700 Subject: [PATCH 2/3] Change CharacterGhostObject to use base btGhostObject class instead of btPairCachingGhostObject --- libraries/physics/src/CharacterGhostObject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/CharacterGhostObject.h b/libraries/physics/src/CharacterGhostObject.h index 44ab5c938a..a6efea8752 100755 --- a/libraries/physics/src/CharacterGhostObject.h +++ b/libraries/physics/src/CharacterGhostObject.h @@ -23,7 +23,7 @@ class CharacterGhostShape; -class CharacterGhostObject : public btPairCachingGhostObject { +class CharacterGhostObject : public btGhostObject { public: CharacterGhostObject() { } ~CharacterGhostObject(); From baf0df05cd1e13376cc6fac83a4fe5eb2a0245e1 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 14 Jun 2018 13:16:46 -0700 Subject: [PATCH 3/3] Remove unnecessary 'this->' in rayTest parent function call --- libraries/physics/src/CharacterGhostObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/CharacterGhostObject.cpp b/libraries/physics/src/CharacterGhostObject.cpp index 0e1ea22375..78b1d9c08f 100755 --- a/libraries/physics/src/CharacterGhostObject.cpp +++ b/libraries/physics/src/CharacterGhostObject.cpp @@ -69,7 +69,7 @@ bool CharacterGhostObject::rayTest(const btVector3& start, const btVector3& end, CharacterRayResult& result) const { if (_world && _inWorld) { - this->btGhostObject::rayTest(start, end, result); + btGhostObject::rayTest(start, end, result); } return result.hasHit(); }