updated to fix a few issues with shader lib when expected type was not float, now force set_colour in text to convert things to float

Author: jmacey

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);
 }

src/ncca/ngl/text.py

@@ -223,13 +223,11 @@ def set_screen_size(self, w: int, h: int) -> None:
         """
         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 @@ def render_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 @@ def render_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.