godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

Make nan==nan true for GDScript

Browse Source 
After discussing this with Reduz this seemed like the best way to
fix #7354. This will make composite values that contain NaN in the same
places as well as the same other values compare as the same.

Additionally non-composite values now also compare equal if they are
both NaN. This breaks IEEE specifications but this is probably what most
users expect. There is a GDScript function check for NaN if the user
needs this information.

This fixes #7354 and probably also fixes #6947
This commit is contained in:
Hein-Pieter van Braam
2017-02-14 04:10:02 +01:00
parent 81edda18f3
commit adcc211feb
9 changed files with 99 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/math/vector3.cpp
View File

@@ -176,6 +176,17 @@ Vector3 Vector3::cubic_interpolate(const Vector3& p_b,const Vector3& p_pre_a, co
return out;
}
# endif
bool Vector3::nan_equals(const Vector3& p_v) const {
return (x == p_v.x && y == p_v.y && z == p_v.z) ||
(x == p_v.x && y == p_v.y && isnan(z) && isnan(p_v.z)) ||
(x == p_v.x && isnan(y) && isnan(p_v.y) && z == p_v.z) ||
(isnan(x) && isnan(p_v.x) && y == p_v.y && z == p_v.z) ||
(x == p_v.x && isnan(y) && isnan(p_v.y) && isnan(z) && isnan(p_v.z)) ||
(isnan(x) && isnan(p_v.x) && y == p_v.y && isnan(z) && isnan(p_v.z)) ||
(isnan(x) && isnan(p_v.x) && isnan(y) && isnan(p_v.y) && z == p_v.z) ||
(isnan(x) && isnan(p_v.x) && isnan(y) && isnan(p_v.y) && isnan(z) && isnan(p_v.z));
}
Vector3::operator String() const {
return (rtos(x)+", "+rtos(y)+", "+rtos(z));