diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-02 18:39:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 18:39:16 +0200 |
| commit | 67e4082b1e73f3cbe518c499eb328b0f68f3419b (patch) | |
| tree | ccb3953feff88ee0c6f7bf2013cb49e0404c2247 /modules/bullet/bullet_physics_server.h | |
| parent | d12124856292e80c9069593ed263d72d01f60d02 (diff) | |
| parent | ba27deef06f0152a59c86e3b0ab3ebb0976344ad (diff) | |
Merge pull request #37350 from aaronfranke/force-impulse
Refactor physics force and impulse code to use (force, position) order
Diffstat (limited to 'modules/bullet/bullet_physics_server.h')
| -rw-r--r-- | modules/bullet/bullet_physics_server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h index 558d1ce5f7..8e8b33a4b8 100644 --- a/modules/bullet/bullet_physics_server.h +++ b/modules/bullet/bullet_physics_server.h @@ -223,11 +223,11 @@ public: virtual Vector3 body_get_applied_torque(RID p_body) const; virtual void body_add_central_force(RID p_body, const Vector3 &p_force); - virtual void body_add_force(RID p_body, const Vector3 &p_force, const Vector3 &p_pos); + virtual void body_add_force(RID p_body, const Vector3 &p_force, const Vector3 &p_position = Vector3()); virtual void body_add_torque(RID p_body, const Vector3 &p_torque); virtual void body_apply_central_impulse(RID p_body, const Vector3 &p_impulse); - virtual void body_apply_impulse(RID p_body, const Vector3 &p_pos, const Vector3 &p_impulse); + virtual void body_apply_impulse(RID p_body, const Vector3 &p_impulse, const Vector3 &p_position = Vector3()); virtual void body_apply_torque_impulse(RID p_body, const Vector3 &p_impulse); virtual void body_set_axis_velocity(RID p_body, const Vector3 &p_axis_velocity); |