ncca-ngl 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

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/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/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/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/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/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/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)

{ncca_ngl-0.2.3.dist-info → ncca_ngl-0.2.5.dist-info}/METADATA

@@ -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.dist-info → ncca_ngl-0.2.5.dist-info}/RECORD

@@ -15,8 +15,8 @@ ncca/ngl/PrimData/pack_arrays.py,sha256=aWShJX8QPHXKTj66C8yu1DskmD3VEzFXyaADcxw6
 ncca/ngl/PrimData/teapot.npy,sha256=fiOfYtB5SkegO7uTSitpjl_HmnS_iIy0sXAGfxCXXjY,1350560
 ncca/ngl/PrimData/tetrahedron.npy,sha256=_KCSpflFXhYB4gGVxFmF5Cv6pQyPHuUlCj9xfL2oyEM,512
 ncca/ngl/PrimData/troll.npy,sha256=ohgGgxLCJrmsFdNrlfRY2Rg9eJgcmvArf6IAspO2BKA,3505280
-ncca/ngl/__init__.py,sha256=q_DDdcYjGy26vMOeK8xT4oiOE5QKS678y1XsbxfwMgc,2614
-ncca/ngl/abstract_vao.py,sha256=VLKp3pmPYK_dQgEImMOAQ0DufAswK_0H4DR4r8flp2U,2104
+ncca/ngl/__init__.py,sha256=2zCMEMQLSZNeWUTY1i7GnRZqhmerPy1F220NoFPfJB0,2640
+ncca/ngl/abstract_vao.py,sha256=fi7-BIfw1jefcXe09Qj2gGmnqqA9kzJK-hAwfG14Hrc,2068
 ncca/ngl/base_mesh.py,sha256=2JmVT5_bvgLHra1VnwRld-mh-20IqqekgEu1dbGU1a4,5736
 ncca/ngl/base_mesh.pyi,sha256=kobLuNnCSZlRRobIgVopQaS7Bjg0tJ3m4M64WXt5I-M,173
 ncca/ngl/bbox.py,sha256=PylB6ju_bkdDUqQkzO1n2E-jsmxiviNkyBLY-sN59n8,6578
@@ -30,10 +30,10 @@ ncca/ngl/mat4.py,sha256=i6ZKnMpwJdh8ULTjcnWKPo9UK39ulU4WeUdoet4yZAE,17574
 ncca/ngl/multi_buffer_vao.py,sha256=cuNE6gSrqkNcYvfIOYOZp4MVnpCvChUgnzsf7b60pWg,1752
 ncca/ngl/obj.py,sha256=AGldNouHrkrDs2UhATClGkgo4dzr6lzArR4YeCxQKmo,13667
 ncca/ngl/plane.py,sha256=96WuGzexYKhoeRVevGP2pZcustt9fzyyAjuwJHT25tk,1299
-ncca/ngl/prim_data.py,sha256=sBynXeAfVtYXK7dkdLYELo0VIbN1lK1KZ8KMmCWzjBA,19047
+ncca/ngl/prim_data.py,sha256=SmHoN1wpQlu3HSfZuLBqsR8jEnVGAqdXcwSq62Lepgg,19047
 ncca/ngl/primitives.py,sha256=pThdSWLv7jJa9weBVOXhRgTfVVH54AWCbsDFCEI1YLg,4841
 ncca/ngl/pyside_event_handling_mixin.py,sha256=L8obXeTp-g2Va2eXyd1hnmSp-sY7p4GX6EcFYRnH1F4,10588
-ncca/ngl/quaternion.py,sha256=agmbW8i125FyLOV2Z9SpTY5yQwmnnm0rxQawwHqq1YI,3858
+ncca/ngl/quaternion.py,sha256=hvMoaV7uxx60boPg4cTqLJDyTpFZrEpUhikNqmNVTrU,5188
 ncca/ngl/random.py,sha256=wX1R2rMpb76TP4rk44NUp5XoVuMisH9d-eBG5kFBZsM,5579
 ncca/ngl/shader.py,sha256=fEz8R_itsQssIxQp1E8-PhY3aOaTdm7sXpyFYoARSic,7696
 ncca/ngl/shader_lib.py,sha256=YmF3EJM9roTEt5OI5sHonAVN_ydIseyiOUBFZTX4KdA,18627
@@ -54,12 +54,12 @@ ncca/ngl/texture.py,sha256=OgBBEItgUDohCsVWgmjEWcQWBJaXl9w070PTOOywPx4,2303
 ncca/ngl/transform.py,sha256=_PibgtFoU_exfvQUWucmts0WF5OreSTNbftvSa3zT8g,2938
 ncca/ngl/util.py,sha256=8jp5vTVuGfVHMSktFEubtoaQ8SvLIQtM2UNbUeMTOFk,4372
 ncca/ngl/vao_factory.py,sha256=v87VfrUMaoqcsE-CS9kM7h5Fyk_e0LGl_iA6xqaomPg,930
-ncca/ngl/vec2.py,sha256=XLDBdSS2uqJbDG4gl1bL2YR79fl77bQeu98OEMQMVCQ,10204
+ncca/ngl/vec2.py,sha256=ggrBtJK77c9d_JnN6eik50kZAa1zjudWhll6_5afkFo,10236
 ncca/ngl/vec2_array.py,sha256=7QRgXh75fORsmNnSnNxNQWk6_rnDgfmRX3tmJZ4ES9E,3420
-ncca/ngl/vec3.py,sha256=NAiwdosG5ONcdGBBQGCfnskMdj7MH3eGagavjaU1SyI,12263
+ncca/ngl/vec3.py,sha256=N_-LvP0nB0CQrZWG7TJntUl6QDHzIVLP-J1w8wPZTM0,12275
 ncca/ngl/vec3_array.py,sha256=fLRC8k0TwcaU7CnR2GmJ0prud4dcvvUX0JTbQH_2W3Y,3535
-ncca/ngl/vec4.py,sha256=rkowZkxacU9l0piLnsEYdgMn94gdkYUzipcn4i8lES0,6739
+ncca/ngl/vec4.py,sha256=mLl23D-3yAxh7GsP44ilRto-PMqIDxJjcZpNl2MyqGQ,6751
 ncca/ngl/vec4_array.py,sha256=PSJXfG0g2AT4oQCLHiVAP6EC5n7vMXRQy0N1rGvv1iw,3426
-ncca_ngl-0.2.3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-ncca_ngl-0.2.3.dist-info/METADATA,sha256=NDXrssowGaXxZNo2-cZlO0yl-mtiYlz_BQfGZe12OBg,1596
-ncca_ngl-0.2.3.dist-info/RECORD,,
+ncca_ngl-0.2.5.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+ncca_ngl-0.2.5.dist-info/METADATA,sha256=-oJBR9uyewb9MnPn6ifLU6eqp3TBukVUP1zWfeGRo50,1596
+ncca_ngl-0.2.5.dist-info/RECORD,,