Create mandelwow_lib.

diff --git a/Cargo.toml b/Cargo.toml
index 4e9fd35cfc9b82bb51e6bc0c3e6c3215353de75c..4e39c8db368dd7112b633311a4489a4fb7a3c59c 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,10 @@ backtrace = "0.2.3"
 "glutin:0.7.4" = { path = "/home/bernie/src/glutin" }
 "glium:0.16.0" = { path = "/home/bernie/src/glium" }
 
+[lib]
+name = "mandelwow_lib"
+path = "lib.rs"
+
 [[bin]]
 name = "mandelwow"
 path = "main.rs"

diff --git a/lib.rs b/lib.rs
new file mode 100644 (file)
index 0000000..8fd85f4
--- /dev/null
+++ b/lib.rs
@@ -0,0 +1,14 @@
+extern crate cgmath;
+#[macro_use(uniform,program,implement_vertex)]
+extern crate glium;
+extern crate glutin;
+extern crate libxm;
+extern crate sdl2;
+
+pub mod bounding_box;
+pub mod cube;
+pub mod mandelwow;
+pub mod sound;
+pub mod support;
+
+pub use cube::Cube;

diff --git a/main.rs b/main.rs
index 8315a3b2fbe0dbe827e31419ce61d93ae94491f0..c58cf5510201cae4949df756f3ed4ac4e6f2f869 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -1,28 +1,21 @@
+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;
-extern crate libxm;
-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 mandelwow_lib::*;
 
 #[cfg(target_os = "emscripten")]
 use std::os::raw::{c_int, c_void};
 
-mod bounding_box;
-mod cube;
-mod mandelwow;
-mod sound;
-mod support;
-
 fn screenshot(display : &glium::Display) {
     let image: glium::texture::RawImage2d<u8> = display.read_front_buffer();
     let image = image::ImageBuffer::from_raw(image.width, image.height, image.data.into_owned()).unwrap();
@@ -126,7 +119,7 @@ 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(
+        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 =