X-Git-Url: https://codewiz.org/gitweb?p=mandelwow.git;a=blobdiff_plain;f=mandelwow.rs;h=4c5d25e74bdd7fb7098a185287ab57952a74c1ed;hp=8feb2b915093f5cbd39df949455246773d46100e;hb=af94c9fcbc1e73cc008b090d6355a35eda7aea70;hpb=76fc76631cf155123b127f5bc576d2922c536ebc

diff --git a/mandelwow.rs b/mandelwow.rs
index 8feb2b9..4c5d25e 100644
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -4,12 +4,16 @@
 
 extern crate glium;
 extern crate glutin;
+extern crate libxm;
+extern crate sdl2;
 
-use glium::DisplayBuild;
-use glium::Surface;
-use glium::index::IndexBuffer;
-use glium::index::PrimitiveType;
+use glium::{DisplayBuild, Surface};
+use glium::index::{IndexBuffer, PrimitiveType};
+use glutin::ElementState::Pressed;
+use glutin::Event::KeyboardInput;
+use glutin::VirtualKeyCode;
 
+mod sound;
 mod support;
 
 #[derive(Copy, Clone)]
@@ -153,10 +157,10 @@ fn bounding_box<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
-            .. Default::default()
+            ..Default::default()
         },
         blend: glium::Blend::alpha_blending(),
-        .. Default::default()
+        ..Default::default()
     };
 
     let front_indices = IndexBuffer::new(display, PrimitiveType::LineLoop,
@@ -231,10 +235,10 @@ fn mandel<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
-            .. Default::default()
+            ..Default::default()
         },
         blend: glium::Blend::alpha_blending(),
-        .. Default::default()
+        ..Default::default()
     };
 
     frame.draw(&vb, &indices, program, uniforms, &params).unwrap();
@@ -269,9 +273,13 @@ fn mandelwow(display: &glium::Display,
 }
 
 fn main() {
+    sound::start();
+
     let display = glium::glutin::WindowBuilder::new()
-        .with_dimensions(1024, 768)
+        //.with_dimensions(1024, 768)
+        .with_fullscreen(glutin::get_primary_monitor())
         .with_depth_buffer(24)
+        .with_vsync()
         .with_title(format!("MandelWow"))
         .build_glium()
         .unwrap();
@@ -283,6 +291,7 @@ fn main() {
     let mut t: f32 = 0.0;
     let mut pause = false;
     let mut bounding_box_enabled = true;
+    let mut fullscreen = true;
 
     support::start_loop(|| {
         camera.update();
@@ -321,8 +330,8 @@ fn main() {
             [     0.0,  0.0,      z_trans, 1.0f32]
         ];
 
-        // Draw the bounding box before the fractal, when the Z-buffer is still clear, so the lines
-        // behind the semi-translucent areas will be drawn.
+        // Draw the bounding box before the fractal, when the Z-buffer is still clear,
+        // so the lines behind the semi-translucent areas will be drawn.
         if bounding_box_enabled {
             let uniforms = uniform! {
                 model: model,
@@ -333,30 +342,43 @@ fn main() {
         }
 
         mandelwow(&display, &mut frame, &program, model, &camera, &bounds, wow);
+        frame.finish().unwrap();
 
         for ev in display.poll_events() {
             match ev {
-                glium::glutin::Event::Closed => {
-                    frame.finish().unwrap();
+                glium::glutin::Event::Closed |
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::Escape)) |
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::Q)) => {
                     return support::Action::Stop
                 },
-                glutin::Event::KeyboardInput(glutin::ElementState::Pressed, _, Some(glutin::VirtualKeyCode::PageUp)) => {
-                    t += 0.01;
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::B)) => {
+                    bounding_box_enabled ^= true;
                 },
-                glutin::Event::KeyboardInput(glutin::ElementState::Pressed, _, Some(glutin::VirtualKeyCode::PageDown)) => {
-                    t -= 0.01;
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::F)) => {
+                    fullscreen ^= true;
+                    if fullscreen {
+                        glutin::WindowBuilder::new()
+                            .with_fullscreen(glutin::get_primary_monitor())
+                            .rebuild_glium(&display).unwrap();
+                    } else {
+                        glutin::WindowBuilder::new()
+                            .rebuild_glium(&display).unwrap();
+                    }
                 },
-                glutin::Event::KeyboardInput(glutin::ElementState::Pressed, _, Some(glutin::VirtualKeyCode::P)) => {
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::P)) => {
                     pause ^= true;
                 },
-                glutin::Event::KeyboardInput(glutin::ElementState::Pressed, _, Some(glutin::VirtualKeyCode::B)) => {
-                    bounding_box_enabled ^= true;
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageUp)) => {
+                    t += 0.01;
+                },
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageDown)) => {
+                    t -= 0.01;
                 },
                 ev => camera.process_input(&ev),
             }
         }
 
-        frame.finish().unwrap();
         support::Action::Continue
     });
+
 }