elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-11 21:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies in glium examples

Browse Source
This commit is contained in:
Joonas Javanainen 2019-04-10 21:46:21 +03:00
parent a51afa0539
commit 7049dfdc68
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179
3 changed files with 286 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

547
imgui-glium-examples/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
imgui-glium-examples/Cargo.toml
View File

@ -14,4 +14,4 @@ glium = { version = "0.23", default-features = true }
imgui = { version = "0.0.23-pre", path = "../" }
imgui-glium-renderer = { version = "0.0.23-pre", path = "../imgui-glium-renderer" }
imgui-winit-support = { version = "0.0.23-pre", path = "../imgui-winit-support" }
image = "0.20"
image = "0.21"

22
imgui-glium-examples/examples/custom_textures.rs
View File

@ -7,7 +7,7 @@ use glium::{
texture::{ClientFormat, RawImage2d},
Texture2d,
};
use image::{jpeg::JPEGDecoder, DecodingResult, ImageDecoder};
use image::{jpeg::JPEGDecoder, ImageDecoder};
use imgui::*;
mod support;
@ -51,7 +51,7 @@ impl CustomTexturesApp {
}
let raw = RawImage2d {
data: Cow::Borrowed(&data),
data: Cow::Owned(data),
width: WIDTH as u32,
height: HEIGHT as u32,
format: ClientFormat::U8U8U8,
@ -94,19 +94,15 @@ impl Lenna {
{
let lenna_bytes = include_bytes!("../../resources/Lenna.jpg");
let byte_stream = Cursor::new(lenna_bytes.as_ref());
let mut decoder = JPEGDecoder::new(byte_stream);
let decoder = JPEGDecoder::new(byte_stream)?;
let (width, height) = decoder.dimensions()?;
let (width, height) = decoder.dimensions();
let image = decoder.read_image()?;
let raw = if let DecodingResult::U8(data) = &image {
RawImage2d {
data: Cow::Borrowed(data),
width,
height,
format: ClientFormat::U8U8U8,
}
} else {
unimplemented!("I only know how to deal with U8 data")
let raw = RawImage2d {
data: Cow::Owned(image),
width: width as u32,
height: height as u32,
format: ClientFormat::U8U8U8,
};
let gl_texture = Texture2d::new(gl_ctx, raw)?;
let texture_id = textures.insert(gl_texture);