From b90e5c4e0560226695a35444732d646117658ce8 Mon Sep 17 00:00:00 2001
From: Cameron Hart <cameron.hart@gmail.com>
Date: Mon, 17 Aug 2020 12:01:58 +1200
Subject: [PATCH] Upgrade glam to 0.9 & use glam's Mat4 ortho rh gl.

---
 glow/Cargo.toml                | 1 -
 graphics/Cargo.toml            | 2 +-
 graphics/src/transformation.rs | 9 ++-------
 wgpu/Cargo.toml                | 1 -
 4 files changed, 3 insertions(+), 10 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..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.
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