diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-27 08:46:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 08:46:54 +0100 |
| commit | d13c292c1afb55bc913369bc2f08f0f2505f90b9 (patch) | |
| tree | c7e8e133162000e18e3b043d0d1bed5121eeaebf /modules/bullet | |
| parent | 73847cc0bb9c8c7eee9c5f91cbd1ba353f81383b (diff) | |
| parent | 572367552c9fc1bf28d19fc8b89861c63a196ccb (diff) | |
Merge pull request #24565 from daniel-abbott/bullet_rest_info_return_normals_fix
`GodotRestInfoContactResultCallback::addSingleResult` now returns normal
Diffstat (limited to 'modules/bullet')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index 0117bb375f..3dc9f3fce5 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -304,6 +304,7 @@ btScalar GodotRestInfoContactResultCallback::addSingleResult(btManifoldPoint &cp colObj = static_cast<CollisionObjectBullet *>(colObj1Wrap->getCollisionObject()->getUserPointer()); m_result->shape = cp.m_index1; B_TO_G(cp.getPositionWorldOnB(), m_result->point); + B_TO_G(cp.m_normalWorldOnB, m_result->normal); m_rest_info_bt_point = cp.getPositionWorldOnB(); m_rest_info_collision_object = colObj1Wrap->getCollisionObject(); } else { |