adds cgmath

Author: matthew-russo

src/bin/29_multisampling.rs

@@ -4,6 +4,7 @@ extern crate vulkano_win;
 extern crate winit;
 extern crate image;
 extern crate tobj;
+extern crate cgmath;
 
 use std::sync::{Arc, Mutex};
 use std::collections::HashSet;
@@ -86,8 +87,17 @@ use vulkano::sampler::{
     Sampler,
     Filter,
 };
+
 use image::GenericImageView;
 
+use cgmath::{
+    Rad,
+    Deg,
+    Matrix4,
+    Vector3,
+    Point3
+};
+
 const WIDTH: u32 = 800;
 const HEIGHT: u32 = 600;
 
@@ -141,9 +151,9 @@ impl_vertex!(Vertex, pos, color, tex);
 #[allow(dead_code)]
 #[derive(Copy, Clone)]
 struct UniformBufferObject {
-    model: glm::Mat4,
-    view: glm::Mat4,
-    proj: glm::Mat4,
+    model: Matrix4<f32>,
+    view: Matrix4<f32>,
+    proj: Matrix4<f32>,
 }
 
 type DescriptorSetUBO = PersistentDescriptorSetBuf<Arc<CpuAccessibleBuffer<UniformBufferObject>>>;
@@ -946,28 +956,22 @@ impl HelloTriangleApplication {
         let duration = Instant::now().duration_since(start_time);
         let elapsed = (duration.as_secs() * 1000) + u64::from(duration.subsec_millis());
 
-        let identity_matrix = glm::mat4(
-            1.0, 0.0, 0.0, 0.0,
-            0.0, 1.0, 0.0, 0.0,
-            0.0, 0.0, 1.0, 0.0,
-            0.0, 0.0, 0.0, 1.0,
-        );
-
-        let model = glm::ext::rotate(&identity_matrix, (elapsed as f32) * glm::radians(0.180), glm::vec3(0.0, 0.0, 1.00));
+        let model = Matrix4::from_angle_z(Rad::from(Deg(elapsed as f32 * 0.180)));
 
-        let view = glm::ext::look_at(
-            glm::vec3(2.0, 2.0, 2.0),
-            glm::vec3(0.0, 0.0, 0.0),
-            glm::vec3(0.0, 0.0, 1.0)
+        let view = Matrix4::look_at(
+            Point3::new(2.0, 2.0, 2.0),
+            Point3::new(0.0, 0.0, 0.0),
+            Vector3::new(0.0, 0.0, 1.0)
         );
-        let mut proj = glm::ext::perspective(
-            glm::radians(45.0,),
+
+        let mut proj = cgmath::perspective(
+            Rad::from(Deg(45.0)),
             dimensions[0] as f32 / dimensions[1] as f32,
             0.1,
             10.0
         );
 
-        proj.c1.y *= -1.0;
+        proj.y.y *= -1.0;
 
         UniformBufferObject { model, view, proj }
     }

src/bin/29_multisampling.rs.diff

@@ -1,23 +1,23 @@
 --- a/28_generating_mipmaps.rs
 +++ b/29_multisampling.rs
-@@ -85,8 +85,6 @@ use vulkano::descriptor::descriptor_set::{
+@@ -86,8 +86,6 @@ use vulkano::descriptor::descriptor_set::{
  use vulkano::sampler::{
      Sampler,
      Filter,
 -    MipmapMode,
 -    SamplerAddressMode,
  };
- use image::GenericImageView;
 
-@@ -183,6 +181,7 @@ struct HelloTriangleApplication {
+ use image::GenericImageView;
+@@ -193,6 +191,7 @@ struct HelloTriangleApplication {
      command_buffers: Vec<Arc<AutoCommandBuffer>>,
 
      depth_format: Format,
 +    sample_count: u32,
 
      previous_frame_end: Option<Box<GpuFuture>>,
      recreate_swap_chain: bool,
-@@ -203,14 +202,16 @@ impl HelloTriangleApplication {
+@@ -213,14 +212,16 @@ impl HelloTriangleApplication {
          let (swap_chain, swap_chain_images) = Self::create_swap_chain(&instance, &surface, physical_device_index,
              &device, &graphics_queue, &present_queue, None);
 
@@ -37,15 +37,15 @@
 
          let start_time = Instant::now();
 
-@@ -258,6 +259,7 @@ impl HelloTriangleApplication {
+@@ -268,6 +269,7 @@ impl HelloTriangleApplication {
              command_buffers: vec![],
 
              depth_format,
 +            sample_count,
 
              previous_frame_end,
              recreate_swap_chain: false,
-@@ -444,42 +446,61 @@ impl HelloTriangleApplication {
+@@ -454,42 +456,61 @@ impl HelloTriangleApplication {
          (swap_chain, images)
      }
 
@@ -118,7 +118,7 @@
              }
          ).unwrap())
      }
-@@ -538,15 +559,21 @@ impl HelloTriangleApplication {
+@@ -548,15 +569,21 @@ impl HelloTriangleApplication {
      }
 
      fn create_framebuffers(
@@ -142,7 +142,7 @@
                      .build().unwrap());
                  fba
              }
-@@ -642,25 +669,7 @@ impl HelloTriangleApplication {
+@@ -652,25 +679,7 @@ impl HelloTriangleApplication {
      }
 
      fn create_image_sampler(device: &Arc<Device>) -> Arc<Sampler> {
@@ -169,7 +169,7 @@
      }
 
      fn load_model() -> (Vec<Vertex>, Vec<u32>) {
-@@ -789,7 +798,7 @@ impl HelloTriangleApplication {
+@@ -799,7 +808,7 @@ impl HelloTriangleApplication {
                      .unwrap()
                      .update_buffer(self.uniform_buffers[i].clone(), Self::update_uniform_buffer(self.start_time, dimensions))
                      .unwrap()
@@ -178,7 +178,7 @@
                      .unwrap()
                      .draw_indexed(
                          self.graphics_pipeline.clone(),
-@@ -967,16 +976,16 @@ impl HelloTriangleApplication {
+@@ -971,16 +980,16 @@ impl HelloTriangleApplication {
          let (swap_chain, images) = Self::create_swap_chain(&self.instance, &self.surface, self.physical_device_index,
              &self.device, &self.graphics_queue, &self.present_queue, Some(self.swap_chain.clone()));