From 0544e3bed6ee7e32f327d70d78d30ee09f6bd2b0 Mon Sep 17 00:00:00 2001 From: Cosmic Chip Socket <34800072+cosmicchipsocket@users.noreply.github.com> Date: Mon, 29 Jun 2020 17:49:22 -0400 Subject: [PATCH] Fix example --- imgui-examples/examples/custom_textures.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/imgui-examples/examples/custom_textures.rs b/imgui-examples/examples/custom_textures.rs index 3988512..e9ce713 100644 --- a/imgui-examples/examples/custom_textures.rs +++ b/imgui-examples/examples/custom_textures.rs @@ -6,10 +6,12 @@ use std::rc::Rc; use glium::{ backend::Facade, texture::{ClientFormat, RawImage2d}, + uniforms::{MagnifySamplerFilter, MinifySamplerFilter}, Texture2d, }; use image::{jpeg::JpegDecoder, ImageDecoder}; use imgui::*; +use imgui_glium_renderer::TextureEntry; mod support; @@ -28,7 +30,7 @@ impl CustomTexturesApp { fn register_textures( &mut self, gl_ctx: &F, - textures: &mut Textures>, + textures: &mut Textures, ) -> Result<(), Box> where F: Facade, @@ -55,7 +57,12 @@ impl CustomTexturesApp { format: ClientFormat::U8U8U8, }; let gl_texture = Texture2d::new(gl_ctx, raw)?; - let texture_id = textures.insert(Rc::new(gl_texture)); + let texture = TextureEntry { + texture: Rc::new(gl_texture), + mag_filter: MagnifySamplerFilter::Linear, + min_filter: MinifySamplerFilter::Linear, + }; + let texture_id = textures.insert(texture); self.my_texture_id = Some(texture_id); } @@ -86,7 +93,7 @@ impl CustomTexturesApp { } impl Lenna { - fn new(gl_ctx: &F, textures: &mut Textures>) -> Result> + fn new(gl_ctx: &F, textures: &mut Textures) -> Result> where F: Facade, { @@ -104,7 +111,12 @@ impl Lenna { format: ClientFormat::U8U8U8, }; let gl_texture = Texture2d::new(gl_ctx, raw)?; - let texture_id = textures.insert(Rc::new(gl_texture)); + let texture = TextureEntry { + texture: Rc::new(gl_texture), + mag_filter: MagnifySamplerFilter::Linear, + min_filter: MinifySamplerFilter::Linear, + }; + let texture_id = textures.insert(texture); Ok(Lenna { texture_id, size: [width as f32, height as f32],