refactor(engine): have single GL program fn to set uniform varHEADmaster

1 files changed, 30 insertions, 31 deletions

diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs
index 43ec16c..18b0041 100644
--- a/engine/src/renderer/opengl.rs
+++ b/engine/src/renderer/opengl.rs
@@ -452,11 +452,11 @@ fn apply_transformation_matrices(
 )
 {
     gl_shader_program
-        .set_uniform_matrix_4fv(c"model", &create_transformation_matrix(transformation));
+        .set_uniform(c"model", &create_transformation_matrix(transformation));
 
     let view_matrix = create_view_matrix(camera, &camera_pos.position);
 
-    gl_shader_program.set_uniform_matrix_4fv(c"view", &view_matrix);
+    gl_shader_program.set_uniform(c"view", &view_matrix);
 
     #[allow(clippy::cast_precision_loss)]
     let proj_matrix = match &camera.projection {
@@ -469,7 +469,7 @@ fn apply_transformation_matrices(
         }
     };
 
-    gl_shader_program.set_uniform_matrix_4fv(c"projection", &proj_matrix);
+    gl_shader_program.set_uniform(c"projection", &proj_matrix);
 }
 
 fn apply_light<PointLightHolder>(
@@ -494,7 +494,7 @@ fn apply_light<PointLightHolder>(
     );
 
     for (dir_light_index, dir_light) in directional_lights.iter().enumerate() {
-        gl_shader_program.set_uniform_vec_3fv(
+        gl_shader_program.set_uniform(
             &create_light_uniform_name(
                 "directional_lights",
                 dir_light_index,
@@ -514,10 +514,10 @@ fn apply_light<PointLightHolder>(
     // There probably won't be more than 2147483648 directional lights
     #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
     gl_shader_program
-        .set_uniform_1i(c"directional_light_cnt", directional_lights.len() as i32);
+        .set_uniform(c"directional_light_cnt", &(directional_lights.len() as i32));
 
     for (point_light_index, point_light) in point_lights.iter().enumerate() {
-        gl_shader_program.set_uniform_vec_3fv(
+        gl_shader_program.set_uniform(
             &create_light_uniform_name("point_lights", point_light_index, "position"),
             &point_light.position,
         );
@@ -539,24 +539,23 @@ fn apply_light<PointLightHolder>(
 
     // There probably won't be more than 2147483648 point lights
     #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
-    gl_shader_program.set_uniform_1i(c"point_light_cnt", point_lights.len() as i32);
+    gl_shader_program.set_uniform(c"point_light_cnt", &(point_lights.len() as i32));
 
-    gl_shader_program.set_uniform_vec_3fv(
+    gl_shader_program.set_uniform(
         c"material.ambient",
-        &if material_flags.use_ambient_color {
+        &Vec3::from(if material_flags.use_ambient_color {
             material.ambient.clone()
         } else {
             global_light.ambient.clone()
-        }
-        .into(),
+        }),
     );
 
     gl_shader_program
-        .set_uniform_vec_3fv(c"material.diffuse", &material.diffuse.clone().into());
+        .set_uniform(c"material.diffuse", &Vec3::from(material.diffuse.clone()));
 
     #[allow(clippy::cast_possible_wrap)]
     gl_shader_program
-        .set_uniform_vec_3fv(c"material.specular", &material.specular.clone().into());
+        .set_uniform(c"material.specular", &Vec3::from(material.specular.clone()));
 
     let texture_map = material
         .textures
@@ -566,26 +565,26 @@ fn apply_light<PointLightHolder>(
         .collect::<HashMap<_, _>>();
 
     #[allow(clippy::cast_possible_wrap)]
-    gl_shader_program.set_uniform_1i(
+    gl_shader_program.set_uniform(
         c"material.ambient_map",
-        *texture_map.get(&material.ambient_map).unwrap() as i32,
+        &(*texture_map.get(&material.ambient_map).unwrap() as i32),
     );
 
     #[allow(clippy::cast_possible_wrap)]
-    gl_shader_program.set_uniform_1i(
+    gl_shader_program.set_uniform(
         c"material.diffuse_map",
-        *texture_map.get(&material.diffuse_map).unwrap() as i32,
+        &(*texture_map.get(&material.diffuse_map).unwrap() as i32),
     );
 
     #[allow(clippy::cast_possible_wrap)]
-    gl_shader_program.set_uniform_1i(
+    gl_shader_program.set_uniform(
         c"material.specular_map",
-        *texture_map.get(&material.specular_map).unwrap() as i32,
+        &(*texture_map.get(&material.specular_map).unwrap() as i32),
     );
 
-    gl_shader_program.set_uniform_1fv(c"material.shininess", material.shininess);
+    gl_shader_program.set_uniform(c"material.shininess", &material.shininess);
 
-    gl_shader_program.set_uniform_vec_3fv(c"view_pos", &camera_pos.position);
+    gl_shader_program.set_uniform(c"view_pos", &camera_pos.position);
 }
 
 fn set_light_attenuation_uniforms(
@@ -595,27 +594,27 @@ fn set_light_attenuation_uniforms(
     light: &PointLight,
 )
 {
-    gl_shader_program.set_uniform_1fv(
+    gl_shader_program.set_uniform(
         &create_light_uniform_name(
             light_array,
             light_index,
             "attenuation_props.constant",
         ),
-        light.attenuation_params.constant,
+        &light.attenuation_params.constant,
     );
 
-    gl_shader_program.set_uniform_1fv(
+    gl_shader_program.set_uniform(
         &create_light_uniform_name(light_array, light_index, "attenuation_props.linear"),
-        light.attenuation_params.linear,
+        &light.attenuation_params.linear,
     );
 
-    gl_shader_program.set_uniform_1fv(
+    gl_shader_program.set_uniform(
         &create_light_uniform_name(
             light_array,
             light_index,
             "attenuation_props.quadratic",
         ),
-        light.attenuation_params.quadratic,
+        &light.attenuation_params.quadratic,
     );
 }
 
@@ -626,14 +625,14 @@ fn set_light_phong_uniforms(
     light: &impl Light,
 )
 {
-    gl_shader_program.set_uniform_vec_3fv(
+    gl_shader_program.set_uniform(
         &create_light_uniform_name(light_array, light_index, "phong.diffuse"),
-        &light.diffuse().clone().into(),
+        &Vec3::from(light.diffuse().clone()),
     );
 
-    gl_shader_program.set_uniform_vec_3fv(
+    gl_shader_program.set_uniform(
         &create_light_uniform_name(light_array, light_index, "phong.specular"),
-        &light.specular().clone().into(),
+        &Vec3::from(light.specular().clone()),
     );
 }