Fixity fix fix fixity

Author: Muhtasim-Rasheed

src/utils/core/shader.rs

@@ -90,6 +90,12 @@ impl UniformValue for [f32] {
     }
 }
 
+impl<T: UniformValue + ?Sized> UniformValue for &T {
+    fn set(&self, program: u32, name: &str) {
+        (*self).set(program, name);
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct ShaderProgram(u32);
 
@@ -115,10 +121,6 @@ impl ShaderProgram {
         value.set(self.0, name);
     }
 
-    pub fn set_uniform_ref<T: UniformValue + ?Sized>(&self, name: &str, value: &T) {
-        value.set(self.0, name);
-    }
-
     pub fn use_program(&self) {
         unsafe {
             gl::UseProgram(self.0);

src/utils/helpers.rs

@@ -530,8 +530,8 @@ pub fn draw_line(start: Vec2, end: Vec2, thickness: f32, shader: &ShaderProgram,
     shader.use_program();
     shader.set_uniform("u_color", color);
     shader.set_uniform("u_model", m);
-    shader.set_uniform_ref("u_effects", &[] as &[i32]);
-    shader.set_uniform_ref("u_effect_values", &[] as &[f32]);
+    shader.set_uniform("u_effects", &[] as &[i32]);
+    shader.set_uniform("u_effect_values", &[] as &[f32]);
     shader.set_uniform("u_effects_count", 0);
     texture.bind();
     mesh.draw();
@@ -562,8 +562,8 @@ pub fn draw_rectangle(start: Vec2, end: Vec2, shader: &ShaderProgram, color: Vec
     shader.use_program();
     shader.set_uniform("u_color", color);
     shader.set_uniform("u_model", Mat4::IDENTITY);
-    shader.set_uniform_ref("u_effects", &[] as &[i32]);
-    shader.set_uniform_ref("u_effect_values", &[] as &[f32]);
+    shader.set_uniform("u_effects", &[] as &[i32]);
+    shader.set_uniform("u_effect_values", &[] as &[f32]);
     shader.set_uniform("u_effects_count", 0);
     texture.bind();
     mesh.draw();
@@ -587,8 +587,8 @@ pub fn draw_convex_polygon(xs: &Vec<f32>, ys: &Vec<f32>, shader: &ShaderProgram,
     shader.use_program();
     shader.set_uniform("u_color", color);
     shader.set_uniform("u_model", Mat4::IDENTITY);
-    shader.set_uniform_ref("u_effects", &[] as &[i32]);
-    shader.set_uniform_ref("u_effect_values", &[] as &[f32]);
+    shader.set_uniform("u_effects", &[] as &[i32]);
+    shader.set_uniform("u_effect_values", &[] as &[f32]);
     shader.set_uniform("u_effects_count", 0);
     texture.bind();
     mesh.draw();

src/utils/runtime.rs

@@ -515,7 +515,7 @@ h = 200"#;
     let default_sprite_code = r#"// Default Sprite Code
 
 setup {
-    print("Hello, World!");
+    print("Hello, World!")
 }
 
 update {}

src/utils/sprite/builtins/drawing.rs

@@ -436,14 +436,14 @@ pub fn textured_tri(state: &State, args: &[Value]) -> Result {
                 .set_uniform("u_color", Vec4::splat(1.0));
             state
                 .shader_program
-                .set_uniform_ref("u_projection", state.projection);
+                .set_uniform("u_projection", *state.projection);
             state.shader_program.set_uniform("u_model", Mat4::IDENTITY);
             state
                 .shader_program
-                .set_uniform_ref("u_effects", &[] as &[i32]);
+                .set_uniform("u_effects", &[] as &[i32]);
             state
                 .shader_program
-                .set_uniform_ref("u_effect_values", &[] as &[f32]);
+                .set_uniform("u_effect_values", &[] as &[f32]);
             state.shader_program.set_uniform("u_effects_count", 0);
             gpu_texture.bind();
             mesh.draw();

src/utils/sprite/draw.rs

@@ -76,11 +76,11 @@ pub fn draw_sprite(sprite: &Sprite, shader: &ShaderProgram, projection: Mat4, fo
                 1.0,
             )),
     );
-    shader.set_uniform_ref(
+    shader.set_uniform(
         "u_effects",
         effects_to_ints(sprite.effects.keys().map(String::clone).collect()).as_slice(),
     );
-    shader.set_uniform_ref(
+    shader.set_uniform(
         "u_effect_values",
         sprite
             .effects

src/utils/stage.rs

@@ -130,16 +130,16 @@ impl Stage {
         shader_program.set_uniform("u_color", vec4(1.0, 1.0, 1.0, 1.0));
         shader_program.set_uniform("u_projection", *projection);
         shader_program.set_uniform("u_model", Mat4::IDENTITY);
-        shader_program.set_uniform_ref("u_effects", &[] as &[i32]);
-        shader_program.set_uniform_ref("u_effect_values", &[] as &[f32]);
+        shader_program.set_uniform("u_effects", &[] as &[i32]);
+        shader_program.set_uniform("u_effect_values", &[] as &[f32]);
         shader_program.set_uniform("u_effects_count", 0);
         texture.bind();
         backdrop_mesh.draw();
         shader_program.set_uniform("u_color", vec4(1.0, 1.0, 1.0, 1.0));
         shader_program.set_uniform("u_projection", *projection);
         shader_program.set_uniform("u_model", Mat4::IDENTITY);
-        shader_program.set_uniform_ref("u_effects", &[] as &[i32]);
-        shader_program.set_uniform_ref("u_effect_values", &[] as &[f32]);
+        shader_program.set_uniform("u_effects", &[] as &[i32]);
+        shader_program.set_uniform("u_effect_values", &[] as &[f32]);
         shader_program.set_uniform("u_effects_count", 0);
         self.stamp_buffer.texture().bind();
         stamp_mesh.draw();