diff options
| author |  Cameron Hart <cameron.hart@gmail.com> | 2020-08-17 12:01:58 +1200 |
|---|---|---|
| committer | Cameron Hart <cameron.hart@gmail.com> | 2020-08-17 12:01:58 +1200 |
| commit | b90e5c4e0560226695a35444732d646117658ce8 (patch) | |
| tree | 94a1bbd8c7c892e629116862dcd5203e0c5c1c24 /graphics | |
| parent | 00d66da0cee1dc7faeccc5b3f0794a0393a38da7 (diff) | |
| download | iced-b90e5c4e0560226695a35444732d646117658ce8.tar.gz iced-b90e5c4e0560226695a35444732d646117658ce8.tar.bz2 iced-b90e5c4e0560226695a35444732d646117658ce8.zip | |
Upgrade glam to 0.9 & use glam's Mat4 ortho rh gl.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Cargo.toml | 2 | ||||
| -rw-r--r-- | graphics/src/transformation.rs | 9 |
2 files changed, 3 insertions, 8 deletions
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..2ae74134 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,12 +14,7 @@ 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, 0.0, height as f32, -1.0, 1.0)) } /// Creates a translate transformation. |