X-Git-Url: https://codewiz.org/gitweb?p=mandelwow.git;a=blobdiff_plain;f=bounding_box.rs;h=a08246e6dfe179416710c80c38174391625a499b;hp=ce06b521f4097286bbb52cc0b45d6736e89094df;hb=c0cff536ab1cc34f0643770bee8e2a88373269d7;hpb=eae81e5b33bcab0437934e558158237cfef78d8f diff --git a/bounding_box.rs b/bounding_box.rs index ce06b52..a08246e 100644 --- a/bounding_box.rs +++ b/bounding_box.rs @@ -4,9 +4,9 @@ use glium::{Display, Program, Surface}; use glium::index::{IndexBuffer, PrimitiveType}; pub fn solid_fill_program(display: &Display) -> Program { - let vertex_shader_src = include_str!("solid.vert"); - let fragment_shader_src = include_str!("solid.frag"); - return Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap(); + let vertex_shader_src = include_str!("shaders/solid.vert"); + let fragment_shader_src = include_str!("shaders/solid.frag"); + Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap() } #[derive(Copy, Clone)] @@ -54,6 +54,6 @@ impl<'a> BoundingBox<'a> { blend: glium::Blend::alpha_blending(), ..Default::default() }; - frame.draw(&self.vertexes, &self.indices, &self.program, uniforms, ¶ms).unwrap(); + frame.draw(&self.vertexes, &self.indices, self.program, uniforms, ¶ms).unwrap(); } }