X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=ef61ea816e0bb89f8468ae6a0078f3178c49db5d;hb=45391f3ccaa74be2be93e4b31507f45939afa4b0;hp=769c16fba8774e3d6e4bb1b8fbbe36a1b9652206;hpb=55d1cdb0feb935c62398185e2d176792a82f7692;p=mandelwow.git diff --git a/main.rs b/main.rs index 769c16f..ef61ea8 100644 --- 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; @@ -14,26 +13,20 @@ use glutin::Event::KeyboardInput; use glutin::VirtualKeyCode; use mandelwow_lib::*; use std::f32::consts::PI; -use std::time::{Duration, Instant}; +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")] @@ -78,19 +71,21 @@ 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); + 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; @@ -104,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; @@ -127,17 +122,12 @@ fn main() { } } - let mut frame_cnt = 0; - let mut last_report_time = Instant::now(); - let mut last_report_frame_cnt = 0; - let mut accum_draw_time = Duration::new(0, 0); - let mut accum_idle_time = Duration::new(0, 0); - let mut last_hit = 0.0f32; let mut hit_time = 0.0f32; set_main_loop_callback(|| { + let t = timer.t; 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; @@ -155,10 +145,8 @@ fn main() { //println!("t={} w={:?} camera={:?}", t, w, camera.get_pos()); - let time_before_swap = Instant::now(); let mut frame = display.draw(); frame.clear_color_and_depth((0.0, 0.0, 0.0, 1.0), 1.0); - let time_before_draw = Instant::now(); let rotation = Matrix4::from( Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t / 1.5)}); @@ -182,8 +170,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,8 +184,9 @@ 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(); for ev in display.poll_events() { match ev { @@ -210,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); @@ -230,38 +219,15 @@ 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), } } - let now = Instant::now(); - frame_cnt += 1; - accum_idle_time += time_before_draw - time_before_swap; - accum_draw_time += time_after_draw - time_before_draw; - if now - last_report_time > Duration::from_secs(5) { - fn millis(d : Duration) -> f32 { - d.as_secs() as f32 * 1e3 + d.subsec_nanos() as f32 / 1e6 - } - let frames_done = frame_cnt - last_report_frame_cnt; - let fps = frames_done as f32 / (now - last_report_time).as_secs() as f32; - let avg_draw_time = millis(accum_draw_time / frames_done); - let avg_idle_time = millis(accum_idle_time / frames_done); - println!("fps={:.1} draw={:.1}ms idle={:.1}ms", fps, avg_draw_time, avg_idle_time); - - last_report_time = now; - last_report_frame_cnt = frame_cnt; - accum_draw_time = Duration::new(0, 0); - accum_idle_time = Duration::new(0, 0); - } - - if !pause { - // Increment time - t += 0.01; - } + timer.update(); support::Action::Continue });