Merge pull request #13304 from sabrina-shanman/btghostraytest

Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
This commit is contained in:
John Conklin II 2018-06-18 10:22:17 -07:00 committed by GitHub
commit 87d26a9d86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -69,7 +69,7 @@ bool CharacterGhostObject::rayTest(const btVector3& start,
const btVector3& end,
CharacterRayResult& result) const {
if (_world && _inWorld) {
_world->rayTest(start, end, result);
btGhostObject::rayTest(start, end, result);
}
return result.hasHit();
}

View file

@ -23,7 +23,7 @@
class CharacterGhostShape;
class CharacterGhostObject : public btPairCachingGhostObject {
class CharacterGhostObject : public btGhostObject {
public:
CharacterGhostObject() { }
~CharacterGhostObject();