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

ncca_ngl-0.1.2/MANIFEST.in

@@ -0,0 +1,33 @@
+# 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.0/src/ncca_ngl.egg-info → ncca_ngl-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ncca-ngl
-Version: 0.1.0
+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
@@ -20,4 +20,5 @@ 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.0 → ncca_ngl-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ncca-ngl"
-version = "0.1.0"
+version = "0.1.2"
 description = "A Python version of the NGL graphics library."
 authors = [{ name = "Jon Macey", email = "jmacey@bournemouth.ac.uk" }]
 requires-python = ">=3.13"
@@ -13,29 +13,34 @@ 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 = ["uv_build>=0.8.14,<0.9.0"]
-# build-backend = "uv_build"
-# module-name = ["ncca.ngl"]
-# module-root = "src/ncca/"
 
 [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
+
+
+
 [dependency-groups]
 dev = [
     "coverage>=7.10.6",

{ncca_ngl-0.1.0 → ncca_ngl-0.1.2}/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.1.2/src/ncca/ngl/shaders/checker_fragment.glsl

@@ -0,0 +1,35 @@
+#version 410 core
+in vec3 fragmentNormal;
+in vec2 uv;
+
+layout (location =0) out vec4 fragColour;
+uniform vec4 colour1;
+uniform vec4 colour2;
+
+uniform vec3 lightPos;
+uniform vec4 lightDiffuse;
+uniform float checkSize=10.0;
+uniform bool checkOn;
+
+vec4 checker( vec2 uv )
+{
+  if(checkOn == false)
+    return colour1;
+  else
+  {
+  float v = floor( checkSize * uv.x ) +floor( checkSize * uv.y );
+  if( mod( v, 2.0 ) < 1.0 )
+     return colour2;
+  else
+     return colour1;
+
+  }
+}
+
+void main ()
+{
+  fragColour= vec4(0.);
+  vec3 N = normalize(fragmentNormal);
+  vec3 L = normalize(lightPos);
+  fragColour += checker(uv)*lightDiffuse *dot(L, N);
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/checker_vertex.glsl

@@ -0,0 +1,19 @@
+#version 410 core
+
+
+/// @brief the vertex passed in
+layout (location = 0) in vec3 inVert;
+/// @brief the normal passed in
+layout (location = 1) in vec3 inNormal;
+/// @brief the in uv
+layout (location = 2) in vec2 inUV;
+out vec3 fragmentNormal;
+out vec2 uv;
+uniform mat4 MVP;
+uniform mat3 normalMatrix;
+void main()
+{
+  fragmentNormal = (normalMatrix*inNormal);
+  uv=inUV;
+  gl_Position = MVP*vec4(inVert,1.0);
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/colour_fragment.glsl

@@ -0,0 +1,8 @@
+#version 410 core
+uniform vec4 Colour;
+layout(location=0) out vec4 outColour;
+
+void main ()
+{
+  outColour = Colour;
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/colour_vertex.glsl

@@ -0,0 +1,11 @@
+#version 410 core
+
+uniform mat4 MVP;
+
+layout(location=0) in vec3 inVert;
+uniform vec4 Colour;
+
+void main(void)
+{
+  gl_Position = MVP*vec4(inVert, 1.0);
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/diffuse_fragment.glsl

@@ -0,0 +1,21 @@
+#version 410
+in vec3 fragmentNormal;
+in vec3 fragmentPosition; // Receive fragment position
+
+layout (location =0) out vec4 fragColour;
+
+uniform vec4 Colour;
+uniform vec3 lightPos; // Light's position in view space
+uniform vec4 lightDiffuse;
+
+void main ()
+{
+    // Ensure fragment normal is unit length
+    vec3 N = normalize(fragmentNormal);
+    // Calculate vector from fragment to light
+    vec3 L = normalize(lightPos - fragmentPosition);
+    // Calculate diffuse factor, ensuring it's not negative
+    float diffuse = max(dot(L, N), 0.0);
+    // Final colour
+    fragColour = Colour * lightDiffuse * diffuse;
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/diffuse_vertex.glsl

@@ -0,0 +1,24 @@
+#version 410
+out vec3 fragmentNormal;
+out vec3 fragmentPosition;
+
+layout(location=0) in vec3 inVert;
+layout(location=1) in vec3 inNormal;
+
+uniform mat4 MVP;
+uniform mat4 MV;
+uniform mat3 normalMatrix;
+
+void main()
+{
+  // Transform normal into view space but DO NOT normalize it here.
+  // The interpolation and per-fragment normalization is key to smooth shading.
+  fragmentNormal = normalMatrix * inNormal;
+
+  // Transform vertex position into view space
+  vec4 viewPosition = MV * vec4(inVert, 1.0);
+  fragmentPosition = viewPosition.xyz;
+
+  // Transform vertex to clip space
+  gl_Position = MVP * vec4(inVert, 1.0);
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/text_fragment.glsl

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

ncca_ngl-0.1.2/src/ncca/ngl/shaders/text_geometry.glsl

@@ -0,0 +1,53 @@
+#version 410 core
+layout(points) in;
+layout(triangle_strip, max_vertices=4) out;
+
+uniform vec2 screenSize;
+uniform float fontSize;
+
+in VS_OUT
+{
+    vec2 pos;
+    vec4 uvRect;
+    vec2 size;
+}
+gs_in[];
+
+out vec2 v_uv;
+
+vec2 toNDC(vec2 screenPos)
+{
+    return vec2(
+        (screenPos.x / screenSize.x) * 2.0 - 1.0,
+        1.0 - (screenPos.y /screenSize.y) * 2.0
+    );
+}
+
+void main()
+{
+    vec2 base = gs_in[0].pos;
+    vec2 gsize = gs_in[0].size * fontSize;
+    vec4 uv = gs_in[0].uvRect;
+    // generate a quad
+    // Top Left
+    gl_Position = vec4(toNDC(base), 0.0, 1.0);
+    v_uv = uv.xy;
+    EmitVertex();
+
+    // Bottom Left
+    gl_Position = vec4(toNDC(base + vec2(0.0, gsize.y)), 0.0, 1.0);
+    v_uv = vec2(uv.x, uv.w);
+    EmitVertex();
+
+    // Top Right
+    gl_Position = vec4(toNDC(base + vec2(gsize.x, 0.0)), 0.0, 1.0);
+    v_uv = vec2(uv.z, uv.y);
+    EmitVertex();
+
+    // Bottom Right
+    gl_Position = vec4(toNDC(base + gsize), 0.0, 1.0);
+    v_uv = uv.zw;
+    EmitVertex();
+
+    EndPrimitive();
+}

ncca_ngl-0.1.2/src/ncca/ngl/shaders/text_vertex.glsl

@@ -0,0 +1,18 @@
+#version 410 core
+layout(location=0) in vec2 position;
+layout(location=1) in vec4 uvRect;
+layout(location=2) in vec2 size;
+
+out VS_OUT
+{
+    vec2 pos;
+    vec4 uvRect;
+    vec2 size;
+} vs_out;
+
+void main()
+{
+    vs_out.pos = position;
+    vs_out.uvRect = uvRect;
+    vs_out.size = size;
+}

{ncca_ngl-0.1.0 → ncca_ngl-0.1.2/src/ncca_ngl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ncca-ngl
-Version: 0.1.0
+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
@@ -20,4 +20,5 @@ 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.0 → ncca_ngl-0.1.2}/src/ncca_ngl.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE.txt
+MANIFEST.in
 README.md
 pyproject.toml
 src/ncca/ngl/__init__.py
@@ -36,36 +37,19 @@ 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
-tests/test_base_mesh.py
-tests/test_bbox.py
-tests/test_bezier_curve.py
-tests/test_first_person_camera.py
-tests/test_image.py
-tests/test_logging.py
-tests/test_mat2.py
-tests/test_mat3.py
-tests/test_mat4.py
-tests/test_obj.py
-tests/test_plane.py
-tests/test_primitives.py
-tests/test_pyside_event_handling_mixin.py
-tests/test_quaternion.py
-tests/test_random.py
-tests/test_shaderlib.py
-tests/test_text.py
-tests/test_texture.py
-tests/test_transform.py
-tests/test_util.py
-tests/test_vao.py
-tests/test_vec2.py
-tests/test_vec2_array.py
-tests/test_vec3.py
-tests/test_vec3_array.py
-tests/test_vec4.py
-tests/test_vec4_array.py
+src/ncca_ngl.egg-info/top_level.txt

{ncca_ngl-0.1.0 → ncca_ngl-0.1.2}/src/ncca_ngl.egg-info/requires.txt

@@ -4,3 +4,4 @@ Pillow
 glfw>=2.9.0
 freetype-py>=2.5.1
 pyside6>=6.9.2
+hatch>=1.14.2

ncca_ngl-0.1.0/tests/test_base_mesh.py

@@ -1,249 +0,0 @@
-import OpenGL.GL as gl
-import pytest
-
-from ncca.ngl import BaseMesh, Face, Image, ImageModes, ShaderLib, Texture, Vec2, Vec3
-
-
-def test_is_triangular():
-    mesh = BaseMesh()
-    face1 = Face()
-    face1.vertex = [1, 2, 3]
-    face2 = Face()
-    face2.vertex = [4, 5, 6]
-    mesh.faces = [face1, face2]
-    assert mesh.is_triangular() is True
-
-
-def test_is_not_triangular():
-    mesh = BaseMesh()
-    face1 = Face()
-    face1.vertex = [1, 2, 3]
-    face2 = Face()
-    face2.vertex = [4, 5, 6, 7]
-    mesh.faces = [face1, face2]
-    assert mesh.is_triangular() is False
-
-
-def test_calc_dimensions():
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(-1.0, -2.0, -3.0),
-        Vec3(1.0, 2.0, 3.0),
-        Vec3(0.0, 0.0, 0.0),
-    ]
-    mesh.calc_dimensions()
-    assert mesh.min_x == pytest.approx(-1.0)
-    assert mesh.max_x == pytest.approx(1.0)
-    assert mesh.min_y == pytest.approx(-2.0)
-    assert mesh.max_y == pytest.approx(2.0)
-    assert mesh.min_z == pytest.approx(-3.0)
-    assert mesh.max_z == pytest.approx(3.0)
-
-
-def test_empty_mesh_dimensions():
-    mesh = BaseMesh()
-    mesh.calc_dimensions()
-    assert mesh.min_x == pytest.approx(0.0)
-    assert mesh.max_x == pytest.approx(0.0)
-    assert mesh.min_y == pytest.approx(0.0)
-    assert mesh.max_y == pytest.approx(0.0)
-    assert mesh.min_z == pytest.approx(0.0)
-    assert mesh.max_z == pytest.approx(0.0)
-
-
-def test_init_defaults():
-    mesh = BaseMesh()
-    assert mesh.vertex == []
-    assert mesh.normals == []
-    assert mesh.uv == []
-    assert mesh.faces == []
-    assert mesh.vao is None
-    assert mesh.bbox is None
-    assert mesh.min_x == pytest.approx(0.0)
-    assert mesh.max_x == pytest.approx(0.0)
-    assert mesh.min_y == pytest.approx(0.0)
-    assert mesh.max_y == pytest.approx(0.0)
-    assert mesh.min_z == pytest.approx(0.0)
-    assert mesh.max_z == pytest.approx(0.0)
-    assert mesh.min_x == pytest.approx(0.0)
-    assert mesh.max_x == pytest.approx(0.0)
-    assert mesh.min_y == pytest.approx(0.0)
-    assert mesh.max_y == pytest.approx(0.0)
-    assert mesh.min_z == pytest.approx(0.0)
-    assert mesh.max_z == pytest.approx(0.0)
-    assert mesh.texture_id == 0
-    assert mesh.texture is False
-
-
-def test_create_vao_non_triangular(opengl_context):
-    mesh = BaseMesh()
-    face1 = Face()
-    face1.vertex = [1, 2, 3, 4]
-    mesh.faces = [face1]
-    with pytest.raises(RuntimeError):
-        mesh.create_vao()
-
-
-def test_create_vao(opengl_context):
-    ShaderLib.load_shader(
-        "nglColourShader",
-        "src/ncca/ngl/shaders/colour_vertex.glsl",
-        "src/ncca/ngl/shaders/colour_fragment.glsl",
-    )
-    ShaderLib.use("nglColourShader")
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(0.0, 0.5, 0.0),
-        Vec3(-0.5, -0.5, 0.0),
-        Vec3(0.5, -0.5, 0.0),
-    ]
-    mesh.normals = [
-        Vec3(0.0, 0.0, 1.0),
-        Vec3(0.0, 0.0, 1.0),
-        Vec3(0.0, 0.0, 1.0),
-    ]
-    mesh.uv = [
-        Vec2(0.5, 1.0),
-        Vec2(0.0, 0.0),
-        Vec2(1.0, 0.0),
-    ]
-    face = Face()
-    face.vertex = [0, 1, 2]
-    face.normal = [0, 1, 2]
-    face.uv = [0, 1, 2]
-    mesh.faces = [face]
-    mesh.create_vao()
-    assert mesh.vao is not None
-    assert mesh.bbox is not None
-    mesh.draw()
-
-
-def test_create_vao_no_normal_no_uv(opengl_context):
-    ShaderLib.load_shader(
-        "nglColourShader",
-        "src/ncca/ngl/shaders/colour_vertex.glsl",
-        "src/ncca/ngl/shaders/colour_fragment.glsl",
-    )
-    ShaderLib.use("nglColourShader")
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(0.0, 0.5, 0.0),
-        Vec3(-0.5, -0.5, 0.0),
-        Vec3(0.5, -0.5, 0.0),
-    ]
-
-    face = Face()
-    face.vertex = [0, 1, 2]
-    mesh.faces = [face]
-    mesh.create_vao()
-    assert mesh.vao is not None
-    assert mesh.bbox is not None
-    mesh.draw()
-
-
-def test_create_vao_no_uv(opengl_context):
-    ShaderLib.load_shader(
-        "nglColourShader",
-        "src/ncca/ngl/shaders/colour_vertex.glsl",
-        "src/ncca/ngl/shaders/colour_fragment.glsl",
-    )
-    ShaderLib.use("nglColourShader")
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(0.0, 0.5, 0.0),
-        Vec3(-0.5, -0.5, 0.0),
-        Vec3(0.5, -0.5, 0.0),
-    ]
-    mesh.normals = [
-        Vec3(0.0, 0.0, 1.0),
-        Vec3(0.0, 0.0, 1.0),
-        Vec3(0.0, 0.0, 1.0),
-    ]
-
-    face = Face()
-    face.vertex = [0, 1, 2]
-    face.normal = [0, 1, 2]
-    mesh.faces = [face]
-    mesh.create_vao()
-    assert mesh.vao is not None
-    assert mesh.bbox is not None
-    mesh.draw()
-
-
-def test_create_vao_no_normal(opengl_context):
-    ShaderLib.load_shader(
-        "nglColourShader",
-        "src/ncca/ngl/shaders/colour_vertex.glsl",
-        "src/ncca/ngl/shaders/colour_fragment.glsl",
-    )
-    ShaderLib.use("nglColourShader")
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(0.0, 0.5, 0.0),
-        Vec3(-0.5, -0.5, 0.0),
-        Vec3(0.5, -0.5, 0.0),
-    ]
-    mesh.uv = [
-        Vec2(0.5, 1.0),
-        Vec2(0.0, 0.0),
-        Vec2(1.0, 0.0),
-    ]
-    face = Face()
-    face.vertex = [0, 1, 2]
-    face.uv = [0, 1, 2]
-    mesh.faces = [face]
-    mesh.create_vao()
-    assert mesh.vao is not None
-    assert mesh.bbox is not None
-    mesh.draw()
-
-
-def test_draw_no_vao(opengl_context):
-    mesh = BaseMesh()
-    mesh.draw()  # Should not raise
-
-
-def test_create_vao_reset_vao(opengl_context):
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(0.0, 0.5, 0.0),
-        Vec3(-0.5, -0.5, 0.0),
-        Vec3(0.5, -0.5, 0.0),
-    ]
-    face = Face()
-    face.vertex = [0, 1, 2]
-    mesh.faces = [face]
-    mesh.create_vao()
-    assert mesh.vao is not None
-    first_vao = mesh.vao
-    mesh.create_vao(reset_vao=True)
-    assert mesh.vao is first_vao
-    mesh.create_vao(reset_vao=False)
-    assert mesh.vao is not first_vao
-
-
-def test_draw_with_texture(opengl_context, tmp_path):
-    ShaderLib.load_shader(
-        "nglColourShader",
-        "src/ncca/ngl/shaders/colour_vertex.glsl",
-        "src/ncca/ngl/shaders/colour_fragment.glsl",
-    )
-    ShaderLib.use("nglColourShader")
-    mesh = BaseMesh()
-    mesh.vertex = [
-        Vec3(0.0, 0.5, 0.0),
-        Vec3(-0.5, -0.5, 0.0),
-        Vec3(0.5, -0.5, 0.0),
-    ]
-    face = Face()
-    face.vertex = [0, 1, 2]
-    mesh.faces = [face]
-    mesh.create_vao()
-    size = 2
-    img = Image(width=size, height=size, mode=ImageModes.RGB)
-    filename = tmp_path / "simpleRGB.png"
-    img.save(str(filename))
-    t = Texture(str(filename))
-    mesh.texture_id = t.set_texture_gl()
-    mesh.draw()
-    gl.glDeleteTextures(1, [mesh.texture_id])