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

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

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

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

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

@@ -6,6 +6,9 @@ try:
 except PackageNotFoundError:
     __version__ = "0.0.0"
 
+__author__ = "Jon Macey jmacey@bournemouth.ac.uk"
+__license__ = "MIT"
+
 from .abstract_vao import AbstractVAO, VertexData
 from .base_mesh import BaseMesh, Face
 from .bbox import BBox

{ncca_ngl-0.2.2 → ncca_ngl-0.2.3}/src/ncca/ngl/mat2.py

@@ -45,7 +45,7 @@ class Mat2:
         Returns:
             list[float]: A flat list of floats.
         """
-        return [item for sublist in zip(*self.m) for item in sublist]
+        return [item for sublist in zip(*self.m, strict=False) for item in sublist]
 
     def to_numpy(self):
         """
@@ -125,4 +125,14 @@ class Mat2:
     def to_list(self):
         "convert matrix to list in column-major order"
         # flatten to single array
-        return [item for sublist in zip(*self.m) for item in sublist]
+        return [item for sublist in zip(*self.m, strict=False) for item in sublist]
+
+    def copy(self) -> "Mat2":
+        """Create a copy of the matrix.
+
+        Returns:
+            A new Mat2 instance with the same values.
+        """
+        new_mat = Mat2()
+        new_mat.m = copy.deepcopy(self.m)
+        return new_mat

{ncca_ngl-0.2.2 → ncca_ngl-0.2.3}/src/ncca/ngl/mat3.py

@@ -132,7 +132,7 @@ class Mat3:
 
     def transpose(self):
         """transpose this matrix"""
-        self.m = [list(item) for item in zip(*self.m)]
+        self.m = [list(item) for item in zip(*self.m, strict=False)]
 
     def get_transpose(self):
         """return a new matrix as the transpose of ourself
@@ -143,7 +143,7 @@ class Mat3:
                 The transpose of the current matrix
         """
         m = Mat3()
-        m.m = [list(item) for item in zip(*self.m)]
+        m.m = [list(item) for item in zip(*self.m, strict=False)]
         return m
 
     @classmethod
@@ -360,7 +360,7 @@ class Mat3:
         "internal add function"
         temp = Mat3()
         for i in range(0, len(temp.m)):
-            temp.m[i] = [a + b for a, b in zip(self.m[i], rhs.m[i])]
+            temp.m[i] = [a + b for a, b in zip(self.m[i], rhs.m[i], strict=False)]
         return temp
 
     def __add__(self, rhs):
@@ -375,7 +375,7 @@ class Mat3:
         "internal subtract function"
         temp = Mat3()
         for i in range(0, len(temp.m)):
-            temp.m[i] = [a - b for a, b in zip(self.m[i], rhs.m[i])]
+            temp.m[i] = [a - b for a, b in zip(self.m[i], rhs.m[i], strict=False)]
         return temp
 
     def __sub__(self, rhs):
@@ -399,6 +399,16 @@ class Mat3:
         # flatten to single array
         return functools.reduce(operator.concat, self.m)
 
+    def copy(self) -> "Mat3":
+        """Create a copy of the matrix.
+
+        Returns:
+            A new Mat3 instance with the same values.
+        """
+        new_mat = Mat3()
+        new_mat.m = copy.deepcopy(self.m)
+        return new_mat
+
     def inverse(self):
         "Inverse of matrix raise MatrixError if not calculable"
         det = self.determinant()
@@ -406,35 +416,17 @@ class Mat3:
             invdet = 1 / det
             tmp = Mat3()
             # minor matrix + co-factor
-            tmp.m[0][0] = (
-                +(self.m[1][1] * self.m[2][2] - self.m[1][2] * self.m[2][1]) * invdet
-            )
-            tmp.m[1][0] = (
-                -(self.m[1][0] * self.m[2][2] - self.m[1][2] * self.m[2][0]) * invdet
-            )
-            tmp.m[2][0] = (
-                +(self.m[1][0] * self.m[2][1] - self.m[1][1] * self.m[2][0]) * invdet
-            )
+            tmp.m[0][0] = +(self.m[1][1] * self.m[2][2] - self.m[1][2] * self.m[2][1]) * invdet
+            tmp.m[1][0] = -(self.m[1][0] * self.m[2][2] - self.m[1][2] * self.m[2][0]) * invdet
+            tmp.m[2][0] = +(self.m[1][0] * self.m[2][1] - self.m[1][1] * self.m[2][0]) * invdet
 
-            tmp.m[0][1] = (
-                -(self.m[0][1] * self.m[2][2] - self.m[0][2] * self.m[2][1]) * invdet
-            )
-            tmp.m[1][1] = (
-                +(self.m[0][0] * self.m[2][2] - self.m[0][2] * self.m[2][0]) * invdet
-            )
-            tmp.m[2][1] = (
-                -(self.m[0][0] * self.m[2][1] - self.m[0][1] * self.m[2][0]) * invdet
-            )
+            tmp.m[0][1] = -(self.m[0][1] * self.m[2][2] - self.m[0][2] * self.m[2][1]) * invdet
+            tmp.m[1][1] = +(self.m[0][0] * self.m[2][2] - self.m[0][2] * self.m[2][0]) * invdet
+            tmp.m[2][1] = -(self.m[0][0] * self.m[2][1] - self.m[0][1] * self.m[2][0]) * invdet
 
-            tmp.m[0][2] = (
-                +(self.m[0][1] * self.m[1][2] - self.m[0][2] * self.m[1][1]) * invdet
-            )
-            tmp.m[1][2] = (
-                -(self.m[0][0] * self.m[1][2] - self.m[0][2] * self.m[1][0]) * invdet
-            )
-            tmp.m[2][2] = (
-                +(self.m[0][0] * self.m[1][1] - self.m[0][1] * self.m[1][0]) * invdet
-            )
+            tmp.m[0][2] = +(self.m[0][1] * self.m[1][2] - self.m[0][2] * self.m[1][1]) * invdet
+            tmp.m[1][2] = -(self.m[0][0] * self.m[1][2] - self.m[0][2] * self.m[1][0]) * invdet
+            tmp.m[2][2] = +(self.m[0][0] * self.m[1][1] - self.m[0][1] * self.m[1][0]) * invdet
 
             return tmp
         except ZeroDivisionError:
@@ -451,16 +443,14 @@ class Mat3:
     @classmethod
     def from_mat4(cls, mat4):
         """Create a Mat3 from a Mat4"""
-        return Mat3.from_list(
-            [
-                mat4.m[0][0],
-                mat4.m[0][1],
-                mat4.m[0][2],
-                mat4.m[1][0],
-                mat4.m[1][1],
-                mat4.m[1][2],
-                mat4.m[2][0],
-                mat4.m[2][1],
-                mat4.m[2][2],
-            ]
-        )
+        return Mat3.from_list([
+            mat4.m[0][0],
+            mat4.m[0][1],
+            mat4.m[0][2],
+            mat4.m[1][0],
+            mat4.m[1][1],
+            mat4.m[1][2],
+            mat4.m[2][0],
+            mat4.m[2][1],
+            mat4.m[2][2],
+        ])

{ncca_ngl-0.2.2 → ncca_ngl-0.2.3}/src/ncca/ngl/mat4.py

@@ -86,14 +86,24 @@ class Mat4:
         # flatten to single array
         return functools.reduce(operator.concat, self.m)
 
+    def copy(self) -> "Mat4":
+        """Create a copy of the matrix.
+
+        Returns:
+            A new Mat4 instance with the same values.
+        """
+        new_mat = Mat4()
+        new_mat.m = copy.deepcopy(self.m)
+        return new_mat
+
     def transpose(self):
         "transpose this matrix"
-        self.m = [list(item) for item in zip(*self.m)]
+        self.m = [list(item) for item in zip(*self.m, strict=False)]
 
     def get_transpose(self):
         "return a new matrix as the transpose of ourself"
         m = Mat4()
-        m.m = [list(item) for item in zip(*self.m)]
+        m.m = [list(item) for item in zip(*self.m, strict=False)]
         return m
 
     @classmethod
@@ -258,7 +268,7 @@ class Mat4:
         "internal add function"
         temp = Mat4()
         for i in range(0, len(temp.m)):
-            temp.m[i] = [a + b for a, b in zip(self.m[i], rhs.m[i])]
+            temp.m[i] = [a + b for a, b in zip(self.m[i], rhs.m[i], strict=False)]
         return temp
 
     def __add__(self, rhs):
@@ -273,7 +283,7 @@ class Mat4:
         "internal sub function"
         temp = Mat4()
         for i in range(0, len(temp.m)):
-            temp.m[i] = [a - b for a, b in zip(self.m[i], rhs.m[i])]
+            temp.m[i] = [a - b for a, b in zip(self.m[i], rhs.m[i], strict=False)]
         return temp
 
     def __sub__(self, rhs):

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

@@ -42,7 +42,7 @@ class Vec2:
         yield self.x
         yield self.y
 
-    def clone(self) -> "Vec2":
+    def copy(self) -> "Vec2":
         """
         Create a copy of the vector.
         Returns:
@@ -305,9 +305,7 @@ class Vec2:
         if isinstance(rhs, (float, int)):
             return Vec2(self.x * rhs, self.y * rhs)
         else:
-            raise ValueError(
-                f"can only do piecewise multiplication with a scalar {rhs=}"
-            )
+            raise ValueError(f"can only do piecewise multiplication with a scalar {rhs=}")
 
     def __rmul__(self, rhs):
         """
@@ -330,9 +328,8 @@ class Vec2:
             Vec2: A new vector that is the result of multiplying this vector by the matrix.
         """
         return Vec2(
-            self.x * rhs.m[0][0] + self.y * rhs.m[1][0] + self.z * rhs.m[2][0],
-            self.x * rhs.m[0][1] + self.y * rhs.m[1][1] + self.z * rhs.m[2][1],
-            self.x * rhs.m[0][2] + self.y * rhs.m[1][2] + self.z * rhs.m[2][2],
+            self.x * rhs.m[0][0] + self.y * rhs.m[1][0],
+            self.x * rhs.m[0][1] + self.y * rhs.m[1][1],
         )
 
 

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

@@ -78,9 +78,9 @@ class Vec3:
         else:
             setattr(self, name, v)
 
-    def clone(self) -> "Vec3":
+    def copy(self) -> "Vec3":
         """
-        Create a clone of the current vector.
+        Create a copy of the current vector.
         Returns:
             Vec3: A new instance of Vec3 with the same x, y, and z values.
         """
@@ -156,11 +156,7 @@ class Vec3:
 
         if not isinstance(rhs, Vec3):
             return NotImplemented
-        return (
-            math.isclose(self.x, rhs.x)
-            and math.isclose(self.y, rhs.y)
-            and math.isclose(self.z, rhs.z)
-        )
+        return math.isclose(self.x, rhs.x) and math.isclose(self.y, rhs.y) and math.isclose(self.z, rhs.z)
 
     def __neq__(self, rhs):
         """
@@ -173,11 +169,7 @@ class Vec3:
         """
         if not isinstance(rhs, Vec3):
             return NotImplemented
-        return not (
-            math.isclose(self.x, rhs.x)
-            and math.isclose(self.y, rhs.y)
-            and math.isclose(self.z, rhs.z)
-        )
+        return not (math.isclose(self.x, rhs.x) and math.isclose(self.y, rhs.y) and math.isclose(self.z, rhs.z))
 
     def __neg__(self):
         """
@@ -290,9 +282,7 @@ class Vec3:
         """
         d = self.dot(n)
         #  I - 2.0 * dot(N, I) * N
-        return Vec3(
-            self.x - 2.0 * d * n.x, self.y - 2.0 * d * n.y, self.z - 2.0 * d * n.z
-        )
+        return Vec3(self.x - 2.0 * d * n.x, self.y - 2.0 * d * n.y, self.z - 2.0 * d * n.z)
 
     def clamp(self, low, high):
         """
@@ -324,13 +314,11 @@ class Vec3:
         """
         from .mat3 import Mat3
 
-        return Mat3.from_list(
-            [
-                [self.x * rhs.x, self.x * rhs.y, self.x * rhs.z],
-                [self.y * rhs.x, self.y * rhs.y, self.y * rhs.z],
-                [self.z * rhs.x, self.z * rhs.y, self.z * rhs.z],
-            ]
-        )
+        return Mat3.from_list([
+            [self.x * rhs.x, self.x * rhs.y, self.x * rhs.z],
+            [self.y * rhs.x, self.y * rhs.y, self.y * rhs.z],
+            [self.z * rhs.x, self.z * rhs.y, self.z * rhs.z],
+        ])
 
     def __mul__(self, rhs):
         """
@@ -345,9 +333,7 @@ class Vec3:
         if isinstance(rhs, (float, int)):
             return Vec3(self.x * rhs, self.y * rhs, self.z * rhs)
         else:
-            raise ValueError(
-                f"can only do piecewise multiplication with a scalar {rhs=}"
-            )
+            raise ValueError(f"can only do piecewise multiplication with a scalar {rhs=}")
 
     def __rmul__(self, rhs):
         """

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

@@ -65,7 +65,7 @@ class Vec4:
         except IndexError:
             raise IndexError("Index out of range. Valid indices are 0, 1, 2, and 3.")
 
-    def clone(self) -> "Vec4":
+    def copy(self) -> "Vec4":
         """
         Create a copy of the vector.
         Returns:
@@ -192,22 +192,10 @@ class Vec4:
     def __matmul__(self, rhs):
         "Vec4 @ Mat4 matrix multiplication"
         return Vec4(
-            self.x * rhs.m[0][0]
-            + self.y * rhs.m[1][0]
-            + self.z * rhs.m[2][0]
-            + self.w * rhs.m[3][0],
-            self.x * rhs.m[0][1]
-            + self.y * rhs.m[1][1]
-            + self.z * rhs.m[2][1]
-            + self.w * rhs.m[3][1],
-            self.x * rhs.m[0][2]
-            + self.y * rhs.m[1][2]
-            + self.z * rhs.m[2][2]
-            + self.w * rhs.m[3][2],
-            self.x * rhs.m[0][3]
-            + self.y * rhs.m[1][3]
-            + self.z * rhs.m[2][3]
-            + self.w * rhs.m[3][3],
+            self.x * rhs.m[0][0] + self.y * rhs.m[1][0] + self.z * rhs.m[2][0] + self.w * rhs.m[3][0],
+            self.x * rhs.m[0][1] + self.y * rhs.m[1][1] + self.z * rhs.m[2][1] + self.w * rhs.m[3][1],
+            self.x * rhs.m[0][2] + self.y * rhs.m[1][2] + self.z * rhs.m[2][2] + self.w * rhs.m[3][2],
+            self.x * rhs.m[0][3] + self.y * rhs.m[1][3] + self.z * rhs.m[2][3] + self.w * rhs.m[3][3],
         )
 
     def __repr__(self):