ncca-ngl 0.2.3__tar.gz → 0.2.5__tar.gz

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/PKG-INFO

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

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ncca-ngl"
-version = "0.2.3"
+version = "0.2.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.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/__init__.py

@@ -41,7 +41,7 @@ from .simple_vao import SimpleVAO
 from .text import Text
 from .texture import Texture
 from .transform import Transform, TransformRotationOrder
-from .util import calc_normal, clamp, frustum, lerp, look_at, ortho, perspective
+from .util import PerspMode, calc_normal, clamp, frustum, lerp, look_at, ortho, perspective
 from .vao_factory import VAOFactory, VAOType
 from .vec2 import Vec2
 from .vec2_array import Vec2Array
@@ -110,4 +110,5 @@ all = [
     PrimData,
     FirstPersonCamera,
     PySideEventHandlingMixin,
+    PerspMode,
 ]

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/abstract_vao.py

@@ -52,14 +52,10 @@ class AbstractVAO(abc.ABC):
     def remove_vao(self):
         raise NotImplementedError
 
-    def set_vertex_attribute_pointer(
-        self, id, size, type, stride, offset, normalize=False
-    ):
+    def set_vertex_attribute_pointer(self, id, size, type, stride, offset, normalize=False):
         if not self.bound:
             logger.error("VAO not bound in set_vertex_attribute_pointer")
-        gl.glVertexAttribPointer(
-            id, size, type, normalize, stride, ctypes.c_void_p(offset)
-        )
+        gl.glVertexAttribPointer(id, size, type, normalize, stride, ctypes.c_void_p(offset))
         gl.glEnableVertexAttribArray(id)
 
     def set_num_indices(self, count):

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/prim_data.py

@@ -10,7 +10,7 @@ from .vec3 import Vec3
 class Prims(enum.Enum):
     """Enum for the default primitives that can be loaded."""
 
-    BUDDAH = "buddah"
+    BUDDHA = "buddah"
     BUNNY = "bunny"
     CUBE = "cube"
     DODECAHEDRON = "dodecahedron"

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/quaternion.py

@@ -10,6 +10,7 @@ Attributes:
 import math
 
 from .mat4 import Mat4
+from .vec3 import Vec3
 
 
 class Quaternion:
@@ -75,9 +76,7 @@ class Quaternion:
         return Quaternion(s, x, y, z)
 
     def __add__(self, rhs):
-        return Quaternion(
-            self.s + rhs.s, self.x + rhs.x, self.y + rhs.y, self.z + rhs.z
-        )
+        return Quaternion(self.s + rhs.s, self.x + rhs.x, self.y + rhs.y, self.z + rhs.z)
 
     def __iadd__(self, rhs):
         self.s += rhs.s
@@ -87,20 +86,57 @@ class Quaternion:
         return self
 
     def __sub__(self, rhs):
-        return Quaternion(
-            self.s - rhs.s, self.x - rhs.x, self.y - rhs.y, self.z - rhs.z
-        )
+        return Quaternion(self.s - rhs.s, self.x - rhs.x, self.y - rhs.y, self.z - rhs.z)
 
     def __isub__(self, rhs):
         return self.__sub__(rhs)
 
+    # def __mul__(self, rhs):
+    #     return Quaternion(
+    #         self.s * rhs.s - self.x * rhs.x - self.y * rhs.y - self.z * rhs.z,
+    #         self.s * rhs.x + self.x * rhs.s + self.y * rhs.z - self.z * rhs.y,
+    #         self.s * rhs.y - self.x * rhs.z + self.y * rhs.s + self.z * rhs.x,
+    #         self.s * rhs.z + self.x * rhs.y - self.y * rhs.x + self.z * rhs.s,
+    #     )
+
     def __mul__(self, rhs):
-        return Quaternion(
-            self.s * rhs.s - self.x * rhs.x - self.y * rhs.y - self.z * rhs.z,
-            self.s * rhs.x + self.x * rhs.s + self.y * rhs.z - self.z * rhs.y,
-            self.s * rhs.y - self.x * rhs.z + self.y * rhs.s + self.z * rhs.x,
-            self.s * rhs.z + self.x * rhs.y - self.y * rhs.x + self.z * rhs.s,
-        )
+        if isinstance(rhs, Quaternion):
+            return Quaternion(
+                self.s * rhs.s - self.x * rhs.x - self.y * rhs.y - self.z * rhs.z,
+                self.s * rhs.x + self.x * rhs.s + self.y * rhs.z - self.z * rhs.y,
+                self.s * rhs.y - self.x * rhs.z + self.y * rhs.s + self.z * rhs.x,
+                self.s * rhs.z + self.x * rhs.y - self.y * rhs.x + self.z * rhs.s,
+            )
+        elif isinstance(rhs, Vec3):
+            qw = self.s
+            qx = self.x
+            qy = self.y
+            qz = self.z
+
+            vx = rhs.x
+            vy = rhs.y
+            vz = rhs.z
+
+            # pq
+            pw = -qx * vx - qy * vy - qz * vz
+            px = qw * vx + qy * vz - qz * vy
+            py = qw * vy - qx * vz + qz * vx
+            pz = qw * vz + qx * vy - qy * vx
+
+            # pqp*
+            return Vec3(
+                -pw * qx + px * qw - py * qz + pz * qy,
+                -pw * qy + px * qz + py * qw - pz * qx,
+                -pw * qz - px * qy + py * qx + pz * qw,
+            )
+
+    def normalize(self):
+        length = math.sqrt(self.s * self.s + self.x * self.x + self.y * self.y + self.z * self.z)
+        if length > 0:
+            self.s /= length
+            self.x /= length
+            self.y /= length
+            self.z /= length
 
     def __str__(self) -> str:
         """

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/vec2.py

@@ -5,6 +5,8 @@ Simple float only Vec2 class for 3D graphics, very similar to the pyngl ones
 import ctypes
 import math
 
+import numpy as np
+
 from .util import clamp
 
 
@@ -74,7 +76,7 @@ class Vec2:
         Raises:
             ValueError: If v is not a float or int.
         """
-        if not isinstance(v, (int, float)):
+        if not isinstance(v, (int, float, np.float32)):
             raise ValueError("need float or int")
         else:
             setattr(self, name, v)

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/vec3.py

@@ -73,7 +73,7 @@ class Vec3:
         Raises:
             ValueError: If v is not a float or int.
         """
-        if not isinstance(v, (int, float)):
+        if not isinstance(v, (int, float, np.float32)):
             raise ValueError("need float or int")
         else:
             setattr(self, name, v)

{ncca_ngl-0.2.3 → ncca_ngl-0.2.5}/src/ncca/ngl/vec4.py

@@ -33,7 +33,7 @@ class Vec4:
         Raises:
             ValueError: If v is not a float or int.
         """
-        if not isinstance(v, (int, float)):
+        if not isinstance(v, (int, float, np.float32)):
             raise ValueError("need float or int")
         else:
             setattr(self, name, v)