X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=b492676cfb51527ce537c9c86679b735a44101af;hb=22668f3c0f27178103484fc8ff02240f00386ba8;hp=2d68c82622f6fb98b7caf70d89e0553e566b645f;hpb=e523420da6df64609d595e1e6e902592c00f6a47;p=mandelwow.git diff --git a/main.rs b/main.rs index 2d68c82..b492676 100644 --- a/main.rs +++ b/main.rs @@ -1,31 +1,23 @@ +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; -#[cfg(not(target_os = "emscripten"))] -extern crate libxm; -#[cfg(not(target_os = "emscripten"))] -extern crate sdl2; -//use cgmath::prelude::*; -use cgmath::{Euler, Matrix4, Rad, Vector3}; -use cube::Cube; +use cgmath::{Euler, Matrix4, Rad, Vector3, Zero}; +use cgmath::conv::array4x4; use glium::{DisplayBuild, Surface}; use glutin::ElementState::Pressed; use glutin::Event::KeyboardInput; use glutin::VirtualKeyCode; -use std::os::raw::{c_int, c_void}; +use mandelwow_lib::*; +use std::f32::consts::PI; +use std::time::{Duration, Instant}; -mod bounding_box; -mod cube; -mod mandelwow; -#[cfg(not(target_os = "emscripten"))] -mod sound; #[cfg(target_os = "emscripten")] -#[path = "sound_emscripten.rs"] -mod sound; -mod support; +use std::os::raw::{c_int, c_void}; fn screenshot(display : &glium::Display) { let image: glium::texture::RawImage2d = display.read_front_buffer(); @@ -35,23 +27,36 @@ fn screenshot(display : &glium::Display) { 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()); +} + +#[cfg(target_os = "emscripten")] #[allow(non_camel_case_types)] type em_callback_func = unsafe extern fn(); +#[cfg(target_os = "emscripten")] extern { fn emscripten_set_main_loop(func : em_callback_func, fps : c_int, simulate_infinite_loop : c_int); } +#[cfg(target_os = "emscripten")] thread_local!(static MAIN_LOOP_CALLBACK: std::cell::RefCell<*mut c_void> = std::cell::RefCell::new(std::ptr::null_mut())); -pub fn set_main_loop_callback(callback : F) where F : FnMut() { +#[cfg(target_os = "emscripten")] +pub fn set_main_loop_callback(callback : F) where F : FnMut() -> support::Action { MAIN_LOOP_CALLBACK.with(|log| { *log.borrow_mut() = &callback as *const _ as *mut c_void; }); unsafe { emscripten_set_main_loop(wrapper::, 0, 1); } - unsafe extern "C" fn wrapper() where F : FnMut() { + unsafe extern "C" fn wrapper() where F : FnMut() -> support::Action { MAIN_LOOP_CALLBACK.with(|z| { let closure = *z.borrow_mut() as *mut F; (*closure)(); @@ -59,11 +64,16 @@ pub fn set_main_loop_callback(callback : F) where F : FnMut() { } } +#[cfg(not(target_os = "emscripten"))] +pub fn set_main_loop_callback(callback : F) where F : FnMut() -> support::Action { + support::start_loop(callback); +} + fn main() { let _soundplayer = sound::start(); let display = glutin::WindowBuilder::new() - .with_dimensions(1024, 768) + .with_dimensions(1280, 720) //.with_fullscreen(glutin::get_primary_monitor()) .with_depth_buffer(24) .with_vsync() @@ -71,8 +81,11 @@ fn main() { .build_glium() .unwrap(); + gl_info(&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 camera = support::camera::CameraState::new(); let mut t: f32 = 0.0; @@ -89,10 +102,37 @@ fn main() { zmin: -1.1, 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); + + 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); + + 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; - //support::start_loop(|| { set_main_loop_callback(|| { camera.update(); + let perspview = camera.get_perspview(); if !pause { // Increment time @@ -110,12 +150,12 @@ fn main() { let mut frame = display.draw(); frame.clear_color_and_depth((0.0, 0.0, 0.0, 1.0), 1.0); - let rotation = cgmath::Matrix4::from( - Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t)}); - let z_trans = -2.0; // Send the model back a little bit so it fits the screen. + 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 model2 = Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation; - let model = cgmath::conv::array4x4(model2); + 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. @@ -125,7 +165,20 @@ fn main() { view: camera.get_view(), perspective: camera.get_perspective(), }; - bounding_box::draw(&display, &mut frame, &bounding_box_program, &uniforms, &bounds); + 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, + }; + shaded_cube.draw(&mut frame, &uniforms); + } } mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow); @@ -136,7 +189,7 @@ fn main() { glutin::Event::Closed | KeyboardInput(Pressed, _, Some(VirtualKeyCode::Escape)) | KeyboardInput(Pressed, _, Some(VirtualKeyCode::Q)) => { - //return support::Action::Stop + return support::Action::Stop }, KeyboardInput(Pressed, _, Some(VirtualKeyCode::B)) => { bounding_box_enabled ^= true; @@ -170,6 +223,16 @@ fn main() { } } - //support::Action::Continue + 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); + last_report_time = now; + last_report_frame_cnt = frame_cnt; + } + + support::Action::Continue }); }