From 37eb131c50bbd217ff05da2b742ab13ddd1741ed Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 7 Aug 2022 23:31:58 +0200 Subject: [PATCH] Uncommented hashing methods for the new types. --- core/hashfuncs.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/hashfuncs.h b/core/hashfuncs.h index 2f23dd175..74861c0c6 100644 --- a/core/hashfuncs.h +++ b/core/hashfuncs.h @@ -39,8 +39,8 @@ #include "core/math/vector2i.h" #include "core/math/vector3.h" #include "core/math/vector3i.h" -//#include "core/math/vector4.h" -//#include "core/math/vector4i.h" +#include "core/math/vector4.h" +#include "core/math/vector4i.h" #include "core/object_id.h" #include "core/node_path.h" #include "core/string_name.h" @@ -345,7 +345,6 @@ struct HashMapHasherDefault { h = hash_murmur3_one_32(p_vec.z, h); return hash_fmix32(h); } - /* static _FORCE_INLINE_ uint32_t hash(const Vector4i &p_vec) { uint32_t h = hash_murmur3_one_32(p_vec.x); h = hash_murmur3_one_32(p_vec.y, h); @@ -353,7 +352,6 @@ struct HashMapHasherDefault { h = hash_murmur3_one_32(p_vec.w, h); return hash_fmix32(h); } - */ static _FORCE_INLINE_ uint32_t hash(const Vector2 &p_vec) { uint32_t h = hash_murmur3_one_real(p_vec.x); h = hash_murmur3_one_real(p_vec.y, h); @@ -365,7 +363,6 @@ struct HashMapHasherDefault { h = hash_murmur3_one_real(p_vec.z, h); return hash_fmix32(h); } - /* static _FORCE_INLINE_ uint32_t hash(const Vector4 &p_vec) { uint32_t h = hash_murmur3_one_real(p_vec.x); h = hash_murmur3_one_real(p_vec.y, h); @@ -373,7 +370,6 @@ struct HashMapHasherDefault { h = hash_murmur3_one_real(p_vec.w, h); return hash_fmix32(h); } - */ static _FORCE_INLINE_ uint32_t hash(const Rect2i &p_rect) { uint32_t h = hash_murmur3_one_32(p_rect.position.x); h = hash_murmur3_one_32(p_rect.position.y, h);