From 97d232c11d38f94e6719c83aa31771201c85430c Mon Sep 17 00:00:00 2001
From: Aaron Franke <arnfranke@yahoo.com>
Date: Wed, 5 Oct 2022 22:00:15 -0500
Subject: [PATCH] Enhancements to includes in core data structures

---
 core/math/aabb.cpp       | 1 +
 core/math/aabb.h         | 2 +-
 core/math/basis.cpp      | 4 ++--
 core/math/color.h        | 3 ++-
 core/math/plane.cpp      | 2 ++
 core/math/projection.cpp | 3 ++-
 core/math/projection.h   | 7 ++++---
 core/math/quaternion.h   | 4 ++--
 core/math/rect2.h        | 2 +-
 core/math/transform_3d.h | 1 +
 core/math/vector4.h      | 6 +++---
 11 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/core/math/aabb.cpp b/core/math/aabb.cpp
index 4c89be7f4d0..483b0d10ec1 100644
--- a/core/math/aabb.cpp
+++ b/core/math/aabb.cpp
@@ -403,6 +403,7 @@ Variant AABB::intersects_segment_bind(const Vector3 &p_from, const Vector3 &p_to
 	}
 	return Variant();
 }
+
 Variant AABB::intersects_ray_bind(const Vector3 &p_from, const Vector3 &p_dir) const {
 	Vector3 inters;
 	if (intersects_ray(p_from, p_dir, &inters)) {
diff --git a/core/math/aabb.h b/core/math/aabb.h
index acf903eebac..dfeb5b3291f 100644
--- a/core/math/aabb.h
+++ b/core/math/aabb.h
@@ -101,7 +101,7 @@ struct _NO_DISCARD_ AABB {
 	_FORCE_INLINE_ void expand_to(const Vector3 &p_vector); /** expand to contain a point if necessary */
 
 	_FORCE_INLINE_ AABB abs() const {
-		return AABB(Vector3(position.x + MIN(size.x, 0), position.y + MIN(size.y, 0), position.z + MIN(size.z, 0)), size.abs());
+		return AABB(Vector3(position.x + MIN(size.x, (real_t)0), position.y + MIN(size.y, (real_t)0), position.z + MIN(size.z, (real_t)0)), size.abs());
 	}
 
 	Variant intersects_segment_bind(const Vector3 &p_from, const Vector3 &p_to) const;
diff --git a/core/math/basis.cpp b/core/math/basis.cpp
index 4b163409ce7..743a206ae70 100644
--- a/core/math/basis.cpp
+++ b/core/math/basis.cpp
@@ -142,8 +142,8 @@ bool Basis::is_symmetric() const {
 #endif
 
 Basis Basis::diagonalize() {
-//NOTE: only implemented for symmetric matrices
-//with the Jacobi iterative method
+// NOTE: only implemented for symmetric matrices
+// with the Jacobi iterative method
 #ifdef MATH_CHECKS
 	ERR_FAIL_COND_V(!is_symmetric(), Basis());
 #endif
diff --git a/core/math/color.h b/core/math/color.h
index 65036f74cc3..bb8aa9a5296 100644
--- a/core/math/color.h
+++ b/core/math/color.h
@@ -32,7 +32,8 @@
 #define COLOR_H
 
 #include "core/math/math_funcs.h"
-#include "core/string/ustring.h"
+
+class String;
 
 struct _NO_DISCARD_ Color {
 	union {
diff --git a/core/math/plane.cpp b/core/math/plane.cpp
index 6881ad40148..3b2eab4ae22 100644
--- a/core/math/plane.cpp
+++ b/core/math/plane.cpp
@@ -147,6 +147,7 @@ Variant Plane::intersect_3_bind(const Plane &p_plane1, const Plane &p_plane2) co
 		return Variant();
 	}
 }
+
 Variant Plane::intersects_ray_bind(const Vector3 &p_from, const Vector3 &p_dir) const {
 	Vector3 inters;
 	if (intersects_ray(p_from, p_dir, &inters)) {
@@ -155,6 +156,7 @@ Variant Plane::intersects_ray_bind(const Vector3 &p_from, const Vector3 &p_dir)
 		return Variant();
 	}
 }
+
 Variant Plane::intersects_segment_bind(const Vector3 &p_begin, const Vector3 &p_end) const {
 	Vector3 inters;
 	if (intersects_segment(p_begin, p_end, &inters)) {
diff --git a/core/math/projection.cpp b/core/math/projection.cpp
index d579b641a71..c628bf0bde2 100644
--- a/core/math/projection.cpp
+++ b/core/math/projection.cpp
@@ -838,8 +838,9 @@ float Projection::get_lod_multiplier() const {
 		return 1.0 / (zn / width);
 	}
 
-	//usage is lod_size / (lod_distance * multiplier) < threshold
+	// Usage is lod_size / (lod_distance * multiplier) < threshold
 }
+
 void Projection::make_scale(const Vector3 &p_scale) {
 	set_identity();
 	columns[0][0] = p_scale.x;
diff --git a/core/math/projection.h b/core/math/projection.h
index 1bf5d8b2ed4..38fb9781aea 100644
--- a/core/math/projection.h
+++ b/core/math/projection.h
@@ -31,10 +31,11 @@
 #ifndef PROJECTION_H
 #define PROJECTION_H
 
-#include "core/math/math_defs.h"
 #include "core/math/vector3.h"
 #include "core/math/vector4.h"
-#include "core/templates/vector.h"
+
+template <class T>
+class Vector;
 
 struct AABB;
 struct Plane;
@@ -42,7 +43,7 @@ struct Rect2;
 struct Transform3D;
 struct Vector2;
 
-struct Projection {
+struct _NO_DISCARD_ Projection {
 	enum Planes {
 		PLANE_NEAR,
 		PLANE_FAR,
diff --git a/core/math/quaternion.h b/core/math/quaternion.h
index 43d7bffcfce..077fe5f189f 100644
--- a/core/math/quaternion.h
+++ b/core/math/quaternion.h
@@ -31,10 +31,10 @@
 #ifndef QUATERNION_H
 #define QUATERNION_H
 
-#include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector3.h"
-#include "core/string/ustring.h"
+
+class String;
 
 struct _NO_DISCARD_ Quaternion {
 	union {
diff --git a/core/math/rect2.h b/core/math/rect2.h
index 2d1be3d4f32..5ed2f8236cf 100644
--- a/core/math/rect2.h
+++ b/core/math/rect2.h
@@ -281,7 +281,7 @@ struct _NO_DISCARD_ Rect2 {
 	}
 
 	_FORCE_INLINE_ Rect2 abs() const {
-		return Rect2(Point2(position.x + MIN(size.x, 0), position.y + MIN(size.y, 0)), size.abs());
+		return Rect2(Point2(position.x + MIN(size.x, (real_t)0), position.y + MIN(size.y, (real_t)0)), size.abs());
 	}
 
 	Vector2 get_support(const Vector2 &p_normal) const {
diff --git a/core/math/transform_3d.h b/core/math/transform_3d.h
index c62e4a7b0e2..44d6d826f35 100644
--- a/core/math/transform_3d.h
+++ b/core/math/transform_3d.h
@@ -34,6 +34,7 @@
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/plane.h"
+#include "core/templates/vector.h"
 
 struct _NO_DISCARD_ Transform3D {
 	Basis basis;
diff --git a/core/math/vector4.h b/core/math/vector4.h
index 426c473e13b..ac7b6c3aeef 100644
--- a/core/math/vector4.h
+++ b/core/math/vector4.h
@@ -31,10 +31,10 @@
 #ifndef VECTOR4_H
 #define VECTOR4_H
 
-#include "core/math/math_defs.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
-#include "core/math/vector3.h"
-#include "core/string/ustring.h"
+
+class String;
 
 struct _NO_DISCARD_ Vector4 {
 	static const int AXIS_COUNT = 4;