ncca-ngl 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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.dist-info → ncca_ngl-0.1.2.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 ncca/ngl/__init__.py,sha256=i01MBdh814MrDmPDvG4dPI6azBWZWTq212cfVNnKkR8,2308
-ncca/ngl/abstract_vao.py,sha256=VLKp3pmPYK_dQgEImMOAQ0DufAswK_0H4DR4r8flp2U,2104
+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
@@ -33,9 +33,19 @@ ncca/ngl/vec3.py,sha256=q4HI4y4Xk3lTdlB8YdF4T2mCdwK2jXRattjDHlJi7vg,12265
 ncca/ngl/vec3_array.py,sha256=okRU8rp-jGYg2AzEUWx-ErsBkH1fG4L16c8nGKu-v04,2808
 ncca/ngl/vec4.py,sha256=zF0zw5EO4UE7EmqN30LPR3QQfaMcA1VcMID8CZALDiU,6740
 ncca/ngl/vec4_array.py,sha256=CCyHM4nIHvlwWxa12jCrJp-j6qfIYvU_irbdcB7NO0g,2699
+ncca/ngl/PrimData/Primitives.npz,sha256=8viufkX_FyT6afB4ZJR_ikv3D3tBG6IuHIXBdw0nE0o,15016264
 ncca/ngl/PrimData/pack_arrays.py,sha256=aWShJX8QPHXKTj66C8yu1DskmD3VEzFXyaADcxw6YKs,362
-ncca_ngl-0.1.0.dist-info/licenses/LICENSE.txt,sha256=WY4-vI3NTjw6HGwshZcyvEYhvAKBX3rpY7x9wMF_FhA,1056
-ncca_ngl-0.1.0.dist-info/METADATA,sha256=K_RFj72JMSY1SwA0-7kBTMECJ-35KHRe0G029qb4WSM,1620
-ncca_ngl-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ncca_ngl-0.1.0.dist-info/top_level.txt,sha256=nCKLyKtzlEVkOyE2KwxaykU3UgPocbQqRoMUXcICm3s,5
-ncca_ngl-0.1.0.dist-info/RECORD,,
+ncca/ngl/shaders/checker_fragment.glsl,sha256=2hJH8yOJxLH5DdDdS15C3uom4o4YsiBle0fIYLkx9jI,640
+ncca/ngl/shaders/checker_vertex.glsl,sha256=G90GDAY5yEsdYMHhpZhWTmFFx_jfpDUexam-vpuVrXo,411
+ncca/ngl/shaders/colour_fragment.glsl,sha256=Y8CeWyDyQAK7u3-rQhURO6Ee3ibturZR3B75e5vcb2U,118
+ncca/ngl/shaders/colour_vertex.glsl,sha256=moRuaWAmWbItzIgFlweDMz1dklQrJ_jZKNjw8SaXd9I,154
+ncca/ngl/shaders/diffuse_fragment.glsl,sha256=vkKJ9R683yk5OlyUGUwdoqrLyOsvFz3CjZS-wRCuzaY,615
+ncca/ngl/shaders/diffuse_vertex.glsl,sha256=j1t1Zv5iky0gsBG0HOQGOix6qyj09RHo7c_irMMJZHo,621
+ncca/ngl/shaders/text_fragment.glsl,sha256=KbvixK0-ZEdlkW85MhbvYJ0qnQUW6d4SbVcKIA18uyo,217
+ncca/ngl/shaders/text_geometry.glsl,sha256=OTLdn4pdZj2BOMh33rE6JBfQ9SHQ1L1e8qn3Hl3YV6w,1015
+ncca/ngl/shaders/text_vertex.glsl,sha256=uPym1x87SJOd0E3zPN1Fx44warJ6IYfvhzPQEtLOO3w,289
+ncca_ngl-0.1.2.dist-info/licenses/LICENSE.txt,sha256=WY4-vI3NTjw6HGwshZcyvEYhvAKBX3rpY7x9wMF_FhA,1056
+ncca_ngl-0.1.2.dist-info/METADATA,sha256=HUoGh5Z3kVKQ9X_sCAmx3XLF7ng7AJtLlShdc5QD0KI,1649
+ncca_ngl-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ncca_ngl-0.1.2.dist-info/top_level.txt,sha256=nCKLyKtzlEVkOyE2KwxaykU3UgPocbQqRoMUXcICm3s,5
+ncca_ngl-0.1.2.dist-info/RECORD,,