projects
/
mandelwow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to glium 0.25.1
[mandelwow.git]
/
lib.rs
diff --git
a/lib.rs
b/lib.rs
index c7026710cc0a85e03bb67c7ca6985943516a1b0a..25e275c56e2140f07e6079599278c149b7ec13b4 100644
(file)
--- a/
lib.rs
+++ b/
lib.rs
@@
-1,11
+1,3
@@
-extern crate cgmath;
-#[macro_use(uniform,program,implement_vertex)]
-extern crate glium;
-extern crate glutin;
-extern crate image;
-extern crate libxm;
-extern crate sdl2;
-
pub mod bounding_box;
pub mod cube;
pub mod mandelwow;
pub mod bounding_box;
pub mod cube;
pub mod mandelwow;
@@
-13,16
+5,22
@@
pub mod shaded_cube;
pub mod sound;
pub mod support;
pub mod text;
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 c
rate::c
ube::Cube;
+pub use
crate::
shaded_cube::ShadedCube;
+#[cfg(feature = "image")]
pub fn screenshot(display : &glium::Display) {
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::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();
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(_ : &glium::Display) {
+}