diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-11 00:13:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 00:13:06 +0100 |
| commit | 5cfafaf09ec88d4d4f4ca0a3f01de1d8fcb4efe0 (patch) | |
| tree | c3e1b3c343e29403d5d4798f7b1622b4b6c4453d /modules/bullet/bullet_physics_server.h | |
| parent | dcc5e21b35efec977539c8e0f5615a30a5fff581 (diff) | |
| parent | 5dee44bbc13605348b65bc74878a5a8be2b50cbd (diff) | |
Merge pull request #14516 from AndreaCatania/patch-2
Implemented physics linear and angular lock
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 ed5acb9041..8a10c87fc6 100644 --- a/modules/bullet/bullet_physics_server.h +++ b/modules/bullet/bullet_physics_server.h @@ -226,8 +226,8 @@ public: 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); - virtual void body_set_axis_lock(RID p_body, int axis, bool p_lock); - virtual bool body_get_axis_lock(RID p_body) const; + virtual void body_set_axis_lock(RID p_body, BodyAxis p_axis, bool p_lock); + virtual bool body_is_axis_locked(RID p_body, BodyAxis p_axis) const; virtual void body_add_collision_exception(RID p_body, RID p_body_b); virtual void body_remove_collision_exception(RID p_body, RID p_body_b); |