diff --git a/.gitignore b/.gitignore index a6c483f93..66f06f10e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ bin/custom_mesh_shared bin/stereo bin/text bin/relativity +bin/custom_material diff --git a/src/camera/camera.rs b/src/camera/camera.rs index 722561c14..5c65060fb 100644 --- a/src/camera/camera.rs +++ b/src/camera/camera.rs @@ -8,7 +8,7 @@ pub trait Camera { * Event handling. */ /// Handle a mouse event. - fn handle_event(&mut self, &glfw::Window, &glfw::WindowEvent); + fn handle_event(&mut self, _window: &glfw::Window, _event: &glfw::WindowEvent); /* * Transformation-related methods. @@ -44,8 +44,8 @@ pub trait Camera { fn num_passes(&self) -> uint { 1u } /// Indicates that a pass will begin. - fn start_pass(&self, uint, &glfw::Window) { } + fn start_pass(&self, _pass: uint, _window: &glfw::Window) { } /// Indicates that the scene has been rendered and the post-processing is being run. - fn render_complete(&self, &glfw::Window) { } + fn render_complete(&self, _window: &glfw::Window) { } } diff --git a/src/object.rs b/src/object.rs index b76bcbfb7..60a154e7e 100644 --- a/src/object.rs +++ b/src/object.rs @@ -1,5 +1,6 @@ //! Data structure of a scene node. +use std::any::Any; use std::cell::RefCell; use std::rc::Rc; use gl::types::*; diff --git a/src/resource/gl_primitive.rs b/src/resource/gl_primitive.rs index beed455c5..7dd96ee41 100644 --- a/src/resource/gl_primitive.rs +++ b/src/resource/gl_primitive.rs @@ -11,9 +11,9 @@ mod error; /// Trait implemented by structures that can be uploaded to a uniform or contained by a gpu array. pub trait GLPrimitive: Pod { /// The opengl primitive type of this structure content. - fn gl_type(Option) -> GLuint; + fn gl_type(_type: Option) -> GLuint; /// The number of elements of type `self.gl_type()` this structure stores. - fn size(Option) -> GLuint; + fn size(_type: Option) -> GLuint; /// Uploads the element to a gpu location. fn upload(&self, location: GLuint); }