Add rust-rocket optional dependency.

[mandelwow.git] / main.rs

diff --git a/main.rs b/main.rs
index 769c16fba8774e3d6e4bb1b8fbbe36a1b9652206..d5f7378f0c98e52b2fd5b1b622e1154462a2440a 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -4,7 +4,6 @@ extern crate cgmath;
 #[macro_use(uniform)]
 extern crate glium;
 extern crate glutin;
-extern crate image;
 
 use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero};
 use cgmath::conv::array4x4;
@@ -19,14 +18,6 @@ use std::time::{Duration, Instant};
 #[cfg(target_os = "emscripten")]
 use std::os::raw::{c_int, c_void};
 
-fn screenshot(display : &glium::Display) {
-    let image: glium::texture::RawImage2d<u8> = display.read_front_buffer();
-    let image = image::ImageBuffer::from_raw(image.width, image.height, image.data.into_owned()).unwrap();
-    let image = image::DynamicImage::ImageRgba8(image).flipv();
-    let mut output = std::fs::File::create(&std::path::Path::new("screenshot.png")).unwrap();
-    image.save(&mut output, image::ImageFormat::PNG).unwrap();
-}
-
 fn gl_info(display : &glium::Display) {
     let version = *display.get_opengl_version();
     let api = match version {
@@ -78,12 +69,15 @@ fn main() {
         //.with_fullscreen(glutin::get_primary_monitor())
         .with_depth_buffer(24)
         .with_vsync()
-        .with_title(format!("MandelWow"))
+        .with_srgb(Some(true))
+        .with_title("MandelWow")
         .build_glium()
+        //.build_glium_debug(glium::debug::DebugCallbackBehavior::PrintAll)
         .unwrap();
 
     gl_info(&display);
 
+    let text = text::Text::new(&display);
     let mandelwow_program = mandelwow::program(&display);
     let bounding_box_program = bounding_box::solid_fill_program(&display);
     let shaded_program = shaded_cube::shaded_program(&display);
@@ -104,7 +98,7 @@ fn main() {
         zmax:  1.1,
     };
     let mandelwow_bbox = bounding_box::BoundingBox::new(&display, &bounds, &bounding_box_program);
-    let shaded_cube = ShadedCube::new(&display, &Cube::default(), &shaded_program);
+    let shaded_cube = ShadedCube::new(&display, &shaded_program);
 
     const SEA_XSIZE: usize = 24;
     const SEA_ZSIZE: usize = 20;
@@ -137,7 +131,7 @@ fn main() {
     let mut hit_time = 0.0f32;
     set_main_loop_callback(|| {
         let new_hit = sound::hit_event(&mut soundplayer);
-        if new_hit != last_hit {
+        if new_hit > last_hit {
             hit_time = t;
         }
         last_hit = new_hit;
@@ -182,8 +176,8 @@ fn main() {
 
         for x in 0..SEA_XSIZE {
             for z in 0..SEA_ZSIZE {
-                let wave = (((x as f32 / SEA_XSIZE as f32 * PI * 5.0 + t * 2.0)).sin() +
-                            ((z as f32 / SEA_ZSIZE as f32 * PI * 3.0 + t * 3.0)).sin()) * 0.3;
+                let wave = ((x as f32 / SEA_XSIZE as f32 * PI * 5.0 + t * 2.0).sin() +
+                            (z as f32 / SEA_ZSIZE as f32 * PI * 3.0 + t * 3.0).sin()) * 0.3;
                 let model = Matrix4::from_translation(sea[x][z] + Vector3 {x: 0., y: wave, z: 0.});
                 let uniforms = uniform! {
                     model: array4x4(model),
@@ -196,6 +190,8 @@ fn main() {
 
         mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);
 
+        text.draw(&mut frame, &perspview);
+
         frame.finish().unwrap();
         let time_after_draw = Instant::now();
 
@@ -230,8 +226,8 @@ fn main() {
                             .with_depth_buffer(24)
                             .rebuild_glium(&display).unwrap();
                     } else {
-                        //glutin::WindowBuilder::new()
-                        //    .rebuild_glium(&display).unwrap();
+                        glutin::WindowBuilder::new()
+                            .rebuild_glium(&display).unwrap();
                     }
                 },
                 ev => camera.process_input(&ev),