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

diff --git a/lib.rs b/lib.rs
index eba89b1..5366202 100644
--- a/lib.rs
+++ b/lib.rs
@@ -1,11 +1,11 @@
 extern crate cgmath;
-#[macro_use(uniform,program,implement_vertex)]
+#[macro_use(uniform,implement_vertex)]
 extern crate glium;
 extern crate glutin;
 #[cfg(feature = "image")]
 extern crate image;
 extern crate libxm;
-#[cfg(feature = "rust_rocket")]
+#[cfg(feature = "editor")]
 extern crate rust_rocket;
 extern crate sdl2;
 
@@ -16,20 +16,22 @@ 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;
 
 #[cfg(feature = "image")]
 pub 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();
-    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) {
 }