New and corrected are override modes.

1 files changed, 23 insertions, 10 deletions

diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp
index d0c5cbc77b..8d82d4a920 100644
--- a/servers/physics_2d/body_2d_sw.cpp
+++ b/servers/physics_2d/body_2d_sw.cpp
@@ -395,6 +395,7 @@ void Body2DSW::_compute_area_gravity_and_dampenings(const Area2DSW *p_area) {
 
 	area_linear_damp += p_area->get_linear_damp();
 	area_angular_damp += p_area->get_angular_damp();
+	printf("%f\n",gravity.y);
 }
 
 void Body2DSW::integrate_forces(real_t p_step) {
@@ -403,27 +404,39 @@ void Body2DSW::integrate_forces(real_t p_step) {
 		return;
 
 	Area2DSW *def_area = get_space()->get_default_area();
-	Area2DSW *damp_area = def_area;
+	// Area2DSW *damp_area = def_area;
 	ERR_FAIL_COND(!def_area);
 
 	int ac = areas.size();
-	bool replace = false;
+	bool stopped = false;
 	gravity = Vector2(0,0);
 	area_angular_damp = 0;
 	area_linear_damp = 0;
 	if (ac) {
 		areas.sort();
 		const AreaCMP *aa = &areas[0];
-		damp_area = aa[ac-1].area;
-		for(int i=ac-1;i>=0;i--) {
-			_compute_area_gravity_and_dampenings(aa[i].area);
-			if (aa[i].area->get_space_override_mode() == Physics2DServer::AREA_SPACE_OVERRIDE_REPLACE) {
-				replace = true;
-				break;
+		// damp_area = aa[ac-1].area;
+		for(int i=ac-1;i>=0 && !stopped;i--) {
+			Physics2DServer::AreaSpaceOverrideMode mode=aa[i].area->get_space_override_mode();
+			switch (mode) {
+				case Physics2DServer::AREA_SPACE_OVERRIDE_COMBINE:
+				case Physics2DServer::AREA_SPACE_OVERRIDE_COMBINE_REPLACE: {
+					_compute_area_gravity_and_dampenings(aa[i].area);
+					stopped = mode==Physics2DServer::AREA_SPACE_OVERRIDE_COMBINE_REPLACE;
+				} break;
+				case Physics2DServer::AREA_SPACE_OVERRIDE_REPLACE:
+				case Physics2DServer::AREA_SPACE_OVERRIDE_REPLACE_COMBINE: {
+					gravity = Vector2(0,0);
+					area_angular_damp = 0;
+					area_linear_damp = 0;
+					_compute_area_gravity_and_dampenings(aa[i].area);
+					stopped = mode==Physics2DServer::AREA_SPACE_OVERRIDE_REPLACE;
+				} break;
+				default: {}
 			}
 		}
 	}
-	if( !replace ) {
+	if( !stopped ) {
 		_compute_area_gravity_and_dampenings(def_area);
 	}
 	gravity*=gravity_scale;
@@ -501,7 +514,7 @@ void Body2DSW::integrate_forces(real_t p_step) {
 		_update_shapes_with_motion(motion);
 	}
 
-	damp_area=NULL; // clear the area, so it is set in the next frame
+	// damp_area=NULL; // clear the area, so it is set in the next frame
 	def_area=NULL; // clear the area, so it is set in the next frame
 	contact_count=0;