cleaning up

code/beginner/tutorial1-window/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial1-window"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial2-surface/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial2-surface"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial3-pipeline/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial3-pipeline"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial4-buffer/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial4-buffer"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial5-textures/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial5-textures"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial6-uniforms/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial6-uniforms"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial7-instancing/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial7-instancing"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial8-depth/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial8-depth"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/beginner/tutorial9-models/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial9-models"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/intermediate/tutorial10-lighting/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial10-lighting"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/intermediate/tutorial11-normals/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial11-normals"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/intermediate/tutorial12-camera/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial12-camera"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/intermediate/tutorial13-hdr/src/camera.rs

@@ -4,14 +4,6 @@ use std::time::Duration;
 use winit::dpi::PhysicalPosition;
 use winit::event::*;
 
-#[rustfmt::skip]
-pub const OPENGL_TO_WGPU_MATRIX: cgmath::Matrix4<f32> = cgmath::Matrix4::new(
-    1.0, 0.0, 0.0, 0.0,
-    0.0, 1.0, 0.0, 0.0,
-    0.0, 0.0, 0.5, 0.5,
-    0.0, 0.0, 0.0, 1.0,
-);
-
 const SAFE_FRAC_PI_2: f32 = FRAC_PI_2 - 0.0001;
 
 #[derive(Debug)]
@@ -68,7 +60,8 @@ impl Projection {
     }
 
     pub fn calc_matrix(&self) -> Matrix4<f32> {
-        /* OPENGL_TO_WGPU_MATRIX * */ perspective(self.fovy, self.aspect, self.znear, self.zfar)
+        // UDPATE
+        perspective(self.fovy, self.aspect, self.znear, self.zfar)
     }
 }
 

code/intermediate/tutorial13-hdr/src/hdr.wgsl

@@ -48,7 +48,5 @@ var hdr_sampler: sampler;
 fn fs_main(vs: VertexOutput) -> @location(0) vec4<f32> {
     let hdr = textureSample(hdr_image, hdr_sampler, vs.uv);
     let sdr = aces_tone_map(hdr.rgb);
-    let size = vec2<f32>(textureDimensions(hdr_image));
     return vec4(sdr, hdr.a);
-    // return hdr;
 }

code/intermediate/tutorial13-hdr/src/lib.rs

@@ -52,8 +52,9 @@ impl CameraUniform {
         self.view = view.into();
         self.view_proj = view_proj.into();
         self.inv_proj = proj.invert().unwrap().into();
-        self.inv_view = view.invert().unwrap().into();
         // self.inv_proj = proj.transpose().into();
+        // self.inv_view = view.invert().unwrap().into();
+        self.inv_view = view.transpose().into();
     }
 }
 
@@ -405,7 +406,7 @@ impl State {
         });
 
         let obj_model =
-            resources::load_model("cobble_sphere.obj", &device, &queue, &texture_bind_group_layout)
+            resources::load_model("cube.obj", &device, &queue, &texture_bind_group_layout)
                 .await
                 .unwrap();
 

code/intermediate/tutorial13-hdr/src/resources.rs

@@ -73,12 +73,10 @@ pub async fn load_model(
     queue: &wgpu::Queue,
     layout: &wgpu::BindGroupLayout,
 ) -> anyhow::Result<model::Model> {
-    println!("HERE++++++++++++++");
     let obj_text = load_string(file_name).await?;
     let obj_cursor = Cursor::new(obj_text);
     let mut obj_reader = BufReader::new(obj_cursor);
 
-    println!("HERE++++++++++++++");
     let (models, obj_materials) = tobj::load_obj_buf_async(
         &mut obj_reader,
         &tobj::LoadOptions {
@@ -87,7 +85,6 @@ pub async fn load_model(
             ..Default::default()
         },
         |p| async move {
-            println!("mat: {p}");
             let mat_text = load_string(&p).await.unwrap();
             tobj::load_mtl_buf(&mut BufReader::new(Cursor::new(mat_text)))
         },
@@ -96,7 +93,6 @@ pub async fn load_model(
 
     let mut materials = Vec::new();
     for m in obj_materials? {
-        println!("Loading textures");
         let diffuse_texture = load_texture(&m.diffuse_texture, false, device, queue).await?;
         let normal_texture = load_texture(&m.normal_texture, true, device, queue).await?;
 

code/intermediate/tutorial13-hdr/src/shader.wgsl

@@ -99,10 +99,6 @@ var env_sampler: sampler;
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     let object_color: vec4<f32> = textureSample(t_diffuse, s_diffuse, in.tex_coords);
     let object_normal: vec4<f32> = textureSample(t_normal, s_normal, in.tex_coords);
-    
-    // We don't need (or want) much ambient light, so 0.1 is fine
-    let ambient_strength = 0.1;
-    let ambient_color = light.color * ambient_strength;
 
     // NEW!
     // Adjust the tangent and bitangent using the Gramm-Schmidt process
@@ -134,9 +130,10 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     // NEW!
     // Calculate reflections
     let world_reflect = reflect(-view_dir, world_normal);
-    let env_ambient = textureSample(env_map, env_sampler, world_reflect).rgb;
+    let reflection = textureSample(env_map, env_sampler, world_reflect).rgb;
+    let shininess = 0.1;
 
-    let result = (env_ambient + diffuse_color + specular_color) * object_color.xyz;
+    let result = (diffuse_color + specular_color) * object_color.xyz + reflection * shininess;
 
     return vec4<f32>(result, object_color.a);
 }

code/intermediate/wip-terrain/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tutorial13-terrain"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/showcase/compute/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "compute"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [dependencies]

code/showcase/framework/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "framework"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [dependencies]

code/showcase/gifs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gifs"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 

code/showcase/imgui-demo/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "imgui-demo"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

code/showcase/mouse-picking/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mouse-picking"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/showcase/pong/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pong"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/showcase/threading/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "threading"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 [lib]

code/showcase/windowless/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "windowless"
 version = "0.1.0"
-authors = ["Ben Hansen <bhbenjaminhansen@gmail.com>"]
+authors = ["Ben Hansen <https://github.com/sotrh>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html