Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 21:03:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13304 from sabrina-shanman/btghostraytest

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/physics/src/CharacterGhostObject.cpp
View file

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

2
libraries/physics/src/CharacterGhostObject.h
View file

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