1 files changed, 9 insertions, 35 deletions

diff --git a/main/tests/test_physics_3d.cpp b/main/tests/test_physics_3d.cpp
index 2d208ee317..dfe2e946cf 100644
--- a/main/tests/test_physics_3d.cpp
+++ b/main/tests/test_physics_3d.cpp
@@ -41,7 +41,6 @@
 #include "servers/rendering_server.h"
 
 class TestPhysics3DMainLoop : public MainLoop {
-
 	GDCLASS(TestPhysics3DMainLoop, MainLoop);
 
 	enum {
@@ -69,7 +68,6 @@ class TestPhysics3DMainLoop : public MainLoop {
 	Map<PhysicsServer3D::ShapeType, RID> type_mesh_map;
 
 	void body_changed_transform(Object *p_state, RID p_visual_instance) {
-
 		PhysicsDirectBodyState3D *state = (PhysicsDirectBodyState3D *)p_state;
 		RenderingServer *vs = RenderingServer::get_singleton();
 		Transform t = state->get_transform();
@@ -80,12 +78,10 @@ class TestPhysics3DMainLoop : public MainLoop {
 
 protected:
 	static void _bind_methods() {
-
 		ClassDB::bind_method("body_changed_transform", &TestPhysics3DMainLoop::body_changed_transform);
 	}
 
 	RID create_body(PhysicsServer3D::ShapeType p_shape, PhysicsServer3D::BodyMode p_body, const Transform p_location, bool p_active_default = true, const Transform &p_shape_xform = Transform()) {
-
 		RenderingServer *vs = RenderingServer::get_singleton();
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 
@@ -101,14 +97,12 @@ protected:
 		bodies.push_back(body);
 
 		if (p_body == PhysicsServer3D::BODY_MODE_STATIC) {
-
 			vs->instance_set_transform(mesh_instance, p_location);
 		}
 		return body;
 	}
 
 	RID create_static_plane(const Plane &p_plane) {
-
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 
 		RID world_margin_shape = ps->shape_create(PhysicsServer3D::SHAPE_PLANE);
@@ -122,7 +116,6 @@ protected:
 	}
 
 	void configure_body(RID p_body, float p_mass, float p_friction, float p_bounce) {
-
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 		ps->body_set_param(p_body, PhysicsServer3D::BODY_PARAM_MASS, p_mass);
 		ps->body_set_param(p_body, PhysicsServer3D::BODY_PARAM_FRICTION, p_friction);
@@ -130,7 +123,6 @@ protected:
 	}
 
 	void init_shapes() {
-
 		RenderingServer *vs = RenderingServer::get_singleton();
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 
@@ -144,9 +136,9 @@ protected:
 
 		/* BOX SHAPE */
 
-		Vector<Plane> box_planes = Geometry::build_box_planes(Vector3(0.5, 0.5, 0.5));
+		Vector<Plane> box_planes = Geometry3D::build_box_planes(Vector3(0.5, 0.5, 0.5));
 		RID box_mesh = vs->mesh_create();
-		Geometry::MeshData box_data = Geometry::build_convex_mesh(box_planes);
+		Geometry3D::MeshData box_data = Geometry3D::build_convex_mesh(box_planes);
 		vs->mesh_add_surface_from_mesh_data(box_mesh, box_data);
 		type_mesh_map[PhysicsServer3D::SHAPE_BOX] = box_mesh;
 
@@ -156,10 +148,10 @@ protected:
 
 		/* CAPSULE SHAPE */
 
-		Vector<Plane> capsule_planes = Geometry::build_capsule_planes(0.5, 0.7, 12, Vector3::AXIS_Z);
+		Vector<Plane> capsule_planes = Geometry3D::build_capsule_planes(0.5, 0.7, 12, Vector3::AXIS_Z);
 
 		RID capsule_mesh = vs->mesh_create();
-		Geometry::MeshData capsule_data = Geometry::build_convex_mesh(capsule_planes);
+		Geometry3D::MeshData capsule_data = Geometry3D::build_convex_mesh(capsule_planes);
 		vs->mesh_add_surface_from_mesh_data(capsule_mesh, capsule_data);
 
 		type_mesh_map[PhysicsServer3D::SHAPE_CAPSULE] = capsule_mesh;
@@ -173,10 +165,10 @@ protected:
 
 		/* CONVEX SHAPE */
 
-		Vector<Plane> convex_planes = Geometry::build_cylinder_planes(0.5, 0.7, 5, Vector3::AXIS_Z);
+		Vector<Plane> convex_planes = Geometry3D::build_cylinder_planes(0.5, 0.7, 5, Vector3::AXIS_Z);
 
 		RID convex_mesh = vs->mesh_create();
-		Geometry::MeshData convex_data = Geometry::build_convex_mesh(convex_planes);
+		Geometry3D::MeshData convex_data = Geometry3D::build_convex_mesh(convex_planes);
 		QuickHull::build(convex_data.vertices, convex_data);
 		vs->mesh_add_surface_from_mesh_data(convex_mesh, convex_data);
 
@@ -188,7 +180,6 @@ protected:
 	}
 
 	void make_trimesh(Vector<Vector3> p_faces, const Transform &p_xform = Transform()) {
-
 		RenderingServer *vs = RenderingServer::get_singleton();
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 		RID trimesh_shape = ps->shape_create(PhysicsServer3D::SHAPE_CONCAVE_POLYGON);
@@ -196,7 +187,6 @@ protected:
 		p_faces = ps->shape_get_data(trimesh_shape); // optimized one
 		Vector<Vector3> normals; // for drawing
 		for (int i = 0; i < p_faces.size() / 3; i++) {
-
 			Plane p(p_faces[i * 3 + 0], p_faces[i * 3 + 1], p_faces[i * 3 + 2]);
 			normals.push_back(p.normal);
 			normals.push_back(p.normal);
@@ -222,17 +212,14 @@ protected:
 	}
 
 	void make_grid(int p_width, int p_height, float p_cellsize, float p_cellheight, const Transform &p_xform = Transform()) {
-
 		Vector<Vector<float>> grid;
 
 		grid.resize(p_width);
 
 		for (int i = 0; i < p_width; i++) {
-
 			grid.write[i].resize(p_height);
 
 			for (int j = 0; j < p_height; j++) {
-
 				grid.write[i].write[j] = 1.0 + Math::random(-p_cellheight, p_cellheight);
 			}
 		}
@@ -240,9 +227,7 @@ protected:
 		Vector<Vector3> faces;
 
 		for (int i = 1; i < p_width; i++) {
-
 			for (int j = 1; j < p_height; j++) {
-
 #define MAKE_VERTEX(m_x, m_z) \
 	faces.push_back(Vector3((m_x - p_width / 2) * p_cellsize, grid[m_x][m_z], (m_z - p_height / 2) * p_cellsize))
 
@@ -261,21 +246,17 @@ protected:
 
 public:
 	virtual void input_event(const Ref<InputEvent> &p_event) {
-
 		Ref<InputEventMouseMotion> mm = p_event;
 		if (mm.is_valid() && mm->get_button_mask() & 4) {
-
 			ofs_y -= mm->get_relative().y / 200.0;
 			ofs_x += mm->get_relative().x / 200.0;
 		}
 
 		if (mm.is_valid() && mm->get_button_mask() & 1) {
-
 			float y = -mm->get_relative().y / 20.0;
 			float x = mm->get_relative().x / 20.0;
 
 			if (mover.is_valid()) {
-
 				PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 				Transform t = ps->body_get_state(mover, PhysicsServer3D::BODY_STATE_TRANSFORM);
 				t.origin += Vector3(x, y, 0);
@@ -286,11 +267,9 @@ public:
 	}
 
 	virtual void request_quit() {
-
 		quit = true;
 	}
 	virtual void init() {
-
 		ofs_x = ofs_y = 0;
 		init_shapes();
 
@@ -332,7 +311,6 @@ public:
 		quit = false;
 	}
 	virtual bool iteration(float p_time) {
-
 		if (mover.is_valid()) {
 			static float joy_speed = 10;
 			PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
@@ -360,14 +338,13 @@ public:
 	}
 
 	void test_character() {
-
 		RenderingServer *vs = RenderingServer::get_singleton();
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 
-		Vector<Plane> capsule_planes = Geometry::build_capsule_planes(0.5, 1, 12, 5, Vector3::AXIS_Y);
+		Vector<Plane> capsule_planes = Geometry3D::build_capsule_planes(0.5, 1, 12, 5, Vector3::AXIS_Y);
 
 		RID capsule_mesh = vs->mesh_create();
-		Geometry::MeshData capsule_data = Geometry::build_convex_mesh(capsule_planes);
+		Geometry3D::MeshData capsule_data = Geometry3D::build_convex_mesh(capsule_planes);
 		vs->mesh_add_surface_from_mesh_data(capsule_mesh, capsule_data);
 		type_mesh_map[PhysicsServer3D::SHAPE_CAPSULE] = capsule_mesh;
 
@@ -393,9 +370,7 @@ public:
 	}
 
 	void test_fall() {
-
 		for (int i = 0; i < 35; i++) {
-
 			static const PhysicsServer3D::ShapeType shape_idx[] = {
 				PhysicsServer3D::SHAPE_CAPSULE,
 				PhysicsServer3D::SHAPE_BOX,
@@ -417,7 +392,6 @@ public:
 	}
 
 	void test_activate() {
-
 		create_body(PhysicsServer3D::SHAPE_BOX, PhysicsServer3D::BODY_MODE_RIGID, Transform(Basis(), Vector3(0, 2, 0)), true);
 		create_static_plane(Plane(Vector3(0, 1, 0), -1));
 	}
@@ -433,7 +407,7 @@ public:
 namespace TestPhysics3D {
 
 MainLoop *test() {
-
 	return memnew(TestPhysics3DMainLoop);
 }
+
 } // namespace TestPhysics3D