X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=e0d2ad2df089ae64fe881c29b3341118d6c18d79;hb=475b28ef9c58a937a6637bcf49f1b6b95d10a9f5;hp=12a127b9df1472c665730d69af6c1e9b322c2406;hpb=70862a24f674f89190e392c0d1cb9f3dfe405059;p=mandelwow.git diff --git a/main.rs b/main.rs index 12a127b..e0d2ad2 100644 --- a/main.rs +++ b/main.rs @@ -1,5 +1,3 @@ -// Wow. Such fractal. - extern crate cgmath; #[macro_use(uniform,program,implement_vertex)] extern crate glium; @@ -15,6 +13,7 @@ use glium::{DisplayBuild, Surface}; use glutin::ElementState::Pressed; use glutin::Event::KeyboardInput; use glutin::VirtualKeyCode; +use std::os::raw::{c_int, c_void}; mod bounding_box; mod cube; @@ -30,18 +29,62 @@ 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())); + +#[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() -> support::Action { + MAIN_LOOP_CALLBACK.with(|z| { + let closure = *z.borrow_mut() as *mut F; + (*closure)(); + }); + } +} + +#[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_fullscreen(glutin::get_primary_monitor()) + .with_dimensions(600, 600) + //.with_fullscreen(glutin::get_primary_monitor()) .with_depth_buffer(24) .with_vsync() .with_title(format!("MandelWow")) .build_glium() .unwrap(); + gl_info(&display); + let mandelwow_program = mandelwow::program(&display); let bounding_box_program = bounding_box::solid_fill_program(&display); @@ -61,7 +104,7 @@ fn main() { zmax: 1.1, }; - support::start_loop(|| { + set_main_loop_callback(|| { camera.update(); if !pause { @@ -142,5 +185,4 @@ fn main() { support::Action::Continue }); - }