From 39128dd7e11ffa05eb06933cb6e3ce0e750e8806 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Tue, 16 Jun 2015 13:48:08 +0200 Subject: Remove the is_closed function --- examples/cursor.rs | 33 +++++++++++++++------------------ examples/fullscreen.rs | 9 +++++++-- examples/grabbing.rs | 46 +++++++++++++++++++++------------------------- examples/multiwindow.rs | 7 +++++-- examples/transparent.rs | 9 +++++++-- examples/vsync.rs | 48 ------------------------------------------------ examples/window.rs | 9 +++++++-- 7 files changed, 62 insertions(+), 99 deletions(-) delete mode 100644 examples/vsync.rs (limited to 'examples') diff --git a/examples/cursor.rs b/examples/cursor.rs index 8b0d818..d15deff 100644 --- a/examples/cursor.rs +++ b/examples/cursor.rs @@ -25,25 +25,22 @@ fn main() { let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::NoneCursor, MouseCursor::Cell, MouseCursor::VerticalText, MouseCursor::Alias, MouseCursor::Copy, MouseCursor::NoDrop, MouseCursor::Grab, MouseCursor::Grabbing, MouseCursor::AllScroll, MouseCursor::ZoomIn, MouseCursor::ZoomOut, MouseCursor::EResize, MouseCursor::NResize, MouseCursor::NeResize, MouseCursor::NwResize, MouseCursor::SResize, MouseCursor::SeResize, MouseCursor::SwResize, MouseCursor::WResize, MouseCursor::EwResize, MouseCursor::NsResize, MouseCursor::NeswResize, MouseCursor::NwseResize, MouseCursor::ColResize, MouseCursor::RowResize]; let mut cursor_idx = 0; - while !window.is_closed() { + for event in window.wait_events() { + match event { + Event::KeyboardInput(ElementState::Pressed, _, _) => { + println!("Setting cursor to \"{:?}\"", cursors[cursor_idx]); + window.set_cursor(cursors[cursor_idx]); + if cursor_idx < cursors.len() - 1 { + cursor_idx += 1; + } else { + cursor_idx = 0; + } + }, + Event::Closed => break, + _ => (), + } + context.draw_frame((0.0, 1.0, 0.0, 1.0)); window.swap_buffers(); - - for event in window.wait_events() { - match event { - Event::KeyboardInput(ElementState::Pressed, _, _) => { - println!("Setting cursor to \"{:?}\"", cursors[cursor_idx]); - window.set_cursor(cursors[cursor_idx]); - if cursor_idx < cursors.len() - 1 { - cursor_idx += 1; - } else { - cursor_idx = 0; - } - }, - _ => (), - } - - } - } } diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs index 246a162..707fd7d 100644 --- a/examples/fullscreen.rs +++ b/examples/fullscreen.rs @@ -46,10 +46,15 @@ fn main() { let context = support::load(&window); - while !window.is_closed() { + for event in window.wait_events() { context.draw_frame((0.0, 1.0, 0.0, 1.0)); window.swap_buffers(); - println!("{:?}", window.wait_events().next()); + println!("{:?}", event); + + match event { + glutin::Event::Closed => break, + _ => () + } } } diff --git a/examples/grabbing.rs b/examples/grabbing.rs index 738a939..a0a8fda 100644 --- a/examples/grabbing.rs +++ b/examples/grabbing.rs @@ -23,33 +23,29 @@ fn main() { let context = support::load(&window); let mut grabbed = false; - while !window.is_closed() { + for event in window.poll_events() { + match event { + Event::KeyboardInput(ElementState::Pressed, _, _) => { + if grabbed { + grabbed = false; + window.set_cursor_state(glutin::CursorState::Normal) + .ok().expect("could not ungrab mouse cursor"); + } else { + grabbed = true; + window.set_cursor_state(glutin::CursorState::Grab) + .ok().expect("could not grab mouse cursor"); + } + }, + + a @ Event::MouseMoved(_) => { + println!("{:?}", a); + }, + + _ => (), + } + context.draw_frame((0.0, 1.0, 0.0, 1.0)); window.swap_buffers(); - - for event in window.poll_events() { - match event { - Event::KeyboardInput(ElementState::Pressed, _, _) => { - if grabbed { - grabbed = false; - window.set_cursor_state(glutin::CursorState::Normal) - .ok().expect("could not ungrab mouse cursor"); - } else { - grabbed = true; - window.set_cursor_state(glutin::CursorState::Grab) - .ok().expect("could not grab mouse cursor"); - } - }, - - a @ Event::MouseMoved(_) => { - println!("{:?}", a); - }, - - _ => (), - } - - } - } } diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs index 503e0a0..074fe14 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -43,10 +43,13 @@ fn run(window: glutin::Window, color: (f32, f32, f32, f32)) { let context = support::load(&window); - while !window.is_closed() { + for event in window.wait_events() { context.draw_frame(color); window.swap_buffers(); - window.wait_events().next(); + match event { + glutin::Event::Closed => break, + _ => () + } } } diff --git a/examples/transparent.rs b/examples/transparent.rs index 01c084a..fa6a8de 100644 --- a/examples/transparent.rs +++ b/examples/transparent.rs @@ -31,10 +31,15 @@ fn main() { let context = support::load(&window); - while !window.is_closed() { + for event in window.wait_events() { context.draw_frame((0.0, 0.0, 0.0, 0.0)); window.swap_buffers(); - println!("{:?}", window.wait_events().next()); + println!("{:?}", event); + + match event { + glutin::Event::Closed => break, + _ => () + } } } diff --git a/examples/vsync.rs b/examples/vsync.rs deleted file mode 100644 index 4ae2598..0000000 --- a/examples/vsync.rs +++ /dev/null @@ -1,48 +0,0 @@ -#[cfg(target_os = "android")] -#[macro_use] -extern crate android_glue; - -extern crate clock_ticks; -extern crate glutin; - -mod support; - -#[cfg(target_os = "android")] -android_start!(main); - -#[cfg(not(feature = "window"))] -fn main() { println!("This example requires glutin to be compiled with the `window` feature"); } - -#[cfg(feature = "window")] -fn resize_callback(width: u32, height: u32) { - println!("Window resized to {}x{}", width, height); -} - -#[cfg(feature = "window")] -fn main() { - println!("Vsync example. This example may panic if your driver or your system forces \ - you out of vsync. This is intended when `build_strict` is used."); - - let mut window = glutin::WindowBuilder::new().with_gl_profile(glutin::GlProfile::Compatibility) - .with_vsync() - .build_strict().unwrap(); - window.set_window_resize_callback(Some(resize_callback as fn(u32, u32))); - unsafe { window.make_current() }; - - let context = support::load(&window); - - while !window.is_closed() { - let before = clock_ticks::precise_time_ns(); - - context.draw_frame((0.0, 1.0, 0.0, 1.0)); - window.swap_buffers(); - - for ev in window.poll_events() { - println!("{:?}", ev); - } - - let after = clock_ticks::precise_time_ns(); - println!("Vsync example - Time of previous frame: {}ms", - (after - before) as f32 / 1000000.0); - } -} diff --git a/examples/window.rs b/examples/window.rs index d4e1a8d..f686a51 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -28,10 +28,15 @@ fn main() { let context = support::load(&window); - while !window.is_closed() { + for event in window.wait_events() { context.draw_frame((0.0, 1.0, 0.0, 1.0)); window.swap_buffers(); - println!("{:?}", window.wait_events().next()); + println!("{:?}", event); + + match event { + glutin::Event::Closed => break, + _ => () + } } } -- cgit v1.2.3