# HG changeset patch # User Emmanuel Gil Peyrot # Date 1567957643 -7200 # Node ID 3954801b6299bd039d64408de30dcb55988794a0 # Parent 987409d489910a48c7a8b85e12a4e935d75c7779 examples: Update to luminance 0.32. diff --git a/Cargo.toml b/Cargo.toml --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ nom = "5" encoding_rs = "0.8" image = { version = "0.22", default-features = false, features = ["png_codec"] } bitflags = "1" -luminance = "0.31" +luminance = "0.32" luminance-glfw = { version = "0.6", default-features = false } luminance-derive = "0.1" diff --git a/examples/anmrenderer.rs b/examples/anmrenderer.rs --- a/examples/anmrenderer.rs +++ b/examples/anmrenderer.rs @@ -2,7 +2,7 @@ use luminance::blending::{Equation, Fact use luminance::context::GraphicsContext; use luminance::framebuffer::Framebuffer; use luminance::pipeline::BoundTexture; -use luminance::pixel::Floating; +use luminance::pixel::NormUnsigned; use luminance::render_state::RenderState; use luminance::shader::program::{Program, Uniform}; use luminance::tess::{Mode, TessBuilder}; @@ -81,7 +81,7 @@ struct Vertex { #[derive(UniformInterface)] struct ShaderInterface { // the 'static lifetime acts as “anything” here - color_map: Uniform<&'static BoundTexture<'static, Flat, Dim2, Floating>>, + color_map: Uniform<&'static BoundTexture<'static, Flat, Dim2, NormUnsigned>>, #[uniform(name = "mvp")] mvp: Uniform<[[f32; 4]; 4]>, diff --git a/examples/common.rs b/examples/common.rs --- a/examples/common.rs +++ b/examples/common.rs @@ -37,7 +37,7 @@ fn load_rgb_png(surface: &mut GlfwSurfac Texture::new(surface, [width, height], 0, &Sampler::default()).expect("luminance texture creation"); // the first argument disables mipmap generation (we don’t care so far) - tex.upload(GenMipmaps::No, &texels); + tex.upload(GenMipmaps::No, &texels).unwrap(); Some(LoadedTexture::Rgb(tex)) } @@ -81,7 +81,7 @@ fn load_rgb_a_pngs(surface: &mut GlfwSur Texture::new(surface, [width, height], 0, &Sampler::default()).expect("luminance texture creation"); // the first argument disables mipmap generation (we don’t care so far) - tex.upload(GenMipmaps::No, &texels); + tex.upload(GenMipmaps::No, &texels).unwrap(); Some(LoadedTexture::Rgba(tex)) } diff --git a/examples/eclrenderer.rs b/examples/eclrenderer.rs --- a/examples/eclrenderer.rs +++ b/examples/eclrenderer.rs @@ -2,7 +2,7 @@ use luminance::blending::{Equation, Fact use luminance::context::GraphicsContext; use luminance::framebuffer::Framebuffer; use luminance::pipeline::BoundTexture; -use luminance::pixel::Floating; +use luminance::pixel::NormUnsigned; use luminance::render_state::RenderState; use luminance::shader::program::{Program, Uniform}; use luminance::tess::{Mode, TessBuilder}; @@ -83,7 +83,7 @@ struct Vertex { #[derive(UniformInterface)] struct ShaderInterface { // the 'static lifetime acts as “anything” here - color_map: Uniform<&'static BoundTexture<'static, Flat, Dim2, Floating>>, + color_map: Uniform<&'static BoundTexture<'static, Flat, Dim2, NormUnsigned>>, #[uniform(name = "mvp")] mvp: Uniform<[[f32; 4]; 4]>, diff --git a/examples/stdrenderer.rs b/examples/stdrenderer.rs --- a/examples/stdrenderer.rs +++ b/examples/stdrenderer.rs @@ -2,7 +2,7 @@ use luminance::blending::{Equation, Fact use luminance::context::GraphicsContext; use luminance::framebuffer::Framebuffer; use luminance::pipeline::BoundTexture; -use luminance::pixel::Floating; +use luminance::pixel::NormUnsigned; use luminance::render_state::RenderState; use luminance::shader::program::{Program, Uniform}; use luminance::tess::{Mode, TessBuilder, TessSliceIndex}; @@ -90,7 +90,7 @@ struct Vertex { #[derive(UniformInterface)] struct ShaderInterface { // the 'static lifetime acts as “anything” here - color_map: Uniform<&'static BoundTexture<'static, Flat, Dim2, Floating>>, + color_map: Uniform<&'static BoundTexture<'static, Flat, Dim2, NormUnsigned>>, #[uniform(name = "mvp")] mvp: Uniform<[[f32; 4]; 4]>,