Removed physics material combination mode. Added rough and absorbent parameter to material. Fixed 'change' signal connection

5 files changed, 2 insertions, 76 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);
diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h
index 06769106c3..e931915bba 100644
--- a/modules/bullet/bullet_physics_server.h
+++ b/modules/bullet/bullet_physics_server.h
@@ -213,9 +213,6 @@ public:
 	virtual void body_set_param(RID p_body, BodyParameter p_param, float p_value);
 	virtual float body_get_param(RID p_body, BodyParameter p_param) const;
 
-	virtual void body_set_combine_mode(RID p_body, BodyParameter p_param, CombineMode p_mode);
-	virtual CombineMode body_get_combine_mode(RID p_body, BodyParameter p_param) const;
-
 	virtual void body_set_kinematic_safe_margin(RID p_body, real_t p_margin);
 	virtual real_t body_get_kinematic_safe_margin(RID p_body) const;
 
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp
index 19fad283af..2fc96a77b5 100644
--- a/modules/bullet/rigid_body_bullet.cpp
+++ b/modules/bullet/rigid_body_bullet.cpp
@@ -257,8 +257,6 @@ RigidBodyBullet::RigidBodyBullet() :
 		angularDamp(0),
 		can_sleep(true),
 		omit_forces_integration(false),
-		restitution_combine_mode(PhysicsServer::COMBINE_MODE_INHERIT),
-		friction_combine_mode(PhysicsServer::COMBINE_MODE_INHERIT),
 		force_integration_callback(NULL),
 		isTransformChanged(false),
 		previousActiveState(true),
@@ -752,22 +750,6 @@ Vector3 RigidBodyBullet::get_angular_velocity() const {
 	return gVec;
 }
 
-void RigidBodyBullet::set_combine_mode(const PhysicsServer::BodyParameter p_param, const PhysicsServer::CombineMode p_mode) {
-	if (p_param == PhysicsServer::BODY_PARAM_BOUNCE) {
-		restitution_combine_mode = p_mode;
-	} else {
-		friction_combine_mode = p_mode;
-	}
-}
-
-PhysicsServer::CombineMode RigidBodyBullet::get_combine_mode(PhysicsServer::BodyParameter p_param) const {
-	if (p_param == PhysicsServer::BODY_PARAM_BOUNCE) {
-		return restitution_combine_mode;
-	} else {
-		return friction_combine_mode;
-	}
-}
-
 void RigidBodyBullet::set_transform__bullet(const btTransform &p_global_transform) {
 	if (mode == PhysicsServer::BODY_MODE_KINEMATIC) {
 		// The kinematic use MotionState class
diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h
index 911e93bfef..b9511243c7 100644
--- a/modules/bullet/rigid_body_bullet.h
+++ b/modules/bullet/rigid_body_bullet.h
@@ -200,9 +200,6 @@ private:
 	bool can_sleep;
 	bool omit_forces_integration;
 
-	PhysicsServer::CombineMode restitution_combine_mode;
-	PhysicsServer::CombineMode friction_combine_mode;
-
 	Vector<CollisionData> collisions;
 	// these parameters are used to avoid vector resize
 	int maxCollisionsDetection;
@@ -298,12 +295,6 @@ public:
 	void set_angular_velocity(const Vector3 &p_velocity);
 	Vector3 get_angular_velocity() const;
 
-	void set_combine_mode(const PhysicsServer::BodyParameter p_param, const PhysicsServer::CombineMode p_mode);
-	PhysicsServer::CombineMode get_combine_mode(PhysicsServer::BodyParameter p_param) const;
-
-	_FORCE_INLINE_ PhysicsServer::CombineMode get_restitution_combine_mode() const { return restitution_combine_mode; }
-	_FORCE_INLINE_ PhysicsServer::CombineMode get_friction_combine_mode() const { return friction_combine_mode; }
-
 	virtual void set_transform__bullet(const btTransform &p_global_transform);
 	virtual const btTransform &get_transform__bullet() const;
 
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
index 331c4a5eba..9d87e7f23b 100644
--- a/modules/bullet/space_bullet.cpp
+++ b/modules/bullet/space_bullet.cpp
@@ -550,42 +550,12 @@ BulletPhysicsDirectSpaceState *SpaceBullet::get_direct_state() {
 
 btScalar calculateGodotCombinedRestitution(const btCollisionObject *body0, const btCollisionObject *body1) {
 
-	const PhysicsServer::CombineMode cm = static_cast<RigidBodyBullet *>(body0->getUserPointer())->get_restitution_combine_mode();
-
-	switch (cm) {
-		case PhysicsServer::COMBINE_MODE_INHERIT:
-			if (static_cast<RigidBodyBullet *>(body1->getUserPointer())->get_restitution_combine_mode() != PhysicsServer::COMBINE_MODE_INHERIT)
-				return calculateGodotCombinedRestitution(body1, body0);
-			// else use MAX [This is used when the two bodies doesn't use physical material]
-		case PhysicsServer::COMBINE_MODE_MAX:
-			return MAX(body0->getRestitution(), body1->getRestitution());
-		case PhysicsServer::COMBINE_MODE_MIN:
-			return MIN(body0->getRestitution(), body1->getRestitution());
-		case PhysicsServer::COMBINE_MODE_MULTIPLY:
-			return body0->getRestitution() * body1->getRestitution();
-		default: // Is always PhysicsServer::COMBINE_MODE_AVERAGE:
-			return (body0->getRestitution() + body1->getRestitution()) / 2;
-	}
+	return CLAMP(body0->getRestitution() + body1->getRestitution(), 0, 1);
 }
 
 btScalar calculateGodotCombinedFriction(const btCollisionObject *body0, const btCollisionObject *body1) {
 
-	const PhysicsServer::CombineMode cm = static_cast<RigidBodyBullet *>(body0->getUserPointer())->get_friction_combine_mode();
-
-	switch (cm) {
-		case PhysicsServer::COMBINE_MODE_INHERIT:
-			if (static_cast<RigidBodyBullet *>(body1->getUserPointer())->get_friction_combine_mode() != PhysicsServer::COMBINE_MODE_INHERIT)
-				return calculateGodotCombinedFriction(body1, body0);
-			// else use MULTIPLY [This is used when the two bodies doesn't use physical material]
-		case PhysicsServer::COMBINE_MODE_MULTIPLY:
-			return body0->getFriction() * body1->getFriction();
-		case PhysicsServer::COMBINE_MODE_MAX:
-			return MAX(body0->getFriction(), body1->getFriction());
-		case PhysicsServer::COMBINE_MODE_MIN:
-			return MIN(body0->getFriction(), body1->getFriction());
-		default: // Is always PhysicsServer::COMBINE_MODE_AVERAGE:
-			return (body0->getFriction() * body1->getFriction()) / 2;
-	}
+	return ABS(MIN(body0->getFriction(), body1->getFriction()));
 }
 
 void SpaceBullet::create_empty_world(bool p_create_soft_world) {