switch to mat4 in ray-tracing examples

examples/Cargo.toml

@@ -34,7 +34,7 @@ cfg-if.workspace = true
 encase = { workspace = true, features = ["glam"] }
 flume.workspace = true
 getrandom.workspace = true
-glam.workspace = true
+glam = {workspace = true, features = ["bytemuck"] }
 ktx2.workspace = true
 log.workspace = true
 nanorand.workspace = true

examples/src/ray_cube_compute/mod.rs

@@ -70,8 +70,8 @@ fn create_vertices() -> (Vec<Vertex>, Vec<u16>) {
 #[repr(C)]
 #[derive(Clone, Copy, Pod, Zeroable)]
 struct Uniforms {
-    view_inverse: [[f32; 4]; 4],
-    proj_inverse: [[f32; 4]; 4],
+    view_inverse: Mat4,
+    proj_inverse: Mat4,
 }
 
 #[inline]
@@ -205,8 +205,8 @@ impl crate::framework::Example for Example {
             );
 
             Uniforms {
-                view_inverse: view.inverse().to_cols_array_2d(),
-                proj_inverse: proj.inverse().to_cols_array_2d(),
+                view_inverse: view.inverse(),
+                proj_inverse: proj.inverse(),
             }
         };
 

examples/src/ray_cube_fragment/mod.rs

@@ -68,8 +68,8 @@ fn create_vertices() -> (Vec<Vertex>, Vec<u16>) {
 #[repr(C)]
 #[derive(Clone, Copy, Pod, Zeroable)]
 struct Uniforms {
-    view_inverse: [[f32; 4]; 4],
-    proj_inverse: [[f32; 4]; 4],
+    view_inverse: Mat4,
+    proj_inverse: Mat4,
 }
 
 /// A wrapper for `pop_error_scope` futures that panics if an error occurs.
@@ -134,8 +134,8 @@ impl crate::framework::Example for Example {
             );
 
             Uniforms {
-                view_inverse: view.inverse().to_cols_array_2d(),
-                proj_inverse: proj.inverse().to_cols_array_2d(),
+                view_inverse: view.inverse(),
+                proj_inverse: proj.inverse(),
             }
         };
 
@@ -287,7 +287,7 @@ impl crate::framework::Example for Example {
             1000.0,
         );
 
-        self.uniforms.proj_inverse = proj.inverse().to_cols_array_2d();
+        self.uniforms.proj_inverse = proj.inverse();
 
         queue.write_buffer(&self.uniform_buf, 0, bytemuck::cast_slice(&[self.uniforms]));
     }

examples/src/ray_scene/mod.rs

@@ -20,8 +20,8 @@ struct Vertex {
 #[repr(C)]
 #[derive(Clone, Copy, Pod, Zeroable)]
 struct Uniforms {
-    view_inverse: [[f32; 4]; 4],
-    proj_inverse: [[f32; 4]; 4],
+    view_inverse: Mat4,
+    proj_inverse: Mat4,
 }
 
 /// A wrapper for `pop_error_scope` futures that panics if an error occurs.
@@ -344,8 +344,8 @@ impl crate::framework::Example for Example {
             );
 
             Uniforms {
-                view_inverse: view.inverse().to_cols_array_2d(),
-                proj_inverse: proj.inverse().to_cols_array_2d(),
+                view_inverse: view.inverse(),
+                proj_inverse: proj.inverse(),
             }
         };
 
@@ -455,7 +455,7 @@ impl crate::framework::Example for Example {
             1000.0,
         );
 
-        self.uniforms.proj_inverse = proj.inverse().to_cols_array_2d();
+        self.uniforms.proj_inverse = proj.inverse();
 
         queue.write_buffer(&self.uniform_buf, 0, bytemuck::cast_slice(&[self.uniforms]));
     }

examples/src/ray_shadows/mod.rs

@@ -45,9 +45,9 @@ fn create_vertices() -> (Vec<Vertex>, Vec<u16>) {
 #[repr(C)]
 #[derive(Clone, Copy, Pod, Zeroable)]
 struct Uniforms {
-    view_inverse: [[f32; 4]; 4],
-    proj_inverse: [[f32; 4]; 4],
-    vertex: [[f32; 4]; 4],
+    view_inverse: Mat4,
+    proj_inverse: Mat4,
+    vertex: Mat4,
 }
 
 /// A wrapper for `pop_error_scope` futures that panics if an error occurs.
@@ -94,9 +94,9 @@ fn create_matrix(config: &wgpu::SurfaceConfiguration) -> Uniforms {
     );
 
     Uniforms {
-        view_inverse: view.inverse().to_cols_array_2d(),
-        proj_inverse: proj.inverse().to_cols_array_2d(),
-        vertex: (proj * view).to_cols_array_2d(),
+        view_inverse: view.inverse(),
+        proj_inverse: proj.inverse(),
+        vertex: (proj * view),
     }
 }
 

examples/src/ray_traced_triangle/mod.rs

@@ -22,8 +22,8 @@ struct Example {
 #[repr(C)]
 #[derive(bytemuck::Pod, bytemuck::Zeroable, Clone, Copy, Debug)]
 struct Uniforms {
-    view_inverse: [[f32; 4]; 4],
-    proj_inverse: [[f32; 4]; 4],
+    view_inverse: Mat4,
+    proj_inverse: Mat4,
 }
 
 impl crate::framework::Example for Example {
@@ -194,8 +194,8 @@ impl crate::framework::Example for Example {
             let proj = Mat4::perspective_rh(59.0_f32.to_radians(), 1.0, 0.001, 1000.0);
 
             Uniforms {
-                view_inverse: view.inverse().to_cols_array_2d(),
-                proj_inverse: proj.inverse().to_cols_array_2d(),
+                view_inverse: view.inverse(),
+                proj_inverse: proj.inverse(),
             }
         };