Port to glium 0.22 and clutin 0.18

[mandelwow.git] / main.rs

diff --git a/main.rs b/main.rs
index bd75e428df4b225cef9576fe13f51043f2ab7a59..175fb611954950f9b921645dbd884f210b4c7aea 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -7,10 +7,9 @@ extern crate glutin;
 
 use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero};
 use cgmath::conv::array4x4;
-use glium::{DisplayBuild, Surface};
-use glutin::ElementState::Pressed;
-use glutin::Event::KeyboardInput;
-use glutin::VirtualKeyCode;
+use glium::{Surface};
+use glium::glutin::WindowEvent::KeyboardInput;
+use glium::glutin::VirtualKeyCode;
 use mandelwow_lib::*;
 use std::f32::consts::PI;
 use timer::Timer;
@@ -65,21 +64,20 @@ pub fn set_main_loop_callback<F>(callback : F) where F : FnMut() -> support::Act
 fn main() {
     let mut soundplayer = sound::start();
 
-    let display = glutin::WindowBuilder::new()
-        .with_dimensions(1280, 720)
-        .with_gl_profile(glutin::GlProfile::Core)
-        //.with_fullscreen(glutin::get_primary_monitor())
-        .with_depth_buffer(24)
-        .with_vsync()
-        .with_srgb(Some(true))
-        .with_title("MandelWow")
-        .build_glium()
-        //.build_glium_debug(glium::debug::DebugCallbackBehavior::PrintAll)
-        .unwrap();
-
+    let mut events_loop = glium::glutin::EventsLoop::new();
+    let window = glium::glutin::WindowBuilder::new()
+        //.with_dimensions(1280, 720)
+        .with_fullscreen(Some(events_loop.get_primary_monitor()));
+        //.with_title("MandelWow");
+    let context = glium::glutin::ContextBuilder::new()
+        //.with_gl_profile(glutin::GlProfile::Core)
+        //.with_gl(glutin::GlRequest::Specific(glutin::Api::WebGl, (2, 0)))
+        //.with_depth_buffer(24)
+        .with_vsync(true);
+    let display = glium::Display::new(window, context, &events_loop).unwrap();
     gl_info(&display);
 
-    let mut text = text::Text::new(&display, 'A');
+//    let mut text = text::Text::new(&display, 'A');
     let mandelwow_program = mandelwow::program(&display);
     let bounding_box_program = bounding_box::solid_fill_program(&display);
     let shaded_program = shaded_cube::shaded_program(&display);
@@ -183,57 +181,77 @@ fn main() {
                     col: [0., (1. - wave).abs() * 0.5,  wave.abs()],
                 };
                 shaded_cube.draw(&mut frame, &uniforms);
-                text.model = model * text_pos;
+/*                text.model = model * text_pos;
                 text.character = (x + z * SEA_XSIZE) as u8 as char;
                 text.draw(&mut frame, &perspview);
-            }
+*/            }
         }
 
         mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);
 
         frame.finish().unwrap();
 
-        for ev in display.poll_events() {
-            match ev {
-                glutin::Event::Closed |
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::Escape)) |
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::Q)) => {
-                    return support::Action::Stop
-                },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::B)) => {
-                    bounding_box_enabled ^= true;
-                },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::P)) => {
-                    timer.pause ^= true;
-                },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageUp)) => {
-                    timer.t += 0.01;
-                },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageDown)) => {
-                    timer.t -= 0.01;
-                },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::F10)) => {
-                    screenshot(&display);
-                },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::F11)) => {
-                    fullscreen ^= true;
-                    if fullscreen {
-                        // Not implemented on Linux
-                        glutin::WindowBuilder::new()
-                            .with_fullscreen(glutin::get_primary_monitor())
-                            .with_depth_buffer(24)
-                            .rebuild_glium(&display).unwrap();
-                    } else {
-                        glutin::WindowBuilder::new()
-                            .rebuild_glium(&display).unwrap();
-                    }
-                },
-                ev => camera.process_input(&ev),
+        let mut action = support::Action::Continue;
+        events_loop.poll_events(|event| {
+            if let glium::glutin::Event::WindowEvent { event, .. } = event {
+                camera.process_input(&event);
+                match event {
+                    glium::glutin::WindowEvent::CloseRequested => {
+                        action = support::Action::Stop
+                    },
+                    KeyboardInput { input, .. } => {
+                        if input.state == glium::glutin::ElementState::Pressed {
+                            if let Some(key) = input.virtual_keycode {
+                                match key {
+                                    VirtualKeyCode::Escape | VirtualKeyCode::Q => {
+                                        action = support::Action::Stop;
+                                    },
+                                    _ => (),
+                                }
+                            }
+                        }
+                    },
+/*
+                    KeyboardInput { input: glutin::KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::Escape), .. } } |
+                    KeyboardInput { input: glutin::KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::Q), .. } } => {
+                        return support::Action::Stop
+                    },
+                    KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::B) } => {
+                        bounding_box_enabled ^= true;
+                    },
+                    KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::P) } => {
+                        timer.pause ^= true;
+                    },
+                    KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::PageUp) } => {
+                        timer.t += 0.01;
+                    },
+                    KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::PageDown) } => {
+                        timer.t -= 0.01;
+                    },
+                    KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::F10) } => {
+                        screenshot(&display);
+                    },
+                    KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::F11) } => {
+                        fullscreen ^= true;
+                        if fullscreen {
+                            // Not implemented on Linux
+                            glutin::WindowBuilder::new()
+                                .with_fullscreen(glutin::get_primary_monitor())
+                                .with_depth_buffer(24)
+                                .rebuild_glium(&display).unwrap();
+                        } else {
+                            glutin::WindowBuilder::new()
+                                .rebuild_glium(&display).unwrap();
+                        }
+                    },
+*/
+                    _ => (),
+                }
             }
-        }
+        });
 
         timer.update();
 
-        support::Action::Continue
+        action
     });
 }