adds cgmath

Author: Matthew Russo

src/bin/28_generating_mipmaps.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;
@@ -88,8 +89,17 @@ use vulkano::sampler::{
     MipmapMode,
     SamplerAddressMode,
 };
+
 use image::GenericImageView;
 
+use cgmath::{
+    Rad,
+    Deg,
+    Matrix4,
+    Vector3,
+    Point3
+};
+
 const WIDTH: u32 = 800;
 const HEIGHT: u32 = 600;
 
@@ -143,9 +153,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>>>;
@@ -937,28 +947,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/28_generating_mipmaps.rs.diff

@@ -1,6 +1,6 @@
 --- a/27_model_loading.rs
 +++ b/28_generating_mipmaps.rs
-@@ -36,12 +36,20 @@ use vulkano::swapchain::{
+@@ -37,12 +37,20 @@ use vulkano::swapchain::{
  use vulkano::format::{Format, ClearValue};
  use vulkano::image::{
      ImageUsage,
@@ -24,29 +24,31 @@
  use vulkano::pipeline::{
      GraphicsPipeline,
      GraphicsPipelineAbstract,
-@@ -58,6 +66,7 @@ use vulkano::command_buffer::{
+@@ -59,6 +67,7 @@ use vulkano::command_buffer::{
      AutoCommandBuffer,
      AutoCommandBufferBuilder,
      DynamicState,
 +    CommandBuffer,
  };
  use vulkano::buffer::{
      immutable::ImmutableBuffer,
-@@ -73,7 +82,12 @@ use vulkano::descriptor::descriptor_set::{
+@@ -74,9 +83,14 @@ use vulkano::descriptor::descriptor_set::{
      PersistentDescriptorSetImg,
      PersistentDescriptorSetSampler,
  };
--use vulkano::sampler::Sampler;
 +use vulkano::sampler::{
 +    Sampler,
 +    Filter,
 +    MipmapMode,
 +    SamplerAddressMode,
 +};
+ 
  use image::GenericImageView;
+-use vulkano::sampler::Sampler;
 
- const WIDTH: u32 = 800;
-@@ -539,28 +553,108 @@ impl HelloTriangleApplication {
+ use cgmath::{
+     Rad,
+@@ -549,28 +563,114 @@ impl HelloTriangleApplication {
          ).collect::<Vec<_>>()
      }
 
@@ -149,19 +151,25 @@
 
      fn create_image_sampler(device: &Arc<Device>) -> Arc<Sampler> {
 -        Sampler::simple_repeat_linear(device.clone())
++        // This is the standard sampler but for this section we are using a custom sampler to show the work we have done
 +        // Sampler::simple_repeat_linear(device.clone())
-+        Sampler::new(device.clone(),
-+                     Filter::Linear,
-+                     Filter::Linear,
-+                     MipmapMode::Linear,
-+                     SamplerAddressMode::Repeat,
-+                     SamplerAddressMode::Repeat,
-+                     SamplerAddressMode::Repeat,
-+                     0.0,
-+                     1.0,
-+                     6.0,
-+                     1_000.0)
-+            .unwrap()
++
++        let min_lod = 6.0;
++        // This custom sampler used a min_lod of 6 to display the work we have done in this section
++        //      changing the above variable will change which mipmap is used.
++        Sampler::new(
++            device.clone(),
++            Filter::Linear,
++            Filter::Linear,
++            MipmapMode::Linear,
++            SamplerAddressMode::Repeat,
++            SamplerAddressMode::Repeat,
++            SamplerAddressMode::Repeat,
++            0.0,
++            1.0,
++            min_lod,
++            1_000.0
++        ).unwrap()
      }
 
      fn load_model() -> (Vec<Vertex>, Vec<u32>) {