diff options
Diffstat (limited to 'modules/bullet')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 1 | ||||
| -rw-r--r-- | modules/bullet/shape_bullet.cpp | 2 |
2 files changed, 2 insertions, 1 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 { diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp index 2027d8e1eb..55dcd9c323 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -487,7 +487,7 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) { PoolByteArray im_data = l_image->get_data(); - l_heights.resize(l_image->get_width() * l_image->get_width()); + l_heights.resize(l_image->get_width() * l_image->get_height()); PoolRealArray::Write w = l_heights.write(); PoolByteArray::Read r = im_data.read(); |