X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=lib.rs;h=24ef697840c82b47f266cf512ed8310939f7f831;hb=00a79890fb6e7fb3b1f12e1aa9ce23affe5dbe16;hp=eba89b1fb1b776a6702cb365e392fa672c037b69;hpb=5466a1137a9a4b27a99b83c45c0b337775bacf7c;p=mandelwow.git

diff --git a/lib.rs b/lib.rs
index eba89b1..24ef697 100644
--- a/lib.rs
+++ b/lib.rs
@@ -1,14 +1,3 @@
-extern crate cgmath;
-#[macro_use(uniform,program,implement_vertex)]
-extern crate glium;
-extern crate glutin;
-#[cfg(feature = "image")]
-extern crate image;
-extern crate libxm;
-#[cfg(feature = "rust_rocket")]
-extern crate rust_rocket;
-extern crate sdl2;
-
 pub mod bounding_box;
 pub mod cube;
 pub mod mandelwow;
@@ -16,20 +5,24 @@ pub mod shaded_cube;
 pub mod sound;
 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<u8> = 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();
+    let image = image::DynamicImage::ImageRgba8(image).flipv().to_rgb();
+    let image = image::DynamicImage::ImageRgb8(image);
     let mut output = std::fs::File::create(&std::path::Path::new("screenshot.png")).unwrap();
-    image.save(&mut output, image::ImageFormat::PNG).unwrap();
+    image.write_to(&mut output, image::ImageFormat::PNG).unwrap();
 }
 
 #[cfg(not(feature = "image"))]
-pub fn screenshot(display : &glium::Display) {
+pub fn screenshot(_ : &glium::Display) {
 }