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 glutin::ElementState::Pressed;
use glutin::Event::KeyboardInput;
use glutin::VirtualKeyCode;
+
+#[cfg(target_os = "emscripten")]
use std::os::raw::{c_int, c_void};
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;
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<F>(callback : F) where F : FnMut() {
+#[cfg(target_os = "emscripten")]
+pub fn set_main_loop_callback<F>(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::<F>, 0, 1); }
- unsafe extern "C" fn wrapper<F>() where F : FnMut() {
+ unsafe extern "C" fn wrapper<F>() 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<F>(callback : F) where F : FnMut() -> support::Action {
+ support::start_loop(callback);
+}
+
fn main() {
let _soundplayer = sound::start();
let display = glutin::WindowBuilder::new()
- .with_dimensions(300, 300)
+ .with_dimensions(600, 600)
//.with_fullscreen(glutin::get_primary_monitor())
.with_depth_buffer(24)
.with_vsync()
.build_glium()
.unwrap();
- 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());
+ gl_info(&display);
let mandelwow_program = mandelwow::program(&display);
let bounding_box_program = bounding_box::solid_fill_program(&display);
zmax: 1.1,
};
- //support::start_loop(|| {
set_main_loop_callback(|| {
camera.update();
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;
}
}
- //support::Action::Continue
+ support::Action::Continue
});
}