ncca-ngl 0.3.3__tar.gz → 0.3.5__tar.gz

{ncca_ngl-0.3.3 → ncca_ngl-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ncca-ngl
-Version: 0.3.3
+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.3 → ncca_ngl-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ncca-ngl"
-version = "0.3.3"
+version = "0.3.5"
 description = "A Python version of the NGL graphics library."
 authors = [{ name = "Jon Macey", email = "jmacey@bournemouth.ac.uk" }]
 requires-python = ">=3.13"

{ncca_ngl-0.3.3 → ncca_ngl-0.3.5}/src/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-0.3.3 → ncca_ngl-0.3.5}/src/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-0.3.3 → ncca_ngl-0.3.5}/src/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-0.3.3 → ncca_ngl-0.3.5}/src/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.3 → ncca_ngl-0.3.5}/src/ncca/ngl/widgets/lookatwidget.py

@@ -10,6 +10,7 @@ class LookAtWidget(QFrame):
     """A widget for displaying and editing a Transform object, with foldable sections."""
 
     valueChanged = Signal(Mat4)
+    world_up = [Vec3(0, 1, 0), Vec3(1, 0, 0), Vec3(0, 0, 1)]
 
     def __init__(self, parent: QWidget | None = None, name: str = "", eye=Vec3(2, 2, 2), look=Vec3(0, 0, 0)) -> None:
         """
@@ -53,6 +54,31 @@ class LookAtWidget(QFrame):
         main_layout.addWidget(self._toggle_button)
         main_layout.addWidget(self._content_widget)
 
+    def set_eye(self, eye):
+        self._eye.set_value(eye)
+
+    def set_look(self, look):
+        self._look.set_value(look)
+
+    def set_up(self, up):
+        self._up.setCurrentIndex(up)
+
+    def set_name(self, name):
+        self._name = name
+        self._toggle_button.setText(name)
+
+    def get_name(self):
+        return self._name.text()
+
+    def get_eye(self):
+        return self._eye.value
+
+    def get_look(self):
+        return self._look.value
+
+    def get_up(self):
+        return self.world_up[self._up.currentIndex()]
+
     def toggle_collapsed(self, checked: bool) -> None:
         """Toggles the visibility of the content widget."""
         if checked:
@@ -66,8 +92,8 @@ class LookAtWidget(QFrame):
         """Updates the view matrix based on the widget values."""
         eye = self._eye.value
         look = self._look.value
-        world_up = [Vec3(0, 1, 0), Vec3(1, 0, 0), Vec3(0, 0, 1)]
-        up = world_up[self._up.currentIndex()]
+
+        up = self.world_up[self._up.currentIndex()]
 
         self._view = look_at(eye, look, up)
         self.valueChanged.emit(self._view)
@@ -75,3 +101,8 @@ class LookAtWidget(QFrame):
     def view(self) -> Mat4:
         """Returns the current view matrix."""
         return self._view
+
+    name = Property(str, get_name, set_name)
+    eye = Property(Vec3, get_eye, set_eye)
+    look = Property(Vec3, get_look, set_look)
+    up = Property(Vec3, get_up, set_up)

{ncca_ngl-0.3.3 → ncca_ngl-0.3.5}/src/ncca/ngl/widgets/transformwidget.py

@@ -40,8 +40,12 @@ class TransformWidget(QFrame):
         content_layout.setContentsMargins(0, 0, 0, 0)
 
         self._position = Vec3Widget(self, "Position", Vec3(0.0, 0.0, 0.0))
+        self._position.set_range(-20, 20)
         self._rotation = Vec3Widget(self, "Rotation", Vec3(0.0, 0.0, 0.0))
+        self._rotation.set_range(-360, 360)
         self._scale = Vec3Widget(self, "Scale", Vec3(1.0, 1.0, 1.0))
+        self._scale.set_range(-20, 20)
+
         self._rot_order = QComboBox(self)
         for v in self._rotation_order:
             self._rot_order.addItem(v)
@@ -94,6 +98,6 @@ class TransformWidget(QFrame):
             name: The new name of the widget.
         """
         self._name = name
-        self._label.setText(name)
+        self._toggle_button.setText(name)
 
     name = Property(str, name, set_name)