godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21197 from JPTeasdale/input-picking-bug

Browse Source 
Bullet ray picking should ignore objects with input_ray_pickable=false
This commit is contained in:
Rémi Verschelde 2018-08-20 09:06:29 +02:00 committed by GitHub
commit 89f0d826ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/bullet/godot_result_callbacks.cpp
View File

@ -51,8 +51,8 @@ bool GodotClosestRayResultCallback::needsCollision(btBroadphaseProxy *proxy0) co
if (needs) { if (needs) {
btCollisionObject *btObj = static_cast<btCollisionObject *>(proxy0->m_clientObject); btCollisionObject *btObj = static_cast<btCollisionObject *>(proxy0->m_clientObject);
CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer()); CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
if (m_pickRay && gObj->is_ray_pickable()) { if (m_pickRay && !gObj->is_ray_pickable()) {
return true; return false;
} else if (m_exclude->has(gObj->get_self())) { } else if (m_exclude->has(gObj->get_self())) {
return false; return false;
} }