1 files changed, 40 insertions, 2 deletions

diff --git a/servers/physics_2d/body_pair_2d_sw.cpp b/servers/physics_2d/body_pair_2d_sw.cpp
index 61c0e0063f..be8dcf6fa8 100644
--- a/servers/physics_2d/body_pair_2d_sw.cpp
+++ b/servers/physics_2d/body_pair_2d_sw.cpp
@@ -219,6 +219,44 @@ bool BodyPair2DSW::_test_ccd(real_t p_step, Body2DSW *p_A, int p_shape_A, const
 	return true;
 }
 
+real_t combine_bounce(Body2DSW *A, Body2DSW *B) {
+	const Physics2DServer::CombineMode cm = A->get_bounce_combine_mode();
+
+	switch (cm) {
+		case Physics2DServer::COMBINE_MODE_INHERIT:
+			if (B->get_bounce_combine_mode() != Physics2DServer::COMBINE_MODE_INHERIT)
+				return combine_bounce(B, A);
+			// else use MAX [This is used when the two bodies doesn't use physical material]
+		case Physics2DServer::COMBINE_MODE_MAX:
+			return MAX(A->get_bounce(), B->get_bounce());
+		case Physics2DServer::COMBINE_MODE_MIN:
+			return MIN(A->get_bounce(), B->get_bounce());
+		case Physics2DServer::COMBINE_MODE_MULTIPLY:
+			return A->get_bounce() * B->get_bounce();
+		default: // Is always Physics2DServer::COMBINE_MODE_AVERAGE:
+			return (A->get_bounce() + B->get_bounce()) / 2;
+	}
+}
+
+real_t combine_friction(Body2DSW *A, Body2DSW *B) {
+	const Physics2DServer::CombineMode cm = A->get_friction_combine_mode();
+
+	switch (cm) {
+		case Physics2DServer::COMBINE_MODE_INHERIT:
+			if (B->get_friction_combine_mode() != Physics2DServer::COMBINE_MODE_INHERIT)
+				return combine_friction(B, A);
+			// else use Multiply [This is used when the two bodies doesn't use physical material]
+		case Physics2DServer::COMBINE_MODE_MULTIPLY:
+			return A->get_friction() * B->get_friction();
+		case Physics2DServer::COMBINE_MODE_MAX:
+			return MAX(A->get_friction(), B->get_friction());
+		case Physics2DServer::COMBINE_MODE_MIN:
+			return MIN(A->get_friction(), B->get_friction());
+		default: // Is always Physics2DServer::COMBINE_MODE_AVERAGE:
+			return (A->get_friction() + B->get_friction()) / 2;
+	}
+}
+
 bool BodyPair2DSW::setup(real_t p_step) {
 
 	//cannot collide
@@ -432,7 +470,7 @@ bool BodyPair2DSW::setup(real_t p_step) {
 
 #endif
 
-		c.bounce = MAX(A->get_bounce(), B->get_bounce());
+		c.bounce = combine_bounce(A, B);
 		if (c.bounce) {
 
 			Vector2 crA(-A->get_angular_velocity() * c.rA.y, A->get_angular_velocity() * c.rA.x);
@@ -488,7 +526,7 @@ void BodyPair2DSW::solve(real_t p_step) {
 		real_t jnOld = c.acc_normal_impulse;
 		c.acc_normal_impulse = MAX(jnOld + jn, 0.0f);
 
-		real_t friction = A->get_friction() * B->get_friction();
+		real_t friction = combine_friction(A, B);
 
 		real_t jtMax = friction * c.acc_normal_impulse;
 		real_t jt = -vt * c.mass_tangent;