X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=lib.rs;h=24ef697840c82b47f266cf512ed8310939f7f831;hb=29b275596efed3b3064072483aa6d8c4cba1e3d4;hp=3ec2b55117d9850a3dae3a59f122ceba6a32202e;hpb=7b99fbed004ff914c33c2762c8b40c32d7b3a557;p=mandelwow.git diff --git a/lib.rs b/lib.rs index 3ec2b55..24ef697 100644 --- a/lib.rs +++ b/lib.rs @@ -1,14 +1,3 @@ -extern crate cgmath; -#[macro_use(uniform,implement_vertex)] -extern crate glium; -extern crate glutin; -#[cfg(feature = "image")] -extern crate image; -extern crate libxm; -#[cfg(feature = "editor")] -extern crate rust_rocket; -extern crate sdl2; - pub mod bounding_box; pub mod cube; pub mod mandelwow; @@ -18,13 +7,15 @@ pub mod support; pub mod text; pub mod timer; -pub use bounding_box::BoundingBox; -pub use cube::Cube; -pub use shaded_cube::ShadedCube; +pub use crate::bounding_box::BoundingBox; +pub use crate::cube::Cube; +pub use crate::shaded_cube::ShadedCube; +pub use crate::text::Text; +pub use crate::timer::Timer; #[cfg(feature = "image")] pub fn screenshot(display : &glium::Display) { - let image: glium::texture::RawImage2d = display.read_front_buffer(); + let image: glium::texture::RawImage2d<'_, u8> = display.read_front_buffer().unwrap(); let image = image::ImageBuffer::from_raw(image.width, image.height, image.data.into_owned()).unwrap(); let image = image::DynamicImage::ImageRgba8(image).flipv().to_rgb(); let image = image::DynamicImage::ImageRgb8(image);