Update Vector4/4i to match the engine

include/godot_cpp/variant/vector4.hpp

@@ -44,6 +44,8 @@ class Vector4 {
 	friend class Variant;
 
 public:
+	static const int AXIS_COUNT = 4;
+
 	enum Axis {
 		AXIS_X,
 		AXIS_Y,
@@ -61,30 +63,46 @@ public:
 		real_t components[4] = { 0, 0, 0, 0 };
 	};
 
-	_FORCE_INLINE_ real_t &operator[](int idx) {
+	_FORCE_INLINE_ real_t &operator[](const int p_axis) {
-		return components[idx];
+		DEV_ASSERT((unsigned int)p_axis < 4);
+		return components[p_axis];
 	}
-	_FORCE_INLINE_ const real_t &operator[](int idx) const {
+	_FORCE_INLINE_ const real_t &operator[](const int p_axis) const {
-		return components[idx];
+		DEV_ASSERT((unsigned int)p_axis < 4);
+		return components[p_axis];
 	}
+
+	Vector4::Axis min_axis_index() const;
+	Vector4::Axis max_axis_index() const;
+
 	_FORCE_INLINE_ real_t length_squared() const;
 	bool is_equal_approx(const Vector4 &p_vec4) const;
+	bool is_zero_approx() const;
 	real_t length() const;
 	void normalize();
 	Vector4 normalized() const;
 	bool is_normalized() const;
+
+	real_t distance_to(const Vector4 &p_to) const;
+	real_t distance_squared_to(const Vector4 &p_to) const;
+	Vector4 direction_to(const Vector4 &p_to) const;
+
 	Vector4 abs() const;
 	Vector4 sign() const;
 	Vector4 floor() const;
 	Vector4 ceil() const;
 	Vector4 round() const;
+	Vector4 lerp(const Vector4 &p_to, const real_t p_weight) const;
+	Vector4 cubic_interpolate(const Vector4 &p_b, const Vector4 &p_pre_a, const Vector4 &p_post_b, const real_t p_weight) const;
+	Vector4 cubic_interpolate_in_time(const Vector4 &p_b, const Vector4 &p_pre_a, const Vector4 &p_post_b, const real_t p_weight, const real_t &p_b_t, const real_t &p_pre_a_t, const real_t &p_post_b_t) const;
 
-	Vector4::Axis min_axis_index() const;
+	Vector4 posmod(const real_t p_mod) const;
-	Vector4::Axis max_axis_index() const;
+	Vector4 posmodv(const Vector4 &p_modv) const;
+	void snap(const Vector4 &p_step);
+	Vector4 snapped(const Vector4 &p_step) const;
 	Vector4 clamp(const Vector4 &p_min, const Vector4 &p_max) const;
 
 	Vector4 inverse() const;
-	Vector4 lerp(const Vector4 &p_to, const real_t p_weight) const;
 	_FORCE_INLINE_ real_t dot(const Vector4 &p_vec4) const;
 
 	_FORCE_INLINE_ void operator+=(const Vector4 &p_vec4);
@@ -197,7 +215,7 @@ Vector4 Vector4::operator/(const Vector4 &p_vec4) const {
 }
 
 Vector4 Vector4::operator-() const {
-	return Vector4(x, y, z, w);
+	return Vector4(-x, -y, -z, -w);
 }
 
 Vector4 Vector4::operator*(const real_t &s) const {
@@ -221,64 +239,52 @@ bool Vector4::operator<(const Vector4 &p_v) const {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
 				return w < p_v.w;
-			} else {
+			}
 			return z < p_v.z;
 		}
-		} else {
 		return y < p_v.y;
 	}
-	} else {
 	return x < p_v.x;
 }
-}
 
 bool Vector4::operator>(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
 				return w > p_v.w;
-			} else {
+			}
 			return z > p_v.z;
 		}
-		} else {
 		return y > p_v.y;
 	}
-	} else {
 	return x > p_v.x;
 }
-}
 
 bool Vector4::operator<=(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
 				return w <= p_v.w;
-			} else {
+			}
 			return z < p_v.z;
 		}
-		} else {
 		return y < p_v.y;
 	}
-	} else {
 	return x < p_v.x;
 }
-}
 
 bool Vector4::operator>=(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
 				return w >= p_v.w;
-			} else {
+			}
 			return z > p_v.z;
 		}
-		} else {
 		return y > p_v.y;
 	}
-	} else {
 	return x > p_v.x;
 }
-}
 
 _FORCE_INLINE_ Vector4 operator*(const float p_scalar, const Vector4 &p_vec) {
 	return p_vec * p_scalar;
@@ -298,4 +304,4 @@ _FORCE_INLINE_ Vector4 operator*(const int64_t p_scalar, const Vector4 &p_vec) {
 
 } // namespace godot
 
-#endif // GODOT_VECTOR3_HPP
+#endif // GODOT_VECTOR4_HPP

include/godot_cpp/variant/vector4i.hpp

@@ -45,6 +45,8 @@ class Vector4i {
 	friend class Variant;
 
 public:
+	static const int AXIS_COUNT = 4;
+
 	enum Axis {
 		AXIS_X,
 		AXIS_Y,
@@ -64,10 +66,12 @@ public:
 	};
 
 	_FORCE_INLINE_ const int32_t &operator[](const int p_axis) const {
+		DEV_ASSERT((unsigned int)p_axis < 4);
 		return coord[p_axis];
 	}
 
 	_FORCE_INLINE_ int32_t &operator[](const int p_axis) {
+		DEV_ASSERT((unsigned int)p_axis < 4);
 		return coord[p_axis];
 	}
 
@@ -137,11 +141,11 @@ double Vector4i::length() const {
 }
 
 Vector4i Vector4i::abs() const {
-	return Vector4i(ABS(x), ABS(y), ABS(z), ABS(w));
+	return Vector4i(Math::abs(x), Math::abs(y), Math::abs(z), Math::abs(w));
 }
 
 Vector4i Vector4i::sign() const {
-	return Vector4i(SIGN(x), SIGN(y), SIGN(z), SIGN(w));
+	return Vector4i(Math::sign(x), Math::sign(y), Math::sign(z), Math::sign(w));
 }
 
 /* Operators */

src/variant/vector4.cpp

@@ -30,29 +30,82 @@
 
 #include <godot_cpp/variant/vector4.hpp>
 
-#include <godot_cpp/variant/basis.hpp>
+#include <godot_cpp/variant/string.hpp>
 #include <godot_cpp/variant/vector4i.hpp>
 
 namespace godot {
 
+Vector4::Axis Vector4::min_axis_index() const {
+	uint32_t min_index = 0;
+	real_t min_value = x;
+	for (uint32_t i = 1; i < 4; i++) {
+		if (operator[](i) <= min_value) {
+			min_index = i;
+			min_value = operator[](i);
+		}
+	}
+	return Vector4::Axis(min_index);
+}
+
+Vector4::Axis Vector4::max_axis_index() const {
+	uint32_t max_index = 0;
+	real_t max_value = x;
+	for (uint32_t i = 1; i < 4; i++) {
+		if (operator[](i) > max_value) {
+			max_index = i;
+			max_value = operator[](i);
+		}
+	}
+	return Vector4::Axis(max_index);
+}
+
 bool Vector4::is_equal_approx(const Vector4 &p_vec4) const {
 	return Math::is_equal_approx(x, p_vec4.x) && Math::is_equal_approx(y, p_vec4.y) && Math::is_equal_approx(z, p_vec4.z) && Math::is_equal_approx(w, p_vec4.w);
 }
 
+bool Vector4::is_zero_approx() const {
+	return Math::is_zero_approx(x) && Math::is_zero_approx(y) && Math::is_zero_approx(z) && Math::is_zero_approx(w);
+}
+
 real_t Vector4::length() const {
 	return Math::sqrt(length_squared());
 }
 
 void Vector4::normalize() {
-	*this /= length();
+	real_t lengthsq = length_squared();
+	if (lengthsq == 0) {
+		x = y = z = w = 0;
+	} else {
+		real_t length = Math::sqrt(lengthsq);
+		x /= length;
+		y /= length;
+		z /= length;
+		w /= length;
+	}
 }
 
 Vector4 Vector4::normalized() const {
-	return *this / length();
+	Vector4 v = *this;
+	v.normalize();
+	return v;
 }
 
 bool Vector4::is_normalized() const {
-	return Math::is_equal_approx(length_squared(), 1, (real_t)UNIT_EPSILON); // use less epsilon
+	return Math::is_equal_approx(length_squared(), (real_t)1, (real_t)UNIT_EPSILON);
+}
+
+real_t Vector4::distance_to(const Vector4 &p_to) const {
+	return (p_to - *this).length();
+}
+
+real_t Vector4::distance_squared_to(const Vector4 &p_to) const {
+	return (p_to - *this).length_squared();
+}
+
+Vector4 Vector4::direction_to(const Vector4 &p_to) const {
+	Vector4 ret(p_to.x - x, p_to.y - y, p_to.z - z, p_to.w - w);
+	ret.normalize();
+	return ret;
 }
 
 Vector4 Vector4::abs() const {
@@ -75,10 +128,6 @@ Vector4 Vector4::round() const {
 	return Vector4(Math::round(x), Math::round(y), Math::round(z), Math::round(w));
 }
 
-Vector4 Vector4::inverse() const {
-	return Vector4(1.0f / x, 1.0f / y, 1.0f / z, 1.0f / w);
-}
-
 Vector4 Vector4::lerp(const Vector4 &p_to, const real_t p_weight) const {
 	return Vector4(
 			x + (p_weight * (p_to.x - x)),
@@ -87,28 +136,47 @@ Vector4 Vector4::lerp(const Vector4 &p_to, const real_t p_weight) const {
 			w + (p_weight * (p_to.w - w)));
 }
 
-Vector4::Axis Vector4::min_axis_index() const {
+Vector4 Vector4::cubic_interpolate(const Vector4 &p_b, const Vector4 &p_pre_a, const Vector4 &p_post_b, const real_t p_weight) const {
-	uint32_t min_index = 0;
+	Vector4 res = *this;
-	real_t min_value = x;
+	res.x = Math::cubic_interpolate(res.x, p_b.x, p_pre_a.x, p_post_b.x, p_weight);
-	for (uint32_t i = 1; i < 4; i++) {
+	res.y = Math::cubic_interpolate(res.y, p_b.y, p_pre_a.y, p_post_b.y, p_weight);
-		if (operator[](i) < min_value) {
+	res.z = Math::cubic_interpolate(res.z, p_b.z, p_pre_a.z, p_post_b.z, p_weight);
-			min_index = i;
+	res.w = Math::cubic_interpolate(res.w, p_b.w, p_pre_a.w, p_post_b.w, p_weight);
-			min_value = operator[](i);
+	return res;
-		}
-	}
-	return Vector4::Axis(min_index);
 }
 
-Vector4::Axis Vector4::max_axis_index() const {
+Vector4 Vector4::cubic_interpolate_in_time(const Vector4 &p_b, const Vector4 &p_pre_a, const Vector4 &p_post_b, const real_t p_weight, const real_t &p_b_t, const real_t &p_pre_a_t, const real_t &p_post_b_t) const {
-	uint32_t max_index = 0;
+	Vector4 res = *this;
-	real_t max_value = x;
+	res.x = Math::cubic_interpolate_in_time(res.x, p_b.x, p_pre_a.x, p_post_b.x, p_weight, p_b_t, p_pre_a_t, p_post_b_t);
-	for (uint32_t i = 1; i < 4; i++) {
+	res.y = Math::cubic_interpolate_in_time(res.y, p_b.y, p_pre_a.y, p_post_b.y, p_weight, p_b_t, p_pre_a_t, p_post_b_t);
-		if (operator[](i) > max_value) {
+	res.z = Math::cubic_interpolate_in_time(res.z, p_b.z, p_pre_a.z, p_post_b.z, p_weight, p_b_t, p_pre_a_t, p_post_b_t);
-			max_index = i;
+	res.w = Math::cubic_interpolate_in_time(res.w, p_b.w, p_pre_a.w, p_post_b.w, p_weight, p_b_t, p_pre_a_t, p_post_b_t);
-			max_value = operator[](i);
+	return res;
 }
+
+Vector4 Vector4::posmod(const real_t p_mod) const {
+	return Vector4(Math::fposmod(x, p_mod), Math::fposmod(y, p_mod), Math::fposmod(z, p_mod), Math::fposmod(w, p_mod));
 }
-	return Vector4::Axis(max_index);
+
+Vector4 Vector4::posmodv(const Vector4 &p_modv) const {
+	return Vector4(Math::fposmod(x, p_modv.x), Math::fposmod(y, p_modv.y), Math::fposmod(z, p_modv.z), Math::fposmod(w, p_modv.w));
+}
+
+void Vector4::snap(const Vector4 &p_step) {
+	x = Math::snapped(x, p_step.x);
+	y = Math::snapped(y, p_step.y);
+	z = Math::snapped(z, p_step.z);
+	w = Math::snapped(w, p_step.w);
+}
+
+Vector4 Vector4::snapped(const Vector4 &p_step) const {
+	Vector4 v = *this;
+	v.snap(p_step);
+	return v;
+}
+
+Vector4 Vector4::inverse() const {
+	return Vector4(1.0f / x, 1.0f / y, 1.0f / z, 1.0f / w);
 }
 
 Vector4 Vector4::clamp(const Vector4 &p_min, const Vector4 &p_max) const {
@@ -123,4 +191,6 @@ Vector4::operator String() const {
 	return "(" + String::num_real(x, false) + ", " + String::num_real(y, false) + ", " + String::num_real(z, false) + ", " + String::num_real(w, false) + ")";
 }
 
+static_assert(sizeof(Vector4) == 4 * sizeof(real_t));
+
 } // namespace godot

src/variant/vector4i.cpp

@@ -49,7 +49,7 @@ Vector4i::Axis Vector4i::min_axis_index() const {
 	uint32_t min_index = 0;
 	int32_t min_value = x;
 	for (uint32_t i = 1; i < 4; i++) {
-		if (operator[](i) < min_value) {
+		if (operator[](i) <= min_value) {
 			min_index = i;
 			min_value = operator[](i);
 		}
@@ -86,10 +86,12 @@ Vector4i::operator Vector4() const {
 }
 
 Vector4i::Vector4i(const Vector4 &p_vec4) {
-	x = p_vec4.x;
+	x = (int32_t)p_vec4.x;
-	y = p_vec4.y;
+	y = (int32_t)p_vec4.y;
-	z = p_vec4.z;
+	z = (int32_t)p_vec4.z;
-	w = p_vec4.w;
+	w = (int32_t)p_vec4.w;
 }
 
+static_assert(sizeof(Vector4i) == 4 * sizeof(int32_t));
+
 } // namespace godot