diff options
| author | Andrea Catania <info@andreacatania.com> | 2018-07-23 16:37:07 +0200 |
|---|---|---|
| committer | Andrea Catania <info@andreacatania.com> | 2018-08-07 19:38:04 +0200 |
| commit | 5e65e28eed1398cceb4b77cb99ba6578115953db (patch) | |
| tree | 2b4ae296db3d7763f2cf071dc87340ae56585d48 /modules/bullet/bullet_physics_server.cpp | |
| parent | 1ad20dc2f13001d95e91cb2089571028f44db11a (diff) | |
| download | redot-engine-5e65e28eed1398cceb4b77cb99ba6578115953db.tar.gz | |
Removed physics material combination mode. Added rough and absorbent parameter to material. Fixed 'change' signal connection
Diffstat (limited to 'modules/bullet/bullet_physics_server.cpp')
| -rw-r--r-- | modules/bullet/bullet_physics_server.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index 77484c9efc..54431f93f1 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -647,20 +647,6 @@ float BulletPhysicsServer::body_get_param(RID p_body, BodyParameter p_param) con return body->get_param(p_param); } -void BulletPhysicsServer::body_set_combine_mode(RID p_body, BodyParameter p_param, CombineMode p_mode) { - RigidBodyBullet *body = rigid_body_owner.get(p_body); - ERR_FAIL_COND(!body); - - body->set_combine_mode(p_param, p_mode); -} - -PhysicsServer::CombineMode BulletPhysicsServer::body_get_combine_mode(RID p_body, BodyParameter p_param) const { - RigidBodyBullet *body = rigid_body_owner.get(p_body); - ERR_FAIL_COND_V(!body, COMBINE_MODE_INHERIT); - - return body->get_combine_mode(p_param); -} - void BulletPhysicsServer::body_set_kinematic_safe_margin(RID p_body, real_t p_margin) { RigidBodyBullet *body = rigid_body_owner.get(p_body); ERR_FAIL_COND(!body); |