godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65348 from aaronfranke/fix-vec4 

Minor fixes to Vector4 in core
This commit is contained in:
Rémi Verschelde 2022-09-05 08:27:31 +02:00
parent 785ce4208d 058ac331b0
commit 53a1d08bfc
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/vector2i.h
View File

@ -115,7 +115,7 @@ struct _NO_DISCARD_ Vector2i {
real_t aspect() const { return width / (real_t)height; } real_t aspect() const { return width / (real_t)height; }
Vector2i sign() const { return Vector2i(SIGN(x), SIGN(y)); } Vector2i sign() const { return Vector2i(SIGN(x), SIGN(y)); }
Vector2i abs() const { return Vector2i(ABS(x), ABS(y)); } Vector2i abs() const { return Vector2i(Math::abs(x), Math::abs(y)); }
Vector2i clamp(const Vector2i &p_min, const Vector2i &p_max) const; Vector2i clamp(const Vector2i &p_min, const Vector2i &p_max) const;
operator String() const; operator String() const;

2
core/math/vector3i.h
View File

@ -128,7 +128,7 @@ double Vector3i::length() const {
} }
Vector3i Vector3i::abs() const { Vector3i Vector3i::abs() const {
return Vector3i(ABS(x), ABS(y), ABS(z)); return Vector3i(Math::abs(x), Math::abs(y), Math::abs(z));
} }
Vector3i Vector3i::sign() const { Vector3i Vector3i::sign() const {

19
core/math/vector4.cpp
View File

@ -80,15 +80,26 @@ real_t Vector4::length() const {
} }
void Vector4::normalize() { 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 { Vector4 Vector4::normalized() const {
return *this / length(); Vector4 v = *this;
v.normalize();
return v;
} }
bool Vector4::is_normalized() const { 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 { real_t Vector4::distance_to(const Vector4 &p_to) const {
@ -187,3 +198,5 @@ Vector4 Vector4::clamp(const Vector4 &p_min, const Vector4 &p_max) const {
Vector4::operator String() const { 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) + ")"; 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));

10
core/math/vector4i.cpp
View File

@ -84,8 +84,10 @@ Vector4i::operator Vector4() const {
} }
Vector4i::Vector4i(const Vector4 &p_vec4) { 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));

2
core/math/vector4i.h
View File

@ -132,7 +132,7 @@ double Vector4i::length() const {
} }
Vector4i Vector4i::abs() 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 { Vector4i Vector4i::sign() const {