X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=c58cf5510201cae4949df756f3ed4ac4e6f2f869;hb=refs%2Ftags%2Fv0.6.0;hp=d1582dc288c86ab54c6320a4fcde1363e43e22d4;hpb=d435684b264419ec4d8fa5770ce7a15207a67c70;p=mandelwow.git

diff --git a/main.rs b/main.rs
index d1582dc..c58cf55 100644
--- a/main.rs
+++ b/main.rs
@@ -1,31 +1,20 @@
+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 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::*;
 
-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<u8> = display.read_front_buffer();
@@ -35,23 +24,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<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)();
@@ -59,11 +61,16 @@ pub fn set_main_loop_callback<F>(callback : F) where F : FnMut() {
     }
 }
 
+#[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()
@@ -71,12 +78,7 @@ fn main() {
         .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);
@@ -96,8 +98,8 @@ fn main() {
         zmin: -1.1,
         zmax:  1.1,
     };
+    let mandelwow_bbox = bounding_box::BoundingBox::new(&display, &bounds, &bounding_box_program);
 
-    //support::start_loop(|| {
     set_main_loop_callback(|| {
         camera.update();
 
@@ -117,8 +119,8 @@ 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 rotation = Matrix4::from(
+            Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t / 1.5)});
         let z_trans = -2.0;  // Send the model back a little bit so it fits the screen.
         let model2 =
             Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation;
@@ -132,7 +134,7 @@ 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);
         }
 
         mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);
@@ -143,7 +145,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;
@@ -177,6 +179,6 @@ fn main() {
             }
         }
 
-        //support::Action::Continue
+        support::Action::Continue
     });
 }