Fix compilation error with load_material

Author: not-fl3

examples/custom_material.rs

@@ -53,7 +53,7 @@ async fn main() {
             fragment: FRAGMENT,
         },
         MaterialParams {
-            uniforms: vec![("test_color".to_string(), UniformType::Float4)],
+            uniforms: vec![UniformDesc::new("test_color", UniformType::Float4)],
             pipeline_params,
             ..Default::default()
         },
@@ -65,7 +65,7 @@ async fn main() {
             vertex: VERTEX,
             fragment: FRAGMENT_WITH_ARRAY,
         },
-        MaterialParams2 {
+        MaterialParams {
             uniforms: vec![UniformDesc::array(
                 UniformDesc::new("test_color", UniformType::Float4),
                 10,

examples/screen_texture.rs

@@ -10,7 +10,7 @@ async fn main() {
             fragment: LENS_FRAGMENT_SHADER,
         },
         MaterialParams {
-            uniforms: vec![("Center".to_owned(), UniformType::Float2)],
+            uniforms: vec![UniformDesc::new("Center", UniformType::Float2)],
             ..Default::default()
         },
     )

examples/shadertoy.rs

@@ -337,7 +337,7 @@ async fn main() {
         if need_update {
             let uniforms = uniforms
                 .iter()
-                .map(|(name, uniform)| (name.clone(), uniform.uniform_type()))
+                .map(|(name, uniform)| UniformDesc::new(name, uniform.uniform_type()))
                 .collect::<Vec<_>>();
 
             match load_material(

src/material.rs

@@ -1,7 +1,7 @@
 //! Custom materials - shaders, uniforms.
 
 use crate::{get_context, quad_gl::GlPipeline, texture::Texture2D, tobytes::ToBytes, Error};
-use miniquad::{PipelineParams, UniformDesc, UniformType};
+use miniquad::{PipelineParams, UniformDesc};
 use std::sync::Arc;
 
 #[derive(PartialEq)]
@@ -54,39 +54,17 @@ pub struct MaterialParams {
     pub pipeline_params: PipelineParams,
 
     /// List of custom uniforms used in this material
-    pub uniforms: Vec<(String, UniformType)>,
+    pub uniforms: Vec<UniformDesc>,
 
     /// List of textures used in this material
     pub textures: Vec<String>,
 }
 
-impl Into<MaterialParams2> for MaterialParams {
-    fn into(self) -> MaterialParams2 {
-        MaterialParams2 {
-            pipeline_params: self.pipeline_params,
-            uniforms: self
-                .uniforms
-                .into_iter()
-                .map(|u| UniformDesc::new(&u.0, u.1))
-                .collect(),
-            textures: self.textures,
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct MaterialParams2 {
-    pub pipeline_params: PipelineParams,
-    pub uniforms: Vec<miniquad::UniformDesc>,
-    pub textures: Vec<String>,
-}
-
 pub fn load_material(
     shader: crate::ShaderSource,
-    params: impl Into<MaterialParams2>,
+    params: MaterialParams,
 ) -> Result<Material, Error> {
     let context = &mut get_context();
-    let params = params.into();
 
     let pipeline = context.gl.make_pipeline(
         &mut *context.quad_context,

src/prelude.rs

@@ -16,7 +16,7 @@ pub use crate::color::{colors::*, Color};
 pub use crate::quad_gl::{DrawMode, GlPipeline, QuadGl, Vertex};
 pub use glam;
 pub use miniquad::{
-    conf::Conf, Comparison, PipelineParams, ShaderError, ShaderSource, UniformType,
+    conf::Conf, Comparison, PipelineParams, ShaderError, ShaderSource, UniformDesc, UniformType,
 };
 pub use quad_rand as rand;