From e031aa06ee37fb9bdaab63fdb2f0dabebcdbd3c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 19 Feb 2022 16:47:24 +0100 Subject: Core: Use forward declares for Vector3/Vector3i Add add Vector3 operator in Vector3i. --- core/math/vector3i.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/math/vector3i.h') diff --git a/core/math/vector3i.h b/core/math/vector3i.h index d166de80aa..2a4c7e2e97 100644 --- a/core/math/vector3i.h +++ b/core/math/vector3i.h @@ -32,8 +32,9 @@ #define VECTOR3I_H #include "core/math/math_funcs.h" -#include "core/string/ustring.h" -#include "core/typedefs.h" + +class String; +struct Vector3; struct _NO_DISCARD_ Vector3i { enum Axis { @@ -105,6 +106,7 @@ struct _NO_DISCARD_ Vector3i { _FORCE_INLINE_ bool operator>=(const Vector3i &p_v) const; operator String() const; + operator Vector3() const; _FORCE_INLINE_ Vector3i() {} _FORCE_INLINE_ Vector3i(const int32_t p_x, const int32_t p_y, const int32_t p_z) { -- cgit v1.2.3