diff options
| author | Rémi Verschelde | 2017-12-11 00:13:06 +0100 |
|---|---|---|
| committer | GitHub | 2017-12-11 00:13:06 +0100 |
| commit | 5cfafaf09ec88d4d4f4ca0a3f01de1d8fcb4efe0 (patch) | |
| tree | c3e1b3c343e29403d5d4798f7b1622b4b6c4453d /servers/physics/physics_server_sw.cpp | |
| parent | dcc5e21b35efec977539c8e0f5615a30a5fff581 (diff) | |
| parent | 5dee44bbc13605348b65bc74878a5a8be2b50cbd (diff) | |
| download | godot-5cfafaf09ec88d4d4f4ca0a3f01de1d8fcb4efe0.tar.gz godot-5cfafaf09ec88d4d4f4ca0a3f01de1d8fcb4efe0.tar.zst godot-5cfafaf09ec88d4d4f4ca0a3f01de1d8fcb4efe0.zip | |
Merge pull request #14516 from AndreaCatania/patch-2
Implemented physics linear and angular lock
Diffstat (limited to 'servers/physics/physics_server_sw.cpp')
| -rw-r--r-- | servers/physics/physics_server_sw.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index 290930836..0a1d52483 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -794,20 +794,20 @@ void PhysicsServerSW::body_set_axis_velocity(RID p_body, const Vector3 &p_axis_v body->wakeup(); }; -void PhysicsServerSW::body_set_axis_lock(RID p_body, int axis, bool lock) { +void PhysicsServerSW::body_set_axis_lock(RID p_body, BodyAxis p_axis, bool lock) { BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); - body->set_axis_lock(axis, lock); + body->set_axis_lock(p_axis, lock); body->wakeup(); } -bool PhysicsServerSW::body_get_axis_lock(RID p_body) const { +bool PhysicsServerSW::body_is_axis_locked(RID p_body, BodyAxis p_axis) const { const BodySW *body = body_owner.get(p_body); ERR_FAIL_COND_V(!body, 0); - return body->get_axis_lock(); + return body->is_axis_locked(p_axis); } void PhysicsServerSW::body_add_collision_exception(RID p_body, RID p_body_b) { |