1 files changed, 24 insertions, 31 deletions

diff --git a/modules/bullet/area_bullet.cpp b/modules/bullet/area_bullet.cpp
index 4d727529ef..b35019bea3 100644
--- a/modules/bullet/area_bullet.cpp
+++ b/modules/bullet/area_bullet.cpp
@@ -44,19 +44,7 @@
 */
 
 AreaBullet::AreaBullet() :
-		RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA),
-		monitorable(true),
-		spOv_mode(PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED),
-		spOv_gravityPoint(false),
-		spOv_gravityPointDistanceScale(0),
-		spOv_gravityPointAttenuation(1),
-		spOv_gravityVec(0, -1, 0),
-		spOv_gravityMag(10),
-		spOv_linearDump(0.1),
-		spOv_angularDump(1),
-		spOv_priority(0),
-		isScratched(false) {
-
+		RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA) {
 	btGhost = bulletnew(btGhostObject);
 	reload_shapes();
 	setupBulletCollisionObject(btGhost);
@@ -64,24 +52,24 @@ AreaBullet::AreaBullet() :
 	/// In order to use collision objects as trigger, you have to disable the collision response.
 	set_collision_enabled(false);
 
-	for (int i = 0; i < 5; ++i)
+	for (int i = 0; i < 5; ++i) {
 		call_event_res_ptr[i] = &call_event_res[i];
+	}
 }
 
 AreaBullet::~AreaBullet() {
 	// signal are handled by godot, so just clear without notify
-	for (int i = overlappingObjects.size() - 1; 0 <= i; --i)
+	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
 		overlappingObjects[i].object->on_exit_area(this);
+	}
 }
 
 void AreaBullet::dispatch_callbacks() {
-	if (!isScratched)
-		return;
-	isScratched = false;
+	RigidCollisionObjectBullet::dispatch_callbacks();
 
 	// Reverse order because I've to remove EXIT objects
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
-		OverlappingObjectData &otherObj = overlappingObjects.write[i];
+		OverlappingObjectData &otherObj = overlappingObjects[i];
 
 		switch (otherObj.state) {
 			case OVERLAP_STATE_ENTER:
@@ -102,7 +90,6 @@ void AreaBullet::dispatch_callbacks() {
 }
 
 void AreaBullet::call_event(CollisionObjectBullet *p_otherObject, PhysicsServer3D::AreaBodyStatus p_status) {
-
 	InOutEventCallback &event = eventsCallbacks[static_cast<int>(p_otherObject->getType())];
 	Object *areaGodoObject = ObjectDB::get_instance(event.event_callback_id);
 
@@ -122,15 +109,16 @@ void AreaBullet::call_event(CollisionObjectBullet *p_otherObject, PhysicsServer3
 }
 
 void AreaBullet::scratch() {
-	if (isScratched)
-		return;
-	isScratched = true;
+	if (space != nullptr) {
+		space->add_to_pre_flush_queue(this);
+	}
 }
 
 void AreaBullet::clear_overlaps(bool p_notify) {
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
-		if (p_notify)
+		if (p_notify) {
 			call_event(overlappingObjects[i].object, PhysicsServer3D::AREA_BODY_REMOVED);
+		}
 		overlappingObjects[i].object->on_exit_area(this);
 	}
 	overlappingObjects.clear();
@@ -139,8 +127,9 @@ void AreaBullet::clear_overlaps(bool p_notify) {
 void AreaBullet::remove_overlap(CollisionObjectBullet *p_object, bool p_notify) {
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
 		if (overlappingObjects[i].object == p_object) {
-			if (p_notify)
+			if (p_notify) {
 				call_event(overlappingObjects[i].object, PhysicsServer3D::AREA_BODY_REMOVED);
+			}
 			overlappingObjects[i].object->on_exit_area(this);
 			overlappingObjects.remove(i);
 			break;
@@ -171,7 +160,7 @@ void AreaBullet::main_shape_changed() {
 	btGhost->setCollisionShape(get_main_shape());
 }
 
-void AreaBullet::reload_body() {
+void AreaBullet::do_reload_body() {
 	if (space) {
 		space->remove_area(this);
 		space->add_area(this);
@@ -180,21 +169,25 @@ void AreaBullet::reload_body() {
 
 void AreaBullet::set_space(SpaceBullet *p_space) {
 	// Clear the old space if there is one
+
 	if (space) {
-		isScratched = false;
+		clear_overlaps(false);
 
 		// Remove this object form the physics world
+		space->unregister_collision_object(this);
 		space->remove_area(this);
 	}
 
 	space = p_space;
 
 	if (space) {
-		space->add_area(this);
+		space->register_collision_object(this);
+		reload_body();
+		scratch();
 	}
 }
 
-void AreaBullet::on_collision_filters_change() {
+void AreaBullet::do_reload_collision_filters() {
 	if (space) {
 		space->reload_collision_filters(this);
 	}
@@ -208,13 +201,13 @@ void AreaBullet::add_overlap(CollisionObjectBullet *p_otherObject) {
 
 void AreaBullet::put_overlap_as_exit(int p_index) {
 	scratch();
-	overlappingObjects.write[p_index].state = OVERLAP_STATE_EXIT;
+	overlappingObjects[p_index].state = OVERLAP_STATE_EXIT;
 }
 
 void AreaBullet::put_overlap_as_inside(int p_index) {
 	// This check is required to be sure this body was inside
 	if (OVERLAP_STATE_DIRTY == overlappingObjects[p_index].state) {
-		overlappingObjects.write[p_index].state = OVERLAP_STATE_INSIDE;
+		overlappingObjects[p_index].state = OVERLAP_STATE_INSIDE;
 	}
 }