X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=769c16fba8774e3d6e4bb1b8fbbe36a1b9652206;hb=55d1cdb0feb935c62398185e2d176792a82f7692;hp=8315a3b2fbe0dbe827e31419ce61d93ae94491f0;hpb=eae81e5b33bcab0437934e558158237cfef78d8f;p=mandelwow.git diff --git a/main.rs b/main.rs index 8315a3b..769c16f 100644 --- a/main.rs +++ b/main.rs @@ -1,28 +1,24 @@ +extern crate mandelwow_lib; + extern crate cgmath; -#[macro_use(uniform,program,implement_vertex)] +#[macro_use(uniform)] extern crate glium; extern crate glutin; extern crate image; -extern crate libxm; -extern crate sdl2; -//use cgmath::prelude::*; -use cgmath::{Euler, Matrix4, Rad, Vector3}; -use cube::Cube; +use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero}; +use cgmath::conv::array4x4; use glium::{DisplayBuild, Surface}; use glutin::ElementState::Pressed; use glutin::Event::KeyboardInput; use glutin::VirtualKeyCode; +use mandelwow_lib::*; +use std::f32::consts::PI; +use std::time::{Duration, Instant}; #[cfg(target_os = "emscripten")] use std::os::raw::{c_int, c_void}; -mod bounding_box; -mod cube; -mod mandelwow; -mod sound; -mod support; - 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(); @@ -74,10 +70,11 @@ 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(600, 600) + .with_dimensions(1280, 720) + .with_gl_profile(glutin::GlProfile::Core) //.with_fullscreen(glutin::get_primary_monitor()) .with_depth_buffer(24) .with_vsync() @@ -89,6 +86,7 @@ fn main() { 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 camera = support::camera::CameraState::new(); let mut t: f32 = 0.0; @@ -106,14 +104,48 @@ 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); - set_main_loop_callback(|| { - camera.update(); + const SEA_XSIZE: usize = 24; + const SEA_ZSIZE: usize = 20; + let sea_xmin = -14.0f32; + let sea_xmax = 14.0f32; + let sea_y = -2.5; + let sea_zmin = -2.0f32; + let sea_zmax = -26.0f32; + let sea_xstep = (sea_xmax - sea_xmin) / (SEA_XSIZE as f32); + let sea_zstep = (sea_zmax - sea_zmin) / (SEA_ZSIZE as f32); - if !pause { - // Increment time - t += 0.01; + let mut sea = [[Vector3::zero(); SEA_ZSIZE]; SEA_XSIZE]; + for x in 0..SEA_XSIZE { + for z in 0..SEA_ZSIZE { + 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 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 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; @@ -123,15 +155,19 @@ 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 = cgmath::Matrix4::from( + let rotation = Matrix4::from( Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t / 1.5)}); - let z_trans = -2.0; // Send the model back a little bit so it fits the screen. + 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; - let model = cgmath::conv::array4x4(model2); + 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, // so the lines behind the semi-translucent areas will be drawn. @@ -144,8 +180,24 @@ fn main() { mandelwow_bbox.draw(&mut frame, &uniforms); } + 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(sea[x][z] + Vector3 {x: 0., y: wave, z: 0.}); + let uniforms = uniform! { + model: array4x4(model), + 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); + frame.finish().unwrap(); + let time_after_draw = Instant::now(); for ev in display.poll_events() { match ev { @@ -186,6 +238,31 @@ fn main() { } } + 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; + } + support::Action::Continue }); }