#[macro_use(uniform)]
extern crate glium;
extern crate glutin;
-extern crate image;
-use cgmath::{Euler, Matrix4, Rad, Vector3, Zero};
+use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero};
use cgmath::conv::array4x4;
use glium::{DisplayBuild, Surface};
use glutin::ElementState::Pressed;
#[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 {
}
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_srgb(Some(true))
.with_title(format!("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);
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;
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();
- if !pause {
- // Increment time
- t += 0.01;
- }
-
// Vary the wow factor to slice the Mandelwow along its 4th dimension.
let wmin = -0.8;
let wmax = 0.8;
//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)});
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,
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);
+
+ text.draw(&mut frame, &perspview);
+
frame.finish().unwrap();
+ let time_after_draw = Instant::now();
for ev in display.poll_events() {
match ev {
.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),
}
}
- frame_cnt += 1;
let now = Instant::now();
- if now - last_report_time > Duration::from_secs(10) {
- let fps = (frame_cnt - last_report_frame_cnt) as f32 /
- (now - last_report_time).as_secs() as f32;
- println!("fps={}", fps);
+ 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
projects / mandelwow.git / blobdiff