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_server.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_server.cpp')
| -rw-r--r-- | servers/physics_server.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index 9a9b20bf2..2aef12f04 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -473,7 +473,7 @@ void PhysicsServer::_bind_methods() { ClassDB::bind_method(D_METHOD("body_set_axis_velocity", "body", "axis_velocity"), &PhysicsServer::body_set_axis_velocity); ClassDB::bind_method(D_METHOD("body_set_axis_lock", "body", "axis", "lock"), &PhysicsServer::body_set_axis_lock); - ClassDB::bind_method(D_METHOD("body_get_axis_lock", "body"), &PhysicsServer::body_get_axis_lock); + ClassDB::bind_method(D_METHOD("body_is_axis_locked", "body", "axis"), &PhysicsServer::body_is_axis_locked); ClassDB::bind_method(D_METHOD("body_add_collision_exception", "body", "excepted_body"), &PhysicsServer::body_add_collision_exception); ClassDB::bind_method(D_METHOD("body_remove_collision_exception", "body", "excepted_body"), &PhysicsServer::body_remove_collision_exception); @@ -702,6 +702,12 @@ void PhysicsServer::_bind_methods() { BIND_ENUM_CONSTANT(SPACE_PARAM_BODY_TIME_TO_SLEEP); BIND_ENUM_CONSTANT(SPACE_PARAM_BODY_ANGULAR_VELOCITY_DAMP_RATIO); BIND_ENUM_CONSTANT(SPACE_PARAM_CONSTRAINT_DEFAULT_BIAS); + BIND_ENUM_CONSTANT(BODY_AXIS_LINEAR_X); + BIND_ENUM_CONSTANT(BODY_AXIS_LINEAR_Y); + BIND_ENUM_CONSTANT(BODY_AXIS_LINEAR_Z); + BIND_ENUM_CONSTANT(BODY_AXIS_ANGULAR_X); + BIND_ENUM_CONSTANT(BODY_AXIS_ANGULAR_Y); + BIND_ENUM_CONSTANT(BODY_AXIS_ANGULAR_Z); } PhysicsServer::PhysicsServer() { |