Switch to WebGL 2.

[mandelwow.git] / main.rs

diff --git a/main.rs b/main.rs
index d7e8c00052a2bfcf9bcd6d57683a7ec4c2847fad..c63add0e4dd33c68cc829cb8b5d52aa39583f2fe 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -1,22 +1,29 @@
-// Wow. Such fractal.
-
-#[macro_use]
-
+extern crate cgmath;
+#[macro_use(uniform,program,implement_vertex)]
 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 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;
 mod mandelwow;
+#[cfg(not(target_os = "emscripten"))]
+mod sound;
+#[cfg(target_os = "emscripten")]
+#[path = "sound_emscripten.rs"]
 mod sound;
 mod support;
 
@@ -28,18 +35,53 @@ 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());
+}
+
+#[allow(non_camel_case_types)]
+type em_callback_func = unsafe extern fn();
+extern {
+    fn emscripten_set_main_loop(func : em_callback_func, fps : c_int, simulate_infinite_loop : c_int);
+}
+
+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() {
+    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() {
+        MAIN_LOOP_CALLBACK.with(|z| {
+            let closure = *z.borrow_mut() as *mut F;
+            (*closure)();
+        });
+    }
+}
+
 fn main() {
     let _soundplayer = sound::start();
 
-    let display = glium::glutin::WindowBuilder::new()
-        //.with_dimensions(1024, 768)
-        .with_fullscreen(glutin::get_primary_monitor())
+    let display = glutin::WindowBuilder::new()
+        .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);
 
@@ -59,7 +101,8 @@ fn main() {
         zmax:  1.1,
     };
 
-    support::start_loop(|| {
+    //support::start_loop(|| {
+    set_main_loop_callback(|| {
         camera.update();
 
         if !pause {
@@ -78,13 +121,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 model = [
-            [ t.cos(),  t.sin(),  0.0,     0.0],
-            [-t.sin(),  t.cos(),  0.0,     0.0],
-            [     0.0,  0.0,      1.0,     0.0],
-            [     0.0,  0.0,      z_trans, 1.0f32]
-        ];
+        let model2 =
+            Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation;
+        let model = cgmath::conv::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.
@@ -102,25 +144,14 @@ fn main() {
 
         for ev in display.poll_events() {
             match ev {
-                glium::glutin::Event::Closed |
+                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;
                 },
-                KeyboardInput(Pressed, _, Some(VirtualKeyCode::F)) => {
-                    fullscreen ^= true;
-                    if fullscreen {
-                        glutin::WindowBuilder::new()
-                            .with_fullscreen(glutin::get_primary_monitor())
-                            .rebuild_glium(&display).unwrap();
-                    } else {
-                        glutin::WindowBuilder::new()
-                            .rebuild_glium(&display).unwrap();
-                    }
-                },
                 KeyboardInput(Pressed, _, Some(VirtualKeyCode::P)) => {
                     pause ^= true;
                 },
@@ -133,11 +164,23 @@ fn main() {
                 KeyboardInput(Pressed, _, Some(VirtualKeyCode::F10)) => {
                     screenshot(&display);
                 },
+                KeyboardInput(Pressed, _, Some(VirtualKeyCode::F11)) => {
+                    fullscreen ^= true;
+                    if fullscreen {
+                        // Not implemented on Linux
+                        glutin::WindowBuilder::new()
+                            .with_fullscreen(glutin::get_primary_monitor())
+                            .with_depth_buffer(24)
+                            .rebuild_glium(&display).unwrap();
+                    } else {
+                        //glutin::WindowBuilder::new()
+                        //    .rebuild_glium(&display).unwrap();
+                    }
+                },
                 ev => camera.process_input(&ev),
             }
         }
 
-        support::Action::Continue
+        //support::Action::Continue
     });
-
 }