X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=ef61ea816e0bb89f8468ae6a0078f3178c49db5d;hb=45391f3ccaa74be2be93e4b31507f45939afa4b0;hp=56adc5df4d6e00f1ded6e1d221e85f3b10148902;hpb=685148d70bd97c8ddae86423e4b969e91aa46f7a;p=mandelwow.git diff --git a/main.rs b/main.rs index 56adc5d..ef61ea8 100644 --- a/main.rs +++ b/main.rs @@ -4,9 +4,8 @@ extern crate cgmath; #[macro_use(uniform)] extern crate glium; extern crate glutin; -extern crate image; -use cgmath::{Euler, Matrix4, One, Rad, Vector3}; +use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero}; use cgmath::conv::array4x4; use glium::{DisplayBuild, Surface}; use glutin::ElementState::Pressed; @@ -14,25 +13,20 @@ use glutin::Event::KeyboardInput; use glutin::VirtualKeyCode; use mandelwow_lib::*; use std::f32::consts::PI; +use timer::Timer; #[cfg(target_os = "emscripten")] use std::os::raw::{c_int, c_void}; -fn screenshot(display : &glium::Display) { - let image: glium::texture::RawImage2d = 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 { - glium::Version(glium::Api::Gl, _, _) => "OpenGL", - glium::Version(glium::Api::GlEs, _, _) => "OpenGL ES" - }; - println!("{} context verson: {}", api, display.get_opengl_version_string()); + if cfg!(feature = "logging") { + let version = *display.get_opengl_version(); + let api = match version { + glium::Version(glium::Api::Gl, _, _) => "OpenGL", + glium::Version(glium::Api::GlEs, _, _) => "OpenGL ES" + }; + println!("{} context verson: {}", api, display.get_opengl_version_string()); + } } #[cfg(target_os = "emscripten")] @@ -69,26 +63,29 @@ pub fn set_main_loop_callback(callback : F) where F : FnMut() -> support::Act } fn main() { - let _soundplayer = sound::start(); + 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_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); + let mut timer = Timer::new(); let mut camera = support::camera::CameraState::new(); - let mut t: f32 = 0.0; - let mut pause = false; let mut bounding_box_enabled = true; let mut fullscreen = true; @@ -102,7 +99,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; @@ -114,24 +111,31 @@ fn main() { let sea_xstep = (sea_xmax - sea_xmin) / (SEA_XSIZE as f32); let sea_zstep = (sea_zmax - sea_zmin) / (SEA_ZSIZE as f32); - let mut sea = [[Matrix4::one(); SEA_ZSIZE]; SEA_XSIZE]; + let mut sea = [[Vector3::zero(); SEA_ZSIZE]; SEA_XSIZE]; for x in 0..SEA_XSIZE { for z in 0..SEA_ZSIZE { - sea[x][z] = Matrix4::from_translation(Vector3{ + sea[x][z] = Vector3 { x: sea_xmin + (x as f32) * sea_xstep, y: sea_y, z: sea_zmin + (z as f32) * sea_zstep, - }); + }; } - } + } + let mut last_hit = 0.0f32; + let mut hit_time = 0.0f32; set_main_loop_callback(|| { - camera.update(); - - if !pause { - // Increment time - t += 0.01; + let t = timer.t; + let new_hit = sound::hit_event(&mut soundplayer); + if new_hit > last_hit { + hit_time = t; } + last_hit = new_hit; + let hit_delta = t - hit_time; + let hit_scale = 1. / (1. + hit_delta * hit_delta * 15.0) + 1.; + + camera.update(); + let perspview = camera.get_perspview(); // Vary the wow factor to slice the Mandelwow along its 4th dimension. let wmin = -0.8; @@ -147,8 +151,10 @@ fn main() { let rotation = Matrix4::from( Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t / 1.5)}); let z_trans = -3.0; // Send the model back a little bit so it fits the screen. + let scale = + Matrix4::from_diagonal(Vector4::new(hit_scale, hit_scale, hit_scale, 1.0)); let model2 = - Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation; + Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation * scale; let model = array4x4(model2); // Draw the bounding box before the fractal, when the Z-buffer is still clear, @@ -164,20 +170,22 @@ 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 model = Matrix4::from_translation( - Vector3{x: 0., y: wave, z: 0.}) * sea[x][z]; + 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), - view: camera.get_view(), - perspective: camera.get_perspective(), + perspview: perspview, + col: [0., (1. - wave).abs() * 0.5, wave.abs()], }; shaded_cube.draw(&mut frame, &uniforms); } } mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow); + + text.draw(&mut frame, &perspview); + frame.finish().unwrap(); for ev in display.poll_events() { @@ -191,13 +199,13 @@ fn main() { bounding_box_enabled ^= true; }, KeyboardInput(Pressed, _, Some(VirtualKeyCode::P)) => { - pause ^= true; + timer.pause ^= true; }, KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageUp)) => { - t += 0.01; + timer.t += 0.01; }, KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageDown)) => { - t -= 0.01; + timer.t -= 0.01; }, KeyboardInput(Pressed, _, Some(VirtualKeyCode::F10)) => { screenshot(&display); @@ -211,14 +219,16 @@ 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), } } + timer.update(); + support::Action::Continue }); }