aboutsummaryrefslogtreecommitdiff
path: root/servers/physics/physics_server_sw.cpp
diff options
context:
space:
mode:
authorEric Rybicki2017-11-08 22:35:47 +0100
committerEric Rybicki2017-11-10 22:33:54 +0100
commitbd5df841990e7410593d8aae5bee10bab16f6f43 (patch)
tree1d1d46e94a1ee19dcced55840975ab92b7101ad3 /servers/physics/physics_server_sw.cpp
parent19b1ff0fc5f7acce23176ad6c8752604357472f0 (diff)
downloadgodot-bd5df841990e7410593d8aae5bee10bab16f6f43.tar.gz
godot-bd5df841990e7410593d8aae5bee10bab16f6f43.tar.zst
godot-bd5df841990e7410593d8aae5bee10bab16f6f43.zip
Allow double-axis lock in RigidBody and KinematicBody
Diffstat (limited to 'servers/physics/physics_server_sw.cpp')
-rw-r--r--servers/physics/physics_server_sw.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp
index ce63d8461..290930836 100644
--- a/servers/physics/physics_server_sw.cpp
+++ b/servers/physics/physics_server_sw.cpp
@@ -794,19 +794,19 @@ 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, BodyAxisLock p_lock) {
+void PhysicsServerSW::body_set_axis_lock(RID p_body, int axis, bool lock) {
BodySW *body = body_owner.get(p_body);
ERR_FAIL_COND(!body);
- body->set_axis_lock(p_lock);
+ body->set_axis_lock(axis, lock);
body->wakeup();
}
-PhysicsServerSW::BodyAxisLock PhysicsServerSW::body_get_axis_lock(RID p_body) const {
+bool PhysicsServerSW::body_get_axis_lock(RID p_body) const {
const BodySW *body = body_owner.get(p_body);
- ERR_FAIL_COND_V(!body, BODY_AXIS_LOCK_DISABLED);
+ ERR_FAIL_COND_V(!body, 0);
return body->get_axis_lock();
}