1 files changed, 13 insertions, 22 deletions

diff --git a/scene/3d/collision_polygon_3d.cpp b/scene/3d/collision_polygon_3d.cpp
index 982205137b..e2d11c740a 100644
--- a/scene/3d/collision_polygon_3d.cpp
+++ b/scene/3d/collision_polygon_3d.cpp
@@ -31,22 +31,25 @@
 #include "collision_polygon_3d.h"
 
 #include "collision_object_3d.h"
+#include "core/math/geometry_2d.h"
 #include "scene/resources/concave_polygon_shape_3d.h"
 #include "scene/resources/convex_polygon_shape_3d.h"
 
 void CollisionPolygon3D::_build_polygon() {
-
-	if (!parent)
+	if (!parent) {
 		return;
+	}
 
 	parent->shape_owner_clear_shapes(owner_id);
 
-	if (polygon.size() == 0)
+	if (polygon.size() == 0) {
 		return;
+	}
 
-	Vector<Vector<Vector2>> decomp = Geometry::decompose_polygon_in_convex(polygon);
-	if (decomp.size() == 0)
+	Vector<Vector<Vector2>> decomp = Geometry2D::decompose_polygon_in_convex(polygon);
+	if (decomp.size() == 0) {
 		return;
+	}
 
 	//here comes the sun, lalalala
 	//decompose concave into multiple convex polygons and add them
@@ -60,7 +63,6 @@ void CollisionPolygon3D::_build_polygon() {
 			Vector3 *w = cp.ptrw();
 			int idx = 0;
 			for (int j = 0; j < cs; j++) {
-
 				Vector2 d = decomp[i][j];
 				w[idx++] = Vector3(d.x, d.y, depth * 0.5);
 				w[idx++] = Vector3(d.x, d.y, -depth * 0.5);
@@ -74,17 +76,15 @@ void CollisionPolygon3D::_build_polygon() {
 }
 
 void CollisionPolygon3D::_update_in_shape_owner(bool p_xform_only) {
-
 	parent->shape_owner_set_transform(owner_id, get_transform());
-	if (p_xform_only)
+	if (p_xform_only) {
 		return;
+	}
 	parent->shape_owner_set_disabled(owner_id, disabled);
 }
 
 void CollisionPolygon3D::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_PARENTED: {
 			parent = Object::cast_to<CollisionObject3D>(get_parent());
 			if (parent) {
@@ -94,14 +94,12 @@ void CollisionPolygon3D::_notification(int p_what) {
 			}
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
-
 			if (parent) {
 				_update_in_shape_owner();
 			}
 
 		} break;
 		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: {
-
 			if (parent) {
 				_update_in_shape_owner(true);
 			}
@@ -112,13 +110,12 @@ void CollisionPolygon3D::_notification(int p_what) {
 				parent->remove_shape_owner(owner_id);
 			}
 			owner_id = 0;
-			parent = NULL;
+			parent = nullptr;
 		} break;
 	}
 }
 
 void CollisionPolygon3D::set_polygon(const Vector<Point2> &p_polygon) {
-
 	polygon = p_polygon;
 	if (parent) {
 		_build_polygon();
@@ -128,24 +125,20 @@ void CollisionPolygon3D::set_polygon(const Vector<Point2> &p_polygon) {
 }
 
 Vector<Point2> CollisionPolygon3D::get_polygon() const {
-
 	return polygon;
 }
 
 AABB CollisionPolygon3D::get_item_rect() const {
-
 	return aabb;
 }
 
 void CollisionPolygon3D::set_depth(float p_depth) {
-
 	depth = p_depth;
 	_build_polygon();
 	update_gizmo();
 }
 
 float CollisionPolygon3D::get_depth() const {
-
 	return depth;
 }
 
@@ -163,7 +156,6 @@ bool CollisionPolygon3D::is_disabled() const {
 }
 
 String CollisionPolygon3D::get_configuration_warning() const {
-
 	if (!Object::cast_to<CollisionObject3D>(get_parent())) {
 		return TTR("CollisionPolygon3D only serves to provide a collision shape to a CollisionObject3D derived node. Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, KinematicBody3D, etc. to give them a shape.");
 	}
@@ -178,8 +170,8 @@ String CollisionPolygon3D::get_configuration_warning() const {
 bool CollisionPolygon3D::_is_editable_3d_polygon() const {
 	return true;
 }
-void CollisionPolygon3D::_bind_methods() {
 
+void CollisionPolygon3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_depth", "depth"), &CollisionPolygon3D::set_depth);
 	ClassDB::bind_method(D_METHOD("get_depth"), &CollisionPolygon3D::get_depth);
 
@@ -197,11 +189,10 @@ void CollisionPolygon3D::_bind_methods() {
 }
 
 CollisionPolygon3D::CollisionPolygon3D() {
-
 	aabb = AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2));
 	depth = 1.0;
 	set_notify_local_transform(true);
-	parent = NULL;
+	parent = nullptr;
 	owner_id = 0;
 	disabled = false;
 }