diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-02-20 11:35:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-20 11:35:33 +0100 |
commit | 279f105246673c840e52cad8124f2add760e4d83 (patch) | |
tree | d85610551b11eaa417f1ded95b31a89a464b94e0 /core/math/vector3i.cpp | |
parent | 89ca0a1325f9652bd3ae913b1a58594d212c3e22 (diff) | |
parent | e031aa06ee37fb9bdaab63fdb2f0dabebcdbd3c2 (diff) |
Merge pull request #58321 from akien-mga/vector3-forward-declares
Diffstat (limited to 'core/math/vector3i.cpp')
-rw-r--r-- | core/math/vector3i.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/math/vector3i.cpp b/core/math/vector3i.cpp index ac79b3c7ea..b8e74ea6d2 100644 --- a/core/math/vector3i.cpp +++ b/core/math/vector3i.cpp @@ -30,6 +30,9 @@ #include "vector3i.h" +#include "core/math/vector3.h" +#include "core/string/ustring.h" + void Vector3i::set_axis(const int p_axis, const int32_t p_value) { ERR_FAIL_INDEX(p_axis, 3); coord[p_axis] = p_value; @@ -58,3 +61,7 @@ Vector3i Vector3i::clamp(const Vector3i &p_min, const Vector3i &p_max) const { Vector3i::operator String() const { return "(" + itos(x) + ", " + itos(y) + ", " + itos(z) + ")"; } + +Vector3i::operator Vector3() const { + return Vector3(x, y, z); +} |