X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=shaded_cube.rs;h=eec0d16c7900fc1976a3c1d8bd8eb7afe1942267;hb=45391f3ccaa74be2be93e4b31507f45939afa4b0;hp=560256f2ad3d59b8905dc6f3cdde5219b200bea8;hpb=70c8f16193bd0b77a59cddc76c700b9d7f43b37c;p=mandelwow.git diff --git a/shaded_cube.rs b/shaded_cube.rs index 560256f..eec0d16 100644 --- a/shaded_cube.rs +++ b/shaded_cube.rs @@ -5,7 +5,7 @@ use glium::index::{IndexBuffer, PrimitiveType}; pub fn shaded_program(display: &Display) -> Program { let vertex_shader_src = include_str!("shaded.vert"); let fragment_shader_src = include_str!("shaded.frag"); - return Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap(); + Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap() } #[derive(Copy, Clone)] @@ -71,6 +71,6 @@ impl<'a> ShadedCube<'a> { backface_culling: glium::draw_parameters::BackfaceCullingMode::CullClockwise, ..Default::default() }; - frame.draw(&self.vertexes, &self.indices, &self.program, uniforms, ¶ms).unwrap(); + frame.draw(&self.vertexes, &self.indices, self.program, uniforms, ¶ms).unwrap(); } }