ncca-ngl 0.1.2__tar.gz → 0.1.6__tar.gz

ncca_ngl-0.1.6/PKG-INFO

@@ -0,0 +1,22 @@
+Metadata-Version: 2.3
+Name: ncca-ngl
+Version: 0.1.6
+Summary: A Python version of the NGL graphics library.
+Author: Jon Macey
+Author-email: Jon Macey <jmacey@bournemouth.ac.uk>
+License: Copyright 2024 Jon Macey
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Requires-Dist: numpy>=2.3.3
+Requires-Dist: pyopengl
+Requires-Dist: pillow
+Requires-Dist: glfw>=2.9.0
+Requires-Dist: freetype-py>=2.5.1
+Requires-Dist: pyside6>=6.9.2
+Requires-Python: >=3.13
+Project-URL: Homepage, https://github.com/NCCA/PyNGL
+Project-URL: Issues, https://github.com/NCCA/PyNGL/issues

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ncca-ngl"
-version = "0.1.2"
+version = "0.1.6"
 description = "A Python version of the NGL graphics library."
 authors = [{ name = "Jon Macey", email = "jmacey@bournemouth.ac.uk" }]
 requires-python = ">=3.13"
@@ -13,7 +13,6 @@ dependencies = [
     "glfw>=2.9.0",
     "freetype-py>=2.5.1",
     "pyside6>=6.9.2",
-    "hatch>=1.14.2",
 ]
 
 [project.urls]
@@ -24,21 +23,13 @@ Issues = "https://github.com/NCCA/PyNGL/issues"
 [tool.pytest.ini_options]
 pythonpath = ["src","tests"]
 
-
 [build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools.packages.find]
-where = ["src"]
-include = ["ncca.*"]
-
-[tool.setuptools.package-data]
-"ncca.ngl" = ["shaders/*", "PrimData/Primitives.npz"]
-
-[tool.setuptools]
-include-package-data = true
+requires = ["uv_build>=0.8.13,<0.9.0"]
+build-backend = "uv_build"
 
+[tool.uv.build-backend]
+module-name = "ncca.ngl"
+module-root = "src"
 
 
 [dependency-groups]

ncca_ngl-0.1.6/src/ncca/ngl/.ruff_cache/.gitignore

@@ -0,0 +1,2 @@
+# Automatically created by ruff.
+*

ncca_ngl-0.1.6/src/ncca/ngl/.ruff_cache/CACHEDIR.TAG

@@ -0,0 +1 @@
+Signature: 8a477f597d28d172789f06886806bc55

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/__init__.py

@@ -1,3 +1,11 @@
+# generate auto __version__
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("ncca-ngl")
+except PackageNotFoundError:
+    __version__ = "0.0.0"
+
 from .abstract_vao import AbstractVAO, VertexData
 from .base_mesh import BaseMesh, Face
 from .bbox import BBox

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/abstract_vao.py

@@ -52,10 +52,14 @@ 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.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/quaternion.py

@@ -75,7 +75,9 @@ 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
@@ -85,7 +87,9 @@ 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)

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/shader_program.py

@@ -345,11 +345,20 @@ class ShaderProgram:
                     )
 
         elif len(value) == 2:
-            gl.glUniform2f(loc, *value)
+            if isinstance(value[0], int):
+                gl.glUniform2i(loc, *value)
+            else:
+                gl.glUniform2f(loc, *value)
         elif len(value) == 3:
-            gl.glUniform3f(loc, *value)
+            if isinstance(value[0], int):
+                gl.glUniform3i(loc, *value)
+            else:
+                gl.glUniform3f(loc, *value)
         elif len(value) == 4:
-            gl.glUniform4f(loc, *value)
+            if isinstance(value[0], int):
+                gl.glUniform4i(loc, *value)
+            else:
+                gl.glUniform4f(loc, *value)
 
     def set_uniform_1fv(self, name: str, values: List[float]) -> None:
         """
@@ -719,19 +728,121 @@ class ShaderProgram:
             str: Human-readable type string
         """
         type_map = {
+            # Scalars
             gl.GL_FLOAT: "float",
-            gl.GL_FLOAT_VEC2: "vec2",
-            gl.GL_FLOAT_VEC3: "vec3",
-            gl.GL_FLOAT_VEC4: "vec4",
             gl.GL_DOUBLE: "double",
             gl.GL_INT: "int",
-            gl.GL_UNSIGNED_INT: "unsigned int",
+            gl.GL_UNSIGNED_INT: "uint",
             gl.GL_BOOL: "bool",
+            # Float vectors
+            gl.GL_FLOAT_VEC2: "vec2",
+            gl.GL_FLOAT_VEC3: "vec3",
+            gl.GL_FLOAT_VEC4: "vec4",
+            # Double vectors
+            gl.GL_DOUBLE_VEC2: "dvec2",
+            gl.GL_DOUBLE_VEC3: "dvec3",
+            gl.GL_DOUBLE_VEC4: "dvec4",
+            # Integer vectors
+            gl.GL_INT_VEC2: "ivec2",
+            gl.GL_INT_VEC3: "ivec3",
+            gl.GL_INT_VEC4: "ivec4",
+            # Unsigned int vectors
+            gl.GL_UNSIGNED_INT_VEC2: "uvec2",
+            gl.GL_UNSIGNED_INT_VEC3: "uvec3",
+            gl.GL_UNSIGNED_INT_VEC4: "uvec4",
+            # Bool vectors
+            gl.GL_BOOL_VEC2: "bvec2",
+            gl.GL_BOOL_VEC3: "bvec3",
+            gl.GL_BOOL_VEC4: "bvec4",
+            # Float matrices
             gl.GL_FLOAT_MAT2: "mat2",
             gl.GL_FLOAT_MAT3: "mat3",
             gl.GL_FLOAT_MAT4: "mat4",
+            gl.GL_FLOAT_MAT2x3: "mat2x3",
+            gl.GL_FLOAT_MAT2x4: "mat2x4",
+            gl.GL_FLOAT_MAT3x2: "mat3x2",
+            gl.GL_FLOAT_MAT3x4: "mat3x4",
+            gl.GL_FLOAT_MAT4x2: "mat4x2",
+            gl.GL_FLOAT_MAT4x3: "mat4x3",
+            # Double matrices
+            gl.GL_DOUBLE_MAT2: "dmat2",
+            gl.GL_DOUBLE_MAT3: "dmat3",
+            gl.GL_DOUBLE_MAT4: "dmat4",
+            gl.GL_DOUBLE_MAT2x3: "dmat2x3",
+            gl.GL_DOUBLE_MAT2x4: "dmat2x4",
+            gl.GL_DOUBLE_MAT3x2: "dmat3x2",
+            gl.GL_DOUBLE_MAT3x4: "dmat3x4",
+            gl.GL_DOUBLE_MAT4x2: "dmat4x2",
+            gl.GL_DOUBLE_MAT4x3: "dmat4x3",
+            # Samplers (float)
+            gl.GL_SAMPLER_1D: "sampler1D",
             gl.GL_SAMPLER_2D: "sampler2D",
+            gl.GL_SAMPLER_3D: "sampler3D",
             gl.GL_SAMPLER_CUBE: "samplerCube",
+            gl.GL_SAMPLER_1D_SHADOW: "sampler1DShadow",
+            gl.GL_SAMPLER_2D_SHADOW: "sampler2DShadow",
+            gl.GL_SAMPLER_1D_ARRAY: "sampler1DArray",
+            gl.GL_SAMPLER_2D_ARRAY: "sampler2DArray",
+            gl.GL_SAMPLER_1D_ARRAY_SHADOW: "sampler1DArrayShadow",
+            gl.GL_SAMPLER_2D_ARRAY_SHADOW: "sampler2DArrayShadow",
+            gl.GL_SAMPLER_CUBE_SHADOW: "samplerCubeShadow",
+            gl.GL_SAMPLER_BUFFER: "samplerBuffer",
+            gl.GL_SAMPLER_2D_RECT: "sampler2DRect",
+            gl.GL_SAMPLER_2D_RECT_SHADOW: "sampler2DRectShadow",
+            # Samplers (int)
+            gl.GL_INT_SAMPLER_1D: "isampler1D",
+            gl.GL_INT_SAMPLER_2D: "isampler2D",
+            gl.GL_INT_SAMPLER_3D: "isampler3D",
+            gl.GL_INT_SAMPLER_CUBE: "isamplerCube",
+            gl.GL_INT_SAMPLER_1D_ARRAY: "isampler1DArray",
+            gl.GL_INT_SAMPLER_2D_ARRAY: "isampler2DArray",
+            gl.GL_INT_SAMPLER_BUFFER: "isamplerBuffer",
+            gl.GL_INT_SAMPLER_2D_RECT: "isampler2DRect",
+            # Samplers (unsigned int)
+            gl.GL_UNSIGNED_INT_SAMPLER_1D: "usampler1D",
+            gl.GL_UNSIGNED_INT_SAMPLER_2D: "usampler2D",
+            gl.GL_UNSIGNED_INT_SAMPLER_3D: "usampler3D",
+            gl.GL_UNSIGNED_INT_SAMPLER_CUBE: "usamplerCube",
+            gl.GL_UNSIGNED_INT_SAMPLER_1D_ARRAY: "usampler1DArray",
+            gl.GL_UNSIGNED_INT_SAMPLER_2D_ARRAY: "usampler2DArray",
+            gl.GL_UNSIGNED_INT_SAMPLER_BUFFER: "usamplerBuffer",
+            gl.GL_UNSIGNED_INT_SAMPLER_2D_RECT: "usampler2DRect",
+            # Images (float)
+            gl.GL_IMAGE_1D: "image1D",
+            gl.GL_IMAGE_2D: "image2D",
+            gl.GL_IMAGE_3D: "image3D",
+            gl.GL_IMAGE_2D_RECT: "image2DRect",
+            gl.GL_IMAGE_CUBE: "imageCube",
+            gl.GL_IMAGE_BUFFER: "imageBuffer",
+            gl.GL_IMAGE_1D_ARRAY: "image1DArray",
+            gl.GL_IMAGE_2D_ARRAY: "image2DArray",
+            gl.GL_IMAGE_CUBE_MAP_ARRAY: "imageCubeArray",
+            gl.GL_IMAGE_2D_MULTISAMPLE: "image2DMS",
+            gl.GL_IMAGE_2D_MULTISAMPLE_ARRAY: "image2DMSArray",
+            # Images (int)
+            gl.GL_INT_IMAGE_1D: "iimage1D",
+            gl.GL_INT_IMAGE_2D: "iimage2D",
+            gl.GL_INT_IMAGE_3D: "iimage3D",
+            gl.GL_INT_IMAGE_2D_RECT: "iimage2DRect",
+            gl.GL_INT_IMAGE_CUBE: "iimageCube",
+            gl.GL_INT_IMAGE_BUFFER: "iimageBuffer",
+            gl.GL_INT_IMAGE_1D_ARRAY: "iimage1DArray",
+            gl.GL_INT_IMAGE_2D_ARRAY: "iimage2DArray",
+            gl.GL_INT_IMAGE_CUBE_MAP_ARRAY: "iimageCubeArray",
+            gl.GL_INT_IMAGE_2D_MULTISAMPLE: "iimage2DMS",
+            gl.GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY: "iimage2DMSArray",
+            # Images (unsigned int)
+            gl.GL_UNSIGNED_INT_IMAGE_1D: "uimage1D",
+            gl.GL_UNSIGNED_INT_IMAGE_2D: "uimage2D",
+            gl.GL_UNSIGNED_INT_IMAGE_3D: "uimage3D",
+            gl.GL_UNSIGNED_INT_IMAGE_2D_RECT: "uimage2DRect",
+            gl.GL_UNSIGNED_INT_IMAGE_CUBE: "uimageCube",
+            gl.GL_UNSIGNED_INT_IMAGE_BUFFER: "uimageBuffer",
+            gl.GL_UNSIGNED_INT_IMAGE_1D_ARRAY: "uimage1DArray",
+            gl.GL_UNSIGNED_INT_IMAGE_2D_ARRAY: "uimage2DArray",
+            gl.GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY: "uimageCubeArray",
+            gl.GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE: "uimage2DMS",
+            gl.GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY: "uimage2DMSArray",
         }
         return type_map.get(gl_type, f"Unknown type {gl_type}")
 

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/shaders/text_fragment.glsl

@@ -1,10 +1,10 @@
 #version 410 core
 in vec2 v_uv;
 uniform sampler2D textureID;
-uniform vec4 textColor;
+uniform vec4 textColour;
 out vec4 fragColor;
 void main()
 {
     float a = texture(textureID, v_uv).a;
-    fragColor = vec4(textColor.rgb, textColor.a * a);
+    fragColor = vec4(textColour.rgb, textColour.a * a);
 }

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/text.py

@@ -223,12 +223,12 @@ class _Text:
         """
         ShaderLib.use(DefaultShader.TEXT)
         ShaderLib.set_uniform("textureID", 0)
-        ShaderLib.set_uniform("screenSize", w, h)
+        ShaderLib.set_uniform("screenSize", float(w), float(h))
         ShaderLib.set_uniform("fontSize", 1.0)
-        ShaderLib.set_uniform("textColor", 1.0, 1.0, 1.0, 1.0)
+        ShaderLib.set_uniform("textColour", 1.0, 1.0, 1.0, 1.0)
 
     def render_text(
-        self, font: str, x: int, y: int, text: str, colour: Vec3 = Vec3(1, 1, 1)
+        self, font: str, x: int, y: int, text: str, colour: Vec3 = Vec3(1.0, 1.0, 1.0)
     ) -> None:
         """
         Renders a string of text to the screen.
@@ -276,7 +276,9 @@ class _Text:
             gl.glActiveTexture(gl.GL_TEXTURE0)
             gl.glBindTexture(gl.GL_TEXTURE_2D, atlas.texture)
             ShaderLib.use(DefaultShader.TEXT)
-            ShaderLib.set_uniform("textColor", colour.x, colour.y, colour.z, 1.0)
+            ShaderLib.set_uniform(
+                "textColour", float(colour.x), float(colour.y), float(colour.z), 1.0
+            )
             # We are drawing one point per character
             vao.set_num_indices(len(render_data) // 8)
             vao.draw()

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/vec2.py

@@ -305,7 +305,9 @@ 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):
         """

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/vec2_array.py

@@ -14,17 +14,23 @@ class Vec2Array:
 
     def __init__(self, values=None):
         """
-        Initializes the Vec2Array.
+        Initializes the Vec3Array.
 
         Args:
-            values (iterable, optional): An iterable of Vec2 objects. Defaults to None.
+            values (iterable | int, optional): An iterable of Vec3 objects or an integer.
+                If an integer, the array is initialized with that many default Vec3s.
+                If an iterable, it's initialized with the Vec3s from the iterable.
+                Defaults to None (an empty array).
         """
         self._data = []
         if values is not None:
-            for v in values:
-                if not isinstance(v, Vec2):
-                    raise TypeError("All elements must be of type Vec2")
-                self._data.append(v)
+            if isinstance(values, int):
+                self._data = [Vec2() for _ in range(values)]
+            else:
+                for v in values:
+                    if not isinstance(v, Vec2):
+                        raise TypeError("All elements must be of type Vec2")
+                    self._data.append(v)
 
     def __getitem__(self, index):
         """
@@ -38,6 +44,18 @@ class Vec2Array:
         """
         return self._data[index]
 
+    def __setitem__(self, index, value):
+        """
+        Set the Vec2 at the specified index.
+
+        Args:
+            index (int): The index of the element to set.
+            value (Vec3): The new Vec3 object.
+        """
+        if not isinstance(value, Vec2):
+            raise TypeError("Only Vec2 objects can be assigned")
+        self._data[index] = value
+
     def __len__(self):
         """
         Return the number of elements in the array.

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/vec3.py

@@ -156,7 +156,11 @@ 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):
         """
@@ -169,7 +173,11 @@ 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):
         """
@@ -282,7 +290,9 @@ 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):
         """
@@ -314,11 +324,13 @@ 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):
         """
@@ -333,7 +345,9 @@ 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.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/vec3_array.py

@@ -17,14 +17,20 @@ class Vec3Array:
         Initializes the Vec3Array.
 
         Args:
-            values (iterable, optional): An iterable of Vec3 objects. Defaults to None.
+            values (iterable | int, optional): An iterable of Vec3 objects or an integer.
+                If an integer, the array is initialized with that many default Vec3s.
+                If an iterable, it's initialized with the Vec3s from the iterable.
+                Defaults to None (an empty array).
         """
         self._data = []
         if values is not None:
-            for v in values:
-                if not isinstance(v, Vec3):
-                    raise TypeError("All elements must be of type Vec3")
-                self._data.append(v)
+            if isinstance(values, int):
+                self._data = [Vec3() for _ in range(values)]
+            else:
+                for v in values:
+                    if not isinstance(v, Vec3):
+                        raise TypeError("All elements must be of type Vec3")
+                    self._data.append(v)
 
     def __getitem__(self, index):
         """
@@ -38,6 +44,18 @@ class Vec3Array:
         """
         return self._data[index]
 
+    def __setitem__(self, index, value):
+        """
+        Set the Vec3 at the specified index.
+
+        Args:
+            index (int): The index of the element to set.
+            value (Vec3): The new Vec3 object.
+        """
+        if not isinstance(value, Vec3):
+            raise TypeError("Only Vec3 objects can be assigned")
+        self._data[index] = value
+
     def __len__(self):
         """
         Return the number of elements in the array.

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/vec4.py

@@ -192,10 +192,22 @@ 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):

{ncca_ngl-0.1.2 → ncca_ngl-0.1.6}/src/ncca/ngl/vec4_array.py

@@ -14,17 +14,23 @@ class Vec4Array:
 
     def __init__(self, values=None):
         """
-        Initializes the Vec4Array.
+        Initializes the Vec3Array.
 
         Args:
-            values (iterable, optional): An iterable of Vec4 objects. Defaults to None.
+            values (iterable | int, optional): An iterable of Vec4 objects or an integer.
+                If an integer, the array is initialized with that many default Vec3s.
+                If an iterable, it's initialized with the Vec3s from the iterable.
+                Defaults to None (an empty array).
         """
         self._data = []
         if values is not None:
-            for v in values:
-                if not isinstance(v, Vec4):
-                    raise TypeError("All elements must be of type Vec4")
-                self._data.append(v)
+            if isinstance(values, int):
+                self._data = [Vec4() for _ in range(values)]
+            else:
+                for v in values:
+                    if not isinstance(v, Vec4):
+                        raise TypeError("All elements must be of type Vec4")
+                    self._data.append(v)
 
     def __getitem__(self, index):
         """
@@ -38,6 +44,18 @@ class Vec4Array:
         """
         return self._data[index]
 
+    def __setitem__(self, index, value):
+        """
+        Set the Vec3 at the specified index.
+
+        Args:
+            index (int): The index of the element to set.
+            value (Vec4): The new Vec3 object.
+        """
+        if not isinstance(value, Vec4):
+            raise TypeError("Only Vec4 objects can be assigned")
+        self._data[index] = value
+
     def __len__(self):
         """
         Return the number of elements in the array.

ncca_ngl-0.1.2/MANIFEST.in

@@ -1,33 +0,0 @@
-# Include package data
-include src/ncca/ngl/shaders/*
-include src/ncca/ngl/PrimData/Primitives.npz
-
-# Include license and readme
-include LICENSE.txt
-include README.md
-
-# Exclude tests and test-related files
-exclude tests/*
-global-exclude tests/*
-global-exclude *test*
-global-exclude __pycache__/*
-global-exclude *.pyc
-global-exclude *.pyo
-
-# Exclude development and build files
-exclude .gitignore
-exclude .pre-commit-config.yaml
-exclude pyproject.toml.bak
-exclude *.log
-exclude TODO.md
-exclude sonar-project.properties
-exclude uv.lock
-
-# Exclude directories
-prune tests
-prune .pytest_cache
-prune .ruff_cache
-prune .venv
-prune dist
-prune tmp
-prune .github

ncca_ngl-0.1.2/PKG-INFO

@@ -1,24 +0,0 @@
-Metadata-Version: 2.4
-Name: ncca-ngl
-Version: 0.1.2
-Summary: A Python version of the NGL graphics library.
-Author-email: Jon Macey <jmacey@bournemouth.ac.uk>
-License: Copyright 2024 Jon Macey
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Project-URL: Homepage, https://github.com/NCCA/PyNGL
-Project-URL: Issues, https://github.com/NCCA/PyNGL/issues
-Requires-Python: >=3.13
-License-File: LICENSE.txt
-Requires-Dist: numpy>=2.3.3
-Requires-Dist: PyOpenGL
-Requires-Dist: Pillow
-Requires-Dist: glfw>=2.9.0
-Requires-Dist: freetype-py>=2.5.1
-Requires-Dist: pyside6>=6.9.2
-Requires-Dist: hatch>=1.14.2
-Dynamic: license-file

ncca_ngl-0.1.2/README.md

@@ -1,22 +0,0 @@
-# PyNGL
-
-This is the code for the full python version of [NGL](https://github.com/NCCA/NGL) the ncca graphics library.
-
-More details soon as this is work in progress.
-
-
-## Test
-
-use
-
-```
-uv run pytest
-```
-
-To run tests,
-
-```
-uv run pytest --cov=src --cov-report=term-missing
-```
-
-For coverage reports.

ncca_ngl-0.1.2/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-

ncca_ngl-0.1.2/src/ncca_ngl.egg-info/PKG-INFO

@@ -1,24 +0,0 @@
-Metadata-Version: 2.4
-Name: ncca-ngl
-Version: 0.1.2
-Summary: A Python version of the NGL graphics library.
-Author-email: Jon Macey <jmacey@bournemouth.ac.uk>
-License: Copyright 2024 Jon Macey
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Project-URL: Homepage, https://github.com/NCCA/PyNGL
-Project-URL: Issues, https://github.com/NCCA/PyNGL/issues
-Requires-Python: >=3.13
-License-File: LICENSE.txt
-Requires-Dist: numpy>=2.3.3
-Requires-Dist: PyOpenGL
-Requires-Dist: Pillow
-Requires-Dist: glfw>=2.9.0
-Requires-Dist: freetype-py>=2.5.1
-Requires-Dist: pyside6>=6.9.2
-Requires-Dist: hatch>=1.14.2
-Dynamic: license-file

ncca_ngl-0.1.2/src/ncca_ngl.egg-info/SOURCES.txt

@@ -1,55 +0,0 @@
-LICENSE.txt
-MANIFEST.in
-README.md
-pyproject.toml
-src/ncca/ngl/__init__.py
-src/ncca/ngl/abstract_vao.py
-src/ncca/ngl/base_mesh.py
-src/ncca/ngl/base_mesh.pyi
-src/ncca/ngl/bbox.py
-src/ncca/ngl/bezier_curve.py
-src/ncca/ngl/first_person_camera.py
-src/ncca/ngl/image.py
-src/ncca/ngl/log.py
-src/ncca/ngl/mat2.py
-src/ncca/ngl/mat3.py
-src/ncca/ngl/mat4.py
-src/ncca/ngl/multi_buffer_vao.py
-src/ncca/ngl/obj.py
-src/ncca/ngl/plane.py
-src/ncca/ngl/primitives.py
-src/ncca/ngl/pyside_event_handling_mixin.py
-src/ncca/ngl/quaternion.py
-src/ncca/ngl/random.py
-src/ncca/ngl/shader.py
-src/ncca/ngl/shader_lib.py
-src/ncca/ngl/shader_program.py
-src/ncca/ngl/simple_index_vao.py
-src/ncca/ngl/simple_vao.py
-src/ncca/ngl/text.py
-src/ncca/ngl/texture.py
-src/ncca/ngl/transform.py
-src/ncca/ngl/util.py
-src/ncca/ngl/vao_factory.py
-src/ncca/ngl/vec2.py
-src/ncca/ngl/vec2_array.py
-src/ncca/ngl/vec3.py
-src/ncca/ngl/vec3_array.py
-src/ncca/ngl/vec4.py
-src/ncca/ngl/vec4_array.py
-src/ncca/ngl/PrimData/Primitives.npz
-src/ncca/ngl/PrimData/pack_arrays.py
-src/ncca/ngl/shaders/checker_fragment.glsl
-src/ncca/ngl/shaders/checker_vertex.glsl
-src/ncca/ngl/shaders/colour_fragment.glsl
-src/ncca/ngl/shaders/colour_vertex.glsl
-src/ncca/ngl/shaders/diffuse_fragment.glsl
-src/ncca/ngl/shaders/diffuse_vertex.glsl
-src/ncca/ngl/shaders/text_fragment.glsl
-src/ncca/ngl/shaders/text_geometry.glsl
-src/ncca/ngl/shaders/text_vertex.glsl
-src/ncca_ngl.egg-info/PKG-INFO
-src/ncca_ngl.egg-info/SOURCES.txt
-src/ncca_ngl.egg-info/dependency_links.txt
-src/ncca_ngl.egg-info/requires.txt
-src/ncca_ngl.egg-info/top_level.txt

ncca_ngl-0.1.2/src/ncca_ngl.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

ncca_ngl-0.1.2/src/ncca_ngl.egg-info/requires.txt

@@ -1,7 +0,0 @@
-numpy>=2.3.3
-PyOpenGL
-Pillow
-glfw>=2.9.0
-freetype-py>=2.5.1
-pyside6>=6.9.2
-hatch>=1.14.2

ncca_ngl-0.1.2/src/ncca_ngl.egg-info/top_level.txt

@@ -1 +0,0 @@
-ncca