diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-08-17 21:53:59 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-08-17 21:53:59 +0200 |
| commit | 24297b11ee13dbe705b2fafa93643261560cbc45 (patch) | |
| tree | 51f0f4f0e1636d4a8a918ad0a3081dfbf3a92217 | |
| parent | 00d66da0cee1dc7faeccc5b3f0794a0393a38da7 (diff) | |
| parent | 02ca90a22d5c4235de4491f840dc9f55f9967618 (diff) | |
| download | iced-24297b11ee13dbe705b2fafa93643261560cbc45.tar.gz iced-24297b11ee13dbe705b2fafa93643261560cbc45.tar.bz2 iced-24297b11ee13dbe705b2fafa93643261560cbc45.zip | |
Merge pull request #482 from bitshifter/glam-0.9
Upgrade glam to 0.9 & use glam's Mat4 ortho rh gl.
| -rw-r--r-- | glow/Cargo.toml | 1 | ||||
| -rw-r--r-- | graphics/Cargo.toml | 2 | ||||
| -rw-r--r-- | graphics/src/transformation.rs | 11 | ||||
| -rw-r--r-- | wgpu/Cargo.toml | 1 |
4 files changed, 6 insertions, 9 deletions
diff --git a/glow/Cargo.toml b/glow/Cargo.toml index f1f491b3..11ca80e2 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -20,7 +20,6 @@ glow_glyph = "0.3" glyph_brush = "0.7" euclid = "0.20" bytemuck = "1.2" -glam = "0.8" log = "0.4" [dependencies.iced_native] diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index 8e078d75..723b9232 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -13,7 +13,7 @@ opengl = [] [dependencies] bytemuck = "1.2" -glam = "0.8" +glam = "0.9" raw-window-handle = "0.3" [dependencies.iced_native] diff --git a/graphics/src/transformation.rs b/graphics/src/transformation.rs index ff3b1d00..2a19caed 100644 --- a/graphics/src/transformation.rs +++ b/graphics/src/transformation.rs @@ -1,4 +1,4 @@ -use glam::{Mat4, Vec3, Vec4}; +use glam::{Mat4, Vec3}; use std::ops::Mul; /// A 2D transformation matrix. @@ -14,11 +14,10 @@ impl Transformation { /// Creates an orthographic projection. #[rustfmt::skip] pub fn orthographic(width: u32, height: u32) -> Transformation { - Transformation(Mat4::from_cols( - Vec4::new(2.0 / width as f32, 0.0, 0.0, 0.0), - Vec4::new(0.0, -2.0 / height as f32, 0.0, 0.0), - Vec4::new(0.0, 0.0, -1.0, 0.0), - Vec4::new(-1.0, 1.0, 0.0, 1.0) + Transformation(Mat4::orthographic_rh_gl( + 0.0, width as f32, + height as f32, 0.0, + -1.0, 1.0 )) } diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index db3104c4..6d9a1830 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -19,7 +19,6 @@ glyph_brush = "0.7" zerocopy = "0.3" bytemuck = "1.2" raw-window-handle = "0.3" -glam = "0.8" log = "0.4" guillotiere = "0.5" # Pin `gfx-memory` until https://github.com/gfx-rs/wgpu-rs/issues/261 is |