ncca-ngl 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

ncca/ngl/util.py

@@ -154,3 +154,12 @@ def calc_normal(p1, p2, p3):
     normal.normalize()
 
     return normal
+
+
+def hash_combine(seed, h):
+    # emulate the NGL C++ combine: seed ^= h + 0x9e3779b9 + (seed<<6) + (seed>>2)
+    seed = (seed + 0x9E3779B9 + ((seed << 6) & 0xFFFFFFFFFFFFFFFF) + (seed >> 2)) & 0xFFFFFFFFFFFFFFFF
+    seed ^= h
+    return seed
+
+

ncca/ngl/vec2.py

@@ -7,7 +7,7 @@ import math
 
 import numpy as np
 
-from .util import clamp
+from .util import clamp, hash_combine
 
 
 class Vec2:
@@ -44,6 +44,15 @@ class Vec2:
         yield self.x
         yield self.y
 
+    def __hash__(self):
+        # Use 32-bit float element hashes, then combine
+        seed = 0
+        for v in (self.x, self.y):
+            # ensure 32-bit float semantics
+            h = hash(float(np.float32(v)))
+            seed = hash_combine(seed, h)
+        return seed
+
     def copy(self) -> "Vec2":
         """
         Create a copy of the vector.

ncca/ngl/vec3.py

@@ -7,7 +7,7 @@ import math
 
 import numpy as np
 
-from .util import clamp
+from .util import clamp, hash_combine
 
 
 class Vec3:
@@ -39,6 +39,15 @@ class Vec3:
     def sizeof(cls):
         return 3 * ctypes.sizeof(ctypes.c_float)
 
+    def __hash__(self):
+        # Use 32-bit float element hashes, then combine
+        seed = 0
+        for v in (self.x, self.y, self.z):
+            # ensure 32-bit float semantics
+            h = hash(float(np.float32(v)))
+            seed = hash_combine(seed, h)
+        return seed
+
     def __iter__(self):
         """
         Make the Vec3 class iterable.

ncca/ngl/vec4.py

@@ -8,6 +8,7 @@ import math
 import numpy as np
 
 from .log import logger
+from .util import hash_combine
 
 
 class Vec4:
@@ -73,6 +74,15 @@ class Vec4:
         """
         return Vec4(self.x, self.y, self.z, self.w)
 
+    def __hash__(self):
+        # Use 32-bit float element hashes, then combine
+        seed = 0
+        for v in (self.x, self.y, self.z, self.w):
+            # ensure 32-bit float semantics
+            h = hash(float(np.float32(v)))
+            seed = hash_combine(seed, h)
+        return seed
+
     def __add__(self, rhs):
         "return a+b vector addition"
         r = Vec4()

{ncca_ngl-0.3.4.dist-info → ncca_ngl-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ncca-ngl
-Version: 0.3.4
+Version: 0.3.5
 Summary: A Python version of the NGL graphics library.
 Author: Jon Macey
 Author-email: Jon Macey <jmacey@bournemouth.ac.uk>

{ncca_ngl-0.3.4.dist-info → ncca_ngl-0.3.5.dist-info}/RECORD

@@ -53,13 +53,13 @@ ncca/ngl/simple_vao.py,sha256=jfU2O3yliaM6iWNvfcRbjQ6o2_IVSPrOR3GthDiul6Q,1419
 ncca/ngl/text.py,sha256=yWNfKHnuWn0bxbwhW1H-EkRZ7bEM9DAyjES16cxTnME,13608
 ncca/ngl/texture.py,sha256=OgBBEItgUDohCsVWgmjEWcQWBJaXl9w070PTOOywPx4,2303
 ncca/ngl/transform.py,sha256=_PibgtFoU_exfvQUWucmts0WF5OreSTNbftvSa3zT8g,2938
-ncca/ngl/util.py,sha256=8jp5vTVuGfVHMSktFEubtoaQ8SvLIQtM2UNbUeMTOFk,4372
+ncca/ngl/util.py,sha256=HAr_Xgj7r48OY3m3xP5HBZgyDFHQwv4qwffguViP3Cw,4618
 ncca/ngl/vao_factory.py,sha256=v87VfrUMaoqcsE-CS9kM7h5Fyk_e0LGl_iA6xqaomPg,930
-ncca/ngl/vec2.py,sha256=ggrBtJK77c9d_JnN6eik50kZAa1zjudWhll6_5afkFo,10236
+ncca/ngl/vec2.py,sha256=4Obw_CK5uwdG9LkAVR6zBV9MkTyD-GE4AwpfaLcGLZ0,10531
 ncca/ngl/vec2_array.py,sha256=7QRgXh75fORsmNnSnNxNQWk6_rnDgfmRX3tmJZ4ES9E,3420
-ncca/ngl/vec3.py,sha256=N_-LvP0nB0CQrZWG7TJntUl6QDHzIVLP-J1w8wPZTM0,12275
+ncca/ngl/vec3.py,sha256=2i-QXJ-VlhLw60WlGRf3mUv5zyOa1DQBkSV6oATiXLI,12578
 ncca/ngl/vec3_array.py,sha256=fLRC8k0TwcaU7CnR2GmJ0prud4dcvvUX0JTbQH_2W3Y,3535
-ncca/ngl/vec4.py,sha256=mLl23D-3yAxh7GsP44ilRto-PMqIDxJjcZpNl2MyqGQ,6751
+ncca/ngl/vec4.py,sha256=81kFd3rDFTw4caKzRz9EzZ-tQzAcWv_1JGx0CKTfujQ,7079
 ncca/ngl/vec4_array.py,sha256=PSJXfG0g2AT4oQCLHiVAP6EC5n7vMXRQy0N1rGvv1iw,3426
 ncca/ngl/widgets/NGLDebug.log,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ncca/ngl/widgets/__init__.py,sha256=KBrwCwgDLIl-eAp0Q5HQcmNkfZ9q6waPC_4A8-g9PG0,413
@@ -77,6 +77,6 @@ ncca/ngl/widgets/transformwidget.py,sha256=U5pDZN_uhtBDv0BX28J7_fa1AGg8vc8Q2uG70
 ncca/ngl/widgets/vec2widget.py,sha256=w4GqwuiNewc2UI5PrSn6ZZYEaB_cxkpxGgrpMQ82WsM,4330
 ncca/ngl/widgets/vec3widget.py,sha256=PnmqdQ1j77v0PQC-p4lT3mTQd_Qi2Iwv9XzSP1Mpa7M,4934
 ncca/ngl/widgets/vec4widget.py,sha256=mT7c5paDaRxn-vSv7lbffg7isyD8T-6sUxOUMqJXBZs,5631
-ncca_ngl-0.3.4.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-ncca_ngl-0.3.4.dist-info/METADATA,sha256=XPAaLRyoJfBTxtIEXVfcC4HWl-9lNDTKhQl45_C9FrM,1596
-ncca_ngl-0.3.4.dist-info/RECORD,,
+ncca_ngl-0.3.5.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+ncca_ngl-0.3.5.dist-info/METADATA,sha256=ypLb9CnfpTInsKt3q9g76OVDrccixIEzKOHhly8ibkY,1596
+ncca_ngl-0.3.5.dist-info/RECORD,,