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

Remove useless "else" statements from vector3.h

Browse Source
This commit is contained in:
PouleyKetchoupp
2020-04-21 20:21:22 +02:00
committed by Aaron Franke
parent 7dea83c623
commit 356d0fccc2
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/math/vector3.h
View File

@ -324,49 +324,41 @@ bool Vector3::operator<(const Vector3 &p_v) const {
if (x == p_v.x) { if (x == p_v.x) {
if (y == p_v.y) { if (y == p_v.y) {
return z < p_v.z; return z < p_v.z;
} else { }
return y < p_v.y; return y < p_v.y;
} }
} else {
return x < p_v.x; return x < p_v.x;
} }
}
bool Vector3::operator>(const Vector3 &p_v) const { bool Vector3::operator>(const Vector3 &p_v) const {
if (x == p_v.x) { if (x == p_v.x) {
if (y == p_v.y) { if (y == p_v.y) {
return z > p_v.z; return z > p_v.z;
} else { }
return y > p_v.y; return y > p_v.y;
} }
} else {
return x > p_v.x; return x > p_v.x;
} }
}
bool Vector3::operator<=(const Vector3 &p_v) const { bool Vector3::operator<=(const Vector3 &p_v) const {
if (x == p_v.x) { if (x == p_v.x) {
if (y == p_v.y) { if (y == p_v.y) {
return z <= p_v.z; return z <= p_v.z;
} else { }
return y < p_v.y; return y < p_v.y;
} }
} else {
return x < p_v.x; return x < p_v.x;
} }
}
bool Vector3::operator>=(const Vector3 &p_v) const { bool Vector3::operator>=(const Vector3 &p_v) const {
if (x == p_v.x) { if (x == p_v.x) {
if (y == p_v.y) { if (y == p_v.y) {
return z >= p_v.z; return z >= p_v.z;
} else { }
return y > p_v.y; return y > p_v.y;
} }
} else {
return x > p_v.x; return x > p_v.x;
} }
}
_FORCE_INLINE_ Vector3 vec3_cross(const Vector3 &p_a, const Vector3 &p_b) { _FORCE_INLINE_ Vector3 vec3_cross(const Vector3 &p_a, const Vector3 &p_b) {
return p_a.cross(p_b); return p_a.cross(p_b);