summaryrefslogtreecommitdiffstats
path: root/core/math/vector3i.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-02-19 16:47:24 +0100
committerRémi Verschelde <rverschelde@gmail.com>2022-02-19 16:47:24 +0100
commite031aa06ee37fb9bdaab63fdb2f0dabebcdbd3c2 (patch)
tree6458311b1244291e141c713a1465629a75acabef /core/math/vector3i.h
parent6a51999b7f4d9f7b1f950d7a655a464f28542318 (diff)
downloadredot-engine-e031aa06ee37fb9bdaab63fdb2f0dabebcdbd3c2.tar.gz
Core: Use forward declares for Vector3/Vector3i
Add add Vector3 operator in Vector3i.
Diffstat (limited to 'core/math/vector3i.h')
-rw-r--r--core/math/vector3i.h6
1 files changed, 4 insertions, 2 deletions
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) {