From 7ce851dad9102c28ee2fd372ed9fd62e73364da9 Mon Sep 17 00:00:00 2001 From: Tomaka17 Date: Wed, 5 Nov 2014 15:22:21 +0100 Subject: Update for changes in gl-rs --- examples/support/mod.rs | 66 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 31 deletions(-) (limited to 'examples/support/mod.rs') diff --git a/examples/support/mod.rs b/examples/support/mod.rs index 1e61165..eb27d23 100644 --- a/examples/support/mod.rs +++ b/examples/support/mod.rs @@ -31,7 +31,7 @@ pub struct Context { } pub fn load(window: &glutin::Window) -> Context { - let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol)); + let gl = gl::Gl::load(window); let version = { use std::c_str::CString; @@ -46,42 +46,46 @@ pub fn load(window: &glutin::Window) -> Context { impl Context { #[cfg(not(target_os = "android"))] pub fn draw_frame(&self, color: (f32, f32, f32, f32)) { - self.gl.ClearColor(color.0, color.1, color.2, color.3); - self.gl.Clear(gl::COLOR_BUFFER_BIT); - - self.gl.Begin(gl::TRIANGLES); - self.gl.Color3f(1.0, 0.0, 0.0); - self.gl.Vertex2f(-0.5, -0.5); - self.gl.Color3f(0.0, 1.0, 0.0); - self.gl.Vertex2f(0.0, 0.5); - self.gl.Color3f(0.0, 0.0, 1.0); - self.gl.Vertex2f(0.5, -0.5); - self.gl.End(); - - self.gl.Flush(); + unsafe { + self.gl.ClearColor(color.0, color.1, color.2, color.3); + self.gl.Clear(gl::COLOR_BUFFER_BIT); + + self.gl.Begin(gl::TRIANGLES); + self.gl.Color3f(1.0, 0.0, 0.0); + self.gl.Vertex2f(-0.5, -0.5); + self.gl.Color3f(0.0, 1.0, 0.0); + self.gl.Vertex2f(0.0, 0.5); + self.gl.Color3f(0.0, 0.0, 1.0); + self.gl.Vertex2f(0.5, -0.5); + self.gl.End(); + + self.gl.Flush(); + } } #[cfg(target_os = "android")] pub fn draw_frame(&self, color: (f32, f32, f32, f32)) { - self.gl.ClearColor(color.0, color.1, color.2, color.3); - self.gl.Clear(gl::COLOR_BUFFER_BIT); - - self.gl.EnableClientState(gl::VERTEX_ARRAY); - self.gl.EnableClientState(gl::COLOR_ARRAY); - unsafe { - use std::mem; - self.gl.VertexPointer(2, gl::FLOAT, (mem::size_of::() * 5) as i32, - mem::transmute(VERTEX_DATA.as_slice().as_ptr())); - self.gl.ColorPointer(3, gl::FLOAT, (mem::size_of::() * 5) as i32, - mem::transmute(VERTEX_DATA.as_slice().as_ptr().offset(2))); + self.gl.ClearColor(color.0, color.1, color.2, color.3); + self.gl.Clear(gl::COLOR_BUFFER_BIT); + + self.gl.EnableClientState(gl::VERTEX_ARRAY); + self.gl.EnableClientState(gl::COLOR_ARRAY); + + unsafe { + use std::mem; + self.gl.VertexPointer(2, gl::FLOAT, (mem::size_of::() * 5) as i32, + mem::transmute(VERTEX_DATA.as_slice().as_ptr())); + self.gl.ColorPointer(3, gl::FLOAT, (mem::size_of::() * 5) as i32, + mem::transmute(VERTEX_DATA.as_slice().as_ptr().offset(2))); + } + + self.gl.DrawArrays(gl::TRIANGLES, 0, 3); + self.gl.DisableClientState(gl::VERTEX_ARRAY); + self.gl.DisableClientState(gl::COLOR_ARRAY); + + self.gl.Flush(); } - - self.gl.DrawArrays(gl::TRIANGLES, 0, 3); - self.gl.DisableClientState(gl::VERTEX_ARRAY); - self.gl.DisableClientState(gl::COLOR_ARRAY); - - self.gl.Flush(); } } -- cgit v1.2.3