1 files changed, 7 insertions, 14 deletions

diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp
index 6b1ddec507..2b7531c630 100644
--- a/scene/resources/convex_polygon_shape_2d.cpp
+++ b/scene/resources/convex_polygon_shape_2d.cpp
@@ -30,19 +30,17 @@
 
 #include "convex_polygon_shape_2d.h"
 
-#include "core/math/geometry.h"
+#include "core/math/geometry_2d.h"
 #include "servers/physics_server_2d.h"
 #include "servers/rendering_server.h"
 
 bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
-
-	return Geometry::is_point_in_polygon(p_point, points);
+	return Geometry2D::is_point_in_polygon(p_point, points);
 }
 
 void ConvexPolygonShape2D::_update_shape() {
-
 	Vector<Vector2> final_points = points;
-	if (Geometry::is_polygon_clockwise(final_points)) { //needs to be counter clockwise
+	if (Geometry2D::is_polygon_clockwise(final_points)) { //needs to be counter clockwise
 		final_points.invert();
 	}
 	PhysicsServer2D::get_singleton()->shape_set_data(get_rid(), final_points);
@@ -50,26 +48,22 @@ void ConvexPolygonShape2D::_update_shape() {
 }
 
 void ConvexPolygonShape2D::set_point_cloud(const Vector<Vector2> &p_points) {
-
-	Vector<Point2> hull = Geometry::convex_hull_2d(p_points);
+	Vector<Point2> hull = Geometry2D::convex_hull(p_points);
 	ERR_FAIL_COND(hull.size() < 3);
 	set_points(hull);
 }
 
 void ConvexPolygonShape2D::set_points(const Vector<Vector2> &p_points) {
-
 	points = p_points;
 
 	_update_shape();
 }
 
 Vector<Vector2> ConvexPolygonShape2D::get_points() const {
-
 	return points;
 }
 
 void ConvexPolygonShape2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_point_cloud", "point_cloud"), &ConvexPolygonShape2D::set_point_cloud);
 	ClassDB::bind_method(D_METHOD("set_points", "points"), &ConvexPolygonShape2D::set_points);
 	ClassDB::bind_method(D_METHOD("get_points"), &ConvexPolygonShape2D::get_points);
@@ -78,20 +72,19 @@ void ConvexPolygonShape2D::_bind_methods() {
 }
 
 void ConvexPolygonShape2D::draw(const RID &p_to_rid, const Color &p_color) {
-
 	Vector<Color> col;
 	col.push_back(p_color);
 	RenderingServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col);
 }
 
 Rect2 ConvexPolygonShape2D::get_rect() const {
-
 	Rect2 rect;
 	for (int i = 0; i < points.size(); i++) {
-		if (i == 0)
+		if (i == 0) {
 			rect.position = points[i];
-		else
+		} else {
 			rect.expand_to(points[i]);
+		}
 	}
 
 	return rect;