aboutsummaryrefslogtreecommitdiff
path: root/modules/bullet/space_bullet.cpp
diff options
context:
space:
mode:
authorPaolo Perkovic2018-02-01 09:57:10 +0100
committerHein-Pieter van Braam2018-02-04 20:10:13 +0100
commit7de47fbabb28198b41aa475e64eaa0fbcfff126a (patch)
treeb9181261ccf7d6aa1bbb43bdfb47a62a3107c240 /modules/bullet/space_bullet.cpp
parent62dc7ba82f56c3bc1bde46e01950f449cf960910 (diff)
downloadgodot-7de47fbabb28198b41aa475e64eaa0fbcfff126a.tar.gz
godot-7de47fbabb28198b41aa475e64eaa0fbcfff126a.tar.zst
godot-7de47fbabb28198b41aa475e64eaa0fbcfff126a.zip
Fix inconsistencies and typos in argument names
(cherry picked from commit 08d4bfacafa8abe435d51a6afecb276030a23280)
Diffstat (limited to 'modules/bullet/space_bullet.cpp')
-rw-r--r--modules/bullet/space_bullet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
index d60d8ba0e..6f0cda895 100644
--- a/modules/bullet/space_bullet.cpp
+++ b/modules/bullet/space_bullet.cpp
@@ -116,7 +116,7 @@ bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const V
}
}
-int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *p_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) {
+int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) {
if (p_result_max <= 0)
return 0;
@@ -138,7 +138,7 @@ int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Tra
collision_object.setCollisionShape(btConvex);
collision_object.setWorldTransform(bt_xform);
- GodotAllContactResultCallback btQuery(&collision_object, p_results, p_result_max, &p_exclude);
+ GodotAllContactResultCallback btQuery(&collision_object, r_results, p_result_max, &p_exclude);
btQuery.m_collisionFilterGroup = 0;
btQuery.m_collisionFilterMask = p_collision_mask;
btQuery.m_closestDistanceThreshold = 0;