X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=shaded_cube.rs;h=9194d7c8a986002591983ded73d97027ccae1d8a;hb=a9403c5b68afe3ad9d759bfe101c1e57bc279f13;hp=560256f2ad3d59b8905dc6f3cdde5219b200bea8;hpb=70c8f16193bd0b77a59cddc76c700b9d7f43b37c;p=mandelwow.git

diff --git a/shaded_cube.rs b/shaded_cube.rs
index 560256f..9194d7c 100644
--- a/shaded_cube.rs
+++ b/shaded_cube.rs
@@ -3,9 +3,9 @@ use glium::{Display, Program, Surface};
 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();
+    let vertex_shader_src = include_str!("shaders/shaded.vert");
+    let fragment_shader_src = include_str!("shaders/shaded.frag");
+    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, &params).unwrap();
+        frame.draw(&self.vertexes, &self.indices, self.program, uniforms, &params).unwrap();
     }
 }