ncca-ngl 0.1.1__tar.gz → 0.1.4__tar.gz

ncca_ngl-0.1.4/PKG-INFO

@@ -0,0 +1,22 @@
+Metadata-Version: 2.3
+Name: ncca-ngl
+Version: 0.1.4
+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.1 → ncca_ngl-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ncca-ngl"
-version = "0.1.1"
+version = "0.1.4"
 description = "A Python version of the NGL graphics library."
 authors = [{ name = "Jon Macey", email = "jmacey@bournemouth.ac.uk" }]
 requires-python = ">=3.13"
@@ -13,33 +13,23 @@ dependencies = [
     "glfw>=2.9.0",
     "freetype-py>=2.5.1",
     "pyside6>=6.9.2",
-    "hatch>=1.14.2",
 ]
 
 [project.urls]
 Homepage = "https://github.com/NCCA/PyNGL"
 Issues = "https://github.com/NCCA/PyNGL/issues"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-include = ["ncca.*"]
 
 [tool.pytest.ini_options]
 pythonpath = ["src","tests"]
 
-
 [build-system]
-# requires = ["setuptools>=61.0"]
-# build-backend = "setuptools.build_meta"
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-[tool.hatch.build.targets.wheel]
-      packages = ["src/ncca/*"]
-      exclude = [
-        "tests",
-      ]
-
+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.4/src/ncca/ngl/.ruff_cache/.gitignore

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

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

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

{ncca_ngl-0.1.1 → ncca_ngl-0.1.4}/src/ncca/ngl/shader_program.py

@@ -105,9 +105,7 @@ class ShaderProgram:
             if is_array:
                 for element_idx in range(size):
                     element_name = f"{base_name}[{element_idx}]"
-                    element_location = gl.glGetUniformLocation(
-                        self._id, element_name.encode("utf-8")
-                    )
+                    element_location = gl.glGetUniformLocation(self._id, element_name.encode("utf-8"))
                     if element_location != -1:
                         # Store individual array element: (location, shader_type, 1, False)
                         self._uniforms[element_name] = (
@@ -122,9 +120,7 @@ class ShaderProgram:
                 logger.info(
                     f"Registered array uniform: {base_name}[{size}] (type: {self.get_gl_type_string(shader_type)}, location: {location})"
                 )
-                logger.info(
-                    f"  Also registered individual elements: {base_name}[0] to {base_name}[{size - 1}]"
-                )
+                logger.info(f"  Also registered individual elements: {base_name}[0] to {base_name}[{size - 1}]")
             else:
                 logger.info(
                     f"Registered uniform: {base_name} (type: {self.get_gl_type_string(shader_type)}, location: {location})"
@@ -147,14 +143,8 @@ class ShaderProgram:
             name_buffer = (ctypes.c_char * 256)()
             length = ctypes.c_int()
 
-            gl.glGetActiveUniformBlockName(
-                self._id, i, 256, ctypes.byref(length), name_buffer
-            )
-            name_str = (
-                name_buffer.value.decode("utf-8")
-                if name_buffer.value
-                else f"UniformBlock_{i}"
-            )
+            gl.glGetActiveUniformBlockName(self._id, i, 256, ctypes.byref(length), name_buffer)
+            name_str = name_buffer.value.decode("utf-8") if name_buffer.value else f"UniformBlock_{i}"
 
             # Create uniform block data structure
             data = {
@@ -252,9 +242,7 @@ class ShaderProgram:
             bool: True if successful, False otherwise
         """
         if uniform_block_name not in self._registered_uniform_blocks:
-            logger.error(
-                f"Uniform block '{uniform_block_name}' not found in shader '{self._name}'"
-            )
+            logger.error(f"Uniform block '{uniform_block_name}' not found in shader '{self._name}'")
             return False
 
         block = self._registered_uniform_blocks[uniform_block_name]
@@ -307,17 +295,11 @@ class ShaderProgram:
             elif isinstance(val, float):
                 gl.glUniform1f(loc, val)
             elif isinstance(val, Mat2):
-                gl.glUniformMatrix2fv(
-                    loc, 1, gl.GL_FALSE, (ctypes.c_float * 4)(*val.get_matrix())
-                )
+                gl.glUniformMatrix2fv(loc, 1, gl.GL_FALSE, (ctypes.c_float * 4)(*val.get_matrix()))
             elif isinstance(val, Mat3):
-                gl.glUniformMatrix3fv(
-                    loc, 1, gl.GL_FALSE, (ctypes.c_float * 9)(*val.get_matrix())
-                )
+                gl.glUniformMatrix3fv(loc, 1, gl.GL_FALSE, (ctypes.c_float * 9)(*val.get_matrix()))
             elif isinstance(val, Mat4):
-                gl.glUniformMatrix4fv(
-                    loc, 1, gl.GL_FALSE, (ctypes.c_float * 16)(*val.get_matrix())
-                )
+                gl.glUniformMatrix4fv(loc, 1, gl.GL_FALSE, (ctypes.c_float * 16)(*val.get_matrix()))
             elif isinstance(val, Vec2):
                 gl.glUniform2f(loc, *val)
             elif isinstance(val, Vec3):
@@ -328,28 +310,29 @@ class ShaderProgram:
                 try:
                     val = list(value[0])
                     if len(val) == 4:
-                        gl.glUniformMatrix2fv(
-                            loc, 1, gl.GL_FALSE, (ctypes.c_float * 4)(*val)
-                        )
+                        gl.glUniformMatrix2fv(loc, 1, gl.GL_FALSE, (ctypes.c_float * 4)(*val))
                     elif len(val) == 9:
-                        gl.glUniformMatrix3fv(
-                            loc, 1, gl.GL_FALSE, (ctypes.c_float * 9)(*val)
-                        )
+                        gl.glUniformMatrix3fv(loc, 1, gl.GL_FALSE, (ctypes.c_float * 9)(*val))
                     elif len(val) == 16:
-                        gl.glUniformMatrix4fv(
-                            loc, 1, gl.GL_FALSE, (ctypes.c_float * 16)(*val)
-                        )
+                        gl.glUniformMatrix4fv(loc, 1, gl.GL_FALSE, (ctypes.c_float * 16)(*val))
                 except TypeError:
-                    logger.warning(
-                        f"Warning: uniform '{name}' has unknown type: {type(val)}"
-                    )
+                    logger.warning(f"Warning: uniform '{name}' has unknown type: {type(val)}")
 
         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:
         """
@@ -376,9 +359,7 @@ class ShaderProgram:
         loc = self.get_uniform_location(name)
         if loc != -1:
             flat_values = [item for vec in values for item in vec]
-            gl.glUniform2fv(
-                loc, len(values), (ctypes.c_float * len(flat_values))(*flat_values)
-            )
+            gl.glUniform2fv(loc, len(values), (ctypes.c_float * len(flat_values))(*flat_values))
 
     def set_uniform_3fv(self, name: str, values: List[List[float]]) -> None:
         """
@@ -392,9 +373,7 @@ class ShaderProgram:
         loc = self.get_uniform_location(name)
         if loc != -1:
             flat_values = [item for vec in values for item in vec]
-            gl.glUniform3fv(
-                loc, len(values), (ctypes.c_float * len(flat_values))(*flat_values)
-            )
+            gl.glUniform3fv(loc, len(values), (ctypes.c_float * len(flat_values))(*flat_values))
 
     def set_uniform_4fv(self, name: str, values: List[List[float]]) -> None:
         """
@@ -408,9 +387,7 @@ class ShaderProgram:
         loc = self.get_uniform_location(name)
         if loc != -1:
             flat_values = [item for vec in values for item in vec]
-            gl.glUniform4fv(
-                loc, len(values), (ctypes.c_float * len(flat_values))(*flat_values)
-            )
+            gl.glUniform4fv(loc, len(values), (ctypes.c_float * len(flat_values))(*flat_values))
 
     def set_uniform_1iv(self, name: str, values: List[int]) -> None:
         """
@@ -750,9 +727,7 @@ class ShaderProgram:
                 base_name = name.split("[")[0]
                 if base_name not in array_elements:
                     array_elements[base_name] = []
-                array_elements[base_name].append(
-                    (name, location, uniform_type, size, is_array)
-                )
+                array_elements[base_name].append((name, location, uniform_type, size, is_array))
             else:
                 base_uniforms[name] = (location, uniform_type, size, is_array)
 
@@ -760,9 +735,7 @@ class ShaderProgram:
         for name, (location, uniform_type, size, is_array) in base_uniforms.items():
             type_str = self.get_gl_type_string(uniform_type)
             if is_array:
-                logger.info(
-                    f"  {name}[{size}] (type: {type_str}, location: {location})"
-                )
+                logger.info(f"  {name}[{size}] (type: {type_str}, location: {location})")
             else:
                 logger.info(f"  {name} (type: {type_str}, location: {location})")
 
@@ -771,9 +744,7 @@ class ShaderProgram:
             logger.info(f"  Array elements for {base_name}:")
             for element_name, location, uniform_type, size, is_array in elements:
                 type_str = self.get_gl_type_string(uniform_type)
-                logger.info(
-                    f"    {element_name} (type: {type_str}, location: {location})"
-                )
+                logger.info(f"    {element_name} (type: {type_str}, location: {location})")
 
     def print_registered_uniform_blocks(self) -> None:
         """
@@ -811,6 +782,4 @@ class ShaderProgram:
         if self._registered_uniform_blocks:
             logger.info("  Registered uniform blocks:")
             for name, data in self._registered_uniform_blocks.items():
-                logger.info(
-                    f"    {name} (index: {data['loc']}, buffer: {data['buffer']})"
-                )
+                logger.info(f"    {name} (index: {data['loc']}, buffer: {data['buffer']})")

{ncca_ngl-0.1.1 → ncca_ngl-0.1.4}/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.1 → ncca_ngl-0.1.4}/src/ncca/ngl/text.py

@@ -223,13 +223,11 @@ 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)
-    ) -> None:
+    def render_text(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 +274,7 @@ 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()
@@ -288,9 +286,7 @@ class _Text:
         if polygon_mode != gl.GL_FILL:
             gl.glPolygonMode(gl.GL_FRONT_AND_BACK, polygon_mode)
 
-    def _build_instances(
-        self, font: str, text: str, start_x: int, start_y: int
-    ) -> List[float]:
+    def _build_instances(self, font: str, text: str, start_x: int, start_y: int) -> List[float]:
         """
         Generates vertex attribute data for each character in a string.
 

{ncca_ngl-0.1.1 → ncca_ngl-0.1.4}/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.1 → ncca_ngl-0.1.4}/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.1 → ncca_ngl-0.1.4}/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.1/.github/workflows/sonar-scan.yml

@@ -1,35 +0,0 @@
-name: Sonar Scanner
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  sonarcloud:
-    name: SonarCloud
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.13"]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install the project
-        run: uv sync --locked --all-extras --dev
-
-      - name: Install dependencies and run coverag
-        run: |
-          uv run coverage run --source=src/ngl -m pytest -v tests && uv run coverage report -m
-          uv run coverage xml
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarqube-scan-action@v5.0.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

ncca_ngl-0.1.1/.github/workflows/uv.yml

@@ -1,30 +0,0 @@
-name: UV Tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  build:
-    name: UV tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version:
-          - "3.13"
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install the project
-        run: uv sync --locked --all-extras --dev
-
-      - name: Run tests
-        run: uv run pytest tests --ignore=tests/test_shaderlib.py --ignore=tests/test_texture.py --ignore=tests/test_text.py --ignore=tests/test_base_mesh.py --ignore=tests/test_primitives.py --ignore=tests/test_obj.py --ignore=tests/test_vao.py

ncca_ngl-0.1.1/.gitignore

@@ -1,72 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-.vscode/
-.idea
-.ropeproject
-# stubgen files and MyPY
-out/
-.mypy_cache/
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-.pytest_cache/
-docs/build
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-
-# Cython debug symbols
-cython_debug/

ncca_ngl-0.1.1/.pre-commit-config.yaml

@@ -1,12 +0,0 @@
-repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.12.10
-    hooks:
-      # Run the linter.
-      - id: ruff-check
-        types_or: [python, pyi]
-        args: ["check", "--select", "I", "--fix"]
-      # Run the formatter.
-      - id: ruff-format
-        types_or: [python, pyi]