diff options
| author | Arman Elgudzhyan <48544263+puchik@users.noreply.github.com> | 2023-03-07 19:13:00 -0800 |
|---|---|---|
| committer | Arman Elgudzhyan <48544263+puchik@users.noreply.github.com> | 2023-08-31 09:29:48 -0700 |
| commit | ee272546020ffdbc0ab565c14d047a329d4c1ea2 (patch) | |
| tree | b299237a045322c7fcd34964b51b95c3242e7e73 /core/variant/variant.cpp | |
| parent | 549fcce5f8f7beace3e5c90e9bbe4335d4fd1476 (diff) | |
| download | redot-engine-ee272546020ffdbc0ab565c14d047a329d4c1ea2.tar.gz | |
Support both semantic (by default) and numeric Variant hash comparison
Hash comparison for Variant continues to perform semantic/logical comparison with NaN's considered equal by default (to prevent #16114, #7354, #6947, #8081), but now optionally allows for numeric comparison that does not consider NaN's equal to support proper value comparison (for #72222)
Diffstat (limited to 'core/variant/variant.cpp')
| -rw-r--r-- | core/variant/variant.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp index 8a0289898d..63ea3274ce 100644 --- a/core/variant/variant.cpp +++ b/core/variant/variant.cpp @@ -3235,8 +3235,11 @@ uint32_t Variant::recursive_hash(int recursion_count) const { return 0; } +#define hash_compare_scalar_base(p_lhs, p_rhs, semantic_comparison) \ + (((p_lhs) == (p_rhs)) || (semantic_comparison && Math::is_nan(p_lhs) && Math::is_nan(p_rhs))) + #define hash_compare_scalar(p_lhs, p_rhs) \ - (((p_lhs) == (p_rhs)) || (Math::is_nan(p_lhs) && Math::is_nan(p_rhs))) + (hash_compare_scalar_base(p_lhs, p_rhs, true)) #define hash_compare_vector2(p_lhs, p_rhs) \ (hash_compare_scalar((p_lhs).x, (p_rhs).x) && \ @@ -3282,7 +3285,7 @@ uint32_t Variant::recursive_hash(int recursion_count) const { \ return true -bool Variant::hash_compare(const Variant &p_variant, int recursion_count) const { +bool Variant::hash_compare(const Variant &p_variant, int recursion_count, bool semantic_comparison) const { if (type != p_variant.type) { return false; } @@ -3293,7 +3296,7 @@ bool Variant::hash_compare(const Variant &p_variant, int recursion_count) const } break; case FLOAT: { - return hash_compare_scalar(_data._float, p_variant._data._float); + return hash_compare_scalar_base(_data._float, p_variant._data._float, semantic_comparison); } break; case STRING: { |