From 5e65e28eed1398cceb4b77cb99ba6578115953db Mon Sep 17 00:00:00 2001 From: Andrea Catania Date: Mon, 23 Jul 2018 16:37:07 +0200 Subject: Removed physics material combination mode. Added rough and absorbent parameter to material. Fixed 'change' signal connection --- servers/physics/physics_server_sw.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'servers/physics/physics_server_sw.cpp') diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index f1e0cbef29..593218dd5d 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -701,20 +701,6 @@ real_t PhysicsServerSW::body_get_param(RID p_body, BodyParameter p_param) const return body->get_param(p_param); }; -void PhysicsServerSW::body_set_combine_mode(RID p_body, BodyParameter p_param, CombineMode p_mode) { - BodySW *body = body_owner.get(p_body); - ERR_FAIL_COND(!body); - - body->set_combine_mode(p_param, p_mode); -} - -PhysicsServer::CombineMode PhysicsServerSW::body_get_combine_mode(RID p_body, BodyParameter p_param) const { - BodySW *body = body_owner.get(p_body); - ERR_FAIL_COND_V(!body, COMBINE_MODE_INHERIT); - - return body->get_combine_mode(p_param); -} - void PhysicsServerSW::body_set_kinematic_safe_margin(RID p_body, real_t p_margin) { BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); -- cgit v1.2.3