Merge branch 'master' of ssh://sunjammer.sugarlabs.org/~/public_git/mandelwow

diff --git a/Cargo.toml b/Cargo.toml
index a45129c741c3383f3d30220412cc53cd769c3f0d..58e3bbc22ad6570ae7d229cec816c40e666d9246 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,8 +6,9 @@ authors = ["Bernie Innocenti <bernie@codewiz.org>"]
 [dependencies]
 glium = "*"
 glutin = "*"
-genmesh = "0.4"
+genmesh = "0.4.1"
 obj = { version = "0.5", features = ["usegenmesh"] }
+libxm = "1.0.0"
 
 [[bin]]
 name = "mandelwow"

diff --git a/mandelwow.rs b/mandelwow.rs
index 8feb2b915093f5cbd39df949455246773d46100e..f760a26266cf597c6db612d391f5a2a274f8ecf5 100644 (file)
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -4,11 +4,17 @@
 
 extern crate glium;
 extern crate glutin;
+extern crate libxm;
+
+use glium::{DisplayBuild, Surface};
+use glium::index::{IndexBuffer, PrimitiveType};
+use glutin::ElementState::Pressed;
+use glutin::Event::KeyboardInput;
+use glutin::VirtualKeyCode;
+use libxm::XMContext;
+use std::fs::File;
+use std::io::Read;
 
-use glium::DisplayBuild;
-use glium::Surface;
-use glium::index::IndexBuffer;
-use glium::index::PrimitiveType;
 
 mod support;
 
@@ -267,11 +273,21 @@ fn mandelwow(display: &glium::Display,
         mandel(&display, &mut frame, &program, &uniforms, bounds, z0);
     }
 }
+fn play_xm(raw_xm: &[u8]) {
+    let freq = 48000u32;
+    let mut xm = XMContext::new(&raw_xm, freq).unwrap();
+}
 
 fn main() {
+    let mut xm = Vec::new();
+    File::open("flora.xm").unwrap().read_to_end(&mut xm).unwrap();
+    play_xm(&xm);
+
     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 +299,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();
@@ -333,30 +350,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
     });
+
 }