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

Merge pull request #59470 from rburing/collide_shape_global 

[3.x] (Bullet) `collide_shape`: return contact points in world space
This commit is contained in:
Rémi Verschelde 2022-03-24 23:30:57 +01:00 committed by GitHub
parent c08e753ef6 1d16153881
commit 78e9441148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/bullet/godot_result_callbacks.cpp
View File

@ -299,12 +299,13 @@ btScalar GodotContactPairContactResultCallback::addSingleResult(btManifoldPoint
return 1; // not used by bullet
}
// In each contact pair, the contact on the shape which was passed to collide_shape (where this callback is used) is put first.
if (m_self_object == colObj0Wrap->getCollisionObject()) {
B_TO_G(cp.m_localPointA, m_results[m_count * 2 + 0]); // Local contact
B_TO_G(cp.m_localPointB, m_results[m_count * 2 + 1]);
B_TO_G(cp.getPositionWorldOnA(), m_results[m_count * 2 + 0]);
B_TO_G(cp.getPositionWorldOnB(), m_results[m_count * 2 + 1]);
} else {
B_TO_G(cp.m_localPointB, m_results[m_count * 2 + 0]); // Local contact
B_TO_G(cp.m_localPointA, m_results[m_count * 2 + 1]);
B_TO_G(cp.getPositionWorldOnB(), m_results[m_count * 2 + 0]);
B_TO_G(cp.getPositionWorldOnA(), m_results[m_count * 2 + 1]);
}
++m_count;