debugging the normal mapping

4 years ago · a118435ba7
parent ec5339bd3b
commit a118435ba7
8 changed files with 149 additions and 89 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -538,7 +538,7 @@ dependencies = [
 "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro-hack 0.5.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro-nested 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -653,7 +653,7 @@ dependencies = [

 [[package]]
 name = "gfx-backend-vulkan"
-version = "0.5.2"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -817,10 +817,10 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.37"
+version = "0.3.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1134,7 +1134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "pin-utils"
-version = "0.1.0-alpha.4"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1513,8 +1513,8 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1801,16 +1801,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.60"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.60"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1819,33 +1819,33 @@ dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.60"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.60"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.60"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1912,14 +1912,14 @@ dependencies = [
 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wgpu-core 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wgpu-core 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "wgpu-native 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "wgpu-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wgpu-core"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1930,7 +1930,7 @@ dependencies = [
 "gfx-backend-dx12 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx-backend-empty 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx-backend-metal 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-backend-vulkan 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gfx-backend-vulkan 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx-descriptor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx-memory 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1953,7 +1953,7 @@ dependencies = [
 "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "wgpu-core 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wgpu-core 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "wgpu-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -2196,7 +2196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gfx-backend-dx12 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0e526746379e974501551b08958947e67a81b5ea8cdc717a000cdd72577da05"
 "checksum gfx-backend-empty 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b67bd2d7bc022b257ddbdabc5fa3b10c29c292372c3409f2b6a6e3f4e11cdb85"
 "checksum gfx-backend-metal 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cfe128c29675b5afc8acdda1dfe096d6abd5e3528059ab0b98bda8215d8beed9"
-"checksum gfx-backend-vulkan 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd1dee09bd8d8f1ba52c5ba22d1f70c7ffa990c5eb245eb3ef2d0206f631673"
+"checksum gfx-backend-vulkan 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45ff36feae801fa23d29acd74082603a0145a697a23595757dd4e78828ab33da"
 "checksum gfx-descriptor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1bf35f5d66d1bc56e63e68d7528441453f25992bd954b84309d23c659df2c5da"
 "checksum gfx-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc96180204064c9493e0fe4a9efeb721e0ac59fe8e1906d0c659142a93114fb1"
 "checksum gfx-memory 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c2eed6cda674d9cd4d92229102dbd544292124533d236904f987e9afab456137"
@ -2210,7 +2210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6c346c299e3fe8ef94dc10c2c0253d858a69aac1245157a3bf4125915d528caf"
 "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 "checksum jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451"
-"checksum js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055"
+"checksum js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
@ -2246,7 +2246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum peek-poke 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d93fd6a575ebf1ac2668d08443c97a22872cfb463fd8b7ddd141e9f6be59af2f"
 "checksum peek-poke-derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6fb44a25c5bba983be0fc8592dfaf3e6d0935ce8be0c6b15b2a39507af34a926"
 "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
+"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 "checksum png 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
 "checksum png 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2c68a431ed29933a4eb5709aca9800989758c97759345860fa5db3cfced0b65d"
@ -2310,18 +2310,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-"checksum wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f"
-"checksum wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd"
-"checksum wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4"
-"checksum wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931"
-"checksum wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639"
+"checksum wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"
+"checksum wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45"
+"checksum wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
+"checksum wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
+"checksum wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601"
 "checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
 "checksum wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
 "checksum wayland-protocols 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
 "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
 "checksum wgpu 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf715eb8571da470b856ecc67b057221360d9fce16f3e38001b2fb158d04012"
-"checksum wgpu-core 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1c252c2442d874c794813ae037fd6cbeaa4a6d8035980e1179f2286ec0d179a6"
+"checksum wgpu-core 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "50212a35d2c20de1c421d9a0d831f494a85f9afab240e19aae499cff9d0526f2"
 "checksum wgpu-native 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "19a5051a357d071fd69c24671e0ea6d644a83c7418e47eac3511427379007403"
 "checksum wgpu-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67b69dfe001a8a6b78810c7e479717cd1898b9177dbf646611fa1f258f5a2512"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
--- a/code/intermediate/tutorial11-normals/src/light.vert
+++ b/code/intermediate/tutorial11-normals/src/light.vert
@ -6,6 +6,7 @@ layout(location=0) out vec4 v_color;

 layout(set=0, binding=0)
 uniform Uniforms {
+    vec3 u_view_position;
    mat4 u_view;
    mat4 u_proj;
 };
--- a/code/intermediate/tutorial11-normals/src/main.rs
+++ b/code/intermediate/tutorial11-normals/src/main.rs
@ -18,7 +18,7 @@ pub const OPENGL_TO_WGPU_MATRIX: cgmath::Matrix4<f32> = cgmath::Matrix4::new(
    0.0, 0.0, 0.5, 1.0,
 );

-const NUM_INSTANCES_PER_ROW: u32 = 10;
+const NUM_INSTANCES_PER_ROW: u32 = 1;

 struct Camera {
    eye: cgmath::Point3<f32>,
@ -42,7 +42,7 @@ impl Camera {
 #[repr(C)]
 #[derive(Copy, Clone)]
 struct Uniforms {
-    // view_position: cgmath::Vector4<f32>,
+    view_position: cgmath::Vector4<f32>,
    view: cgmath::Matrix4<f32>,
    proj: cgmath::Matrix4<f32>,
 }
@ -50,7 +50,7 @@ struct Uniforms {
 impl Uniforms {
    fn new() -> Self {
        Self {
-            // view_position: Zero::zero(),
+            view_position: Zero::zero(),
            view: cgmath::Matrix4::identity(),
            proj: cgmath::Matrix4::identity(),
            // view_3x3: cgmath::Matrix3::identity(),
@ -58,7 +58,7 @@ impl Uniforms {
    }

    fn update_view_proj(&mut self, camera: &Camera) {
-        // self.view_position = camera.eye.to_homogeneous();
+        self.view_position = camera.eye.to_homogeneous();

        let matrices = camera.build_matrices();
        self.view = matrices.0;
@ -213,6 +213,7 @@ struct State {
    light_buffer: wgpu::Buffer,
    light_bind_group: wgpu::BindGroup,
    light_render_pipeline: wgpu::RenderPipeline,
+    debug_material: model::Material,
 }

 fn create_render_pipeline(
@ -523,6 +524,20 @@ impl State {
            )
        };

+        let debug_material = {
+            let diffuse_bytes = include_bytes!("res/alt-diffuse.png");
+            let normal_bytes = include_bytes!("res/alt-normal.jpg");
+
+            let mut command_buffers = vec![];
+            let (diffuse_texture, cmds) = texture::Texture::from_bytes(&device, diffuse_bytes, "res/alt-diffuse.png").unwrap();
+            command_buffers.push(cmds);
+            let (normal_texture, cmds) = texture::Texture::from_bytes(&device, normal_bytes, "res/alt-normal.png").unwrap();
+            command_buffers.push(cmds);
+            queue.submit(&command_buffers);
+            
+            model::Material::new(&device, "alt-material", diffuse_texture, normal_texture, &texture_bind_group_layout)
+        };
+
        Self {
            surface,
            device,
@ -544,6 +559,7 @@ impl State {
            light_buffer,
            light_bind_group,
            light_render_pipeline,
+            debug_material,
        }

    }
@ -555,7 +571,6 @@ impl State {
        self.sc_desc.width = new_size.width;
        self.sc_desc.height = new_size.height;
        self.swap_chain = self.device.create_swap_chain(&self.surface, &self.sc_desc);
-
    }

    fn input(&mut self, event: &WindowEvent) -> bool {
@ -649,6 +664,13 @@ impl State {
                &self.uniform_bind_group,
                &self.light_bind_group,
            );
+            // render_pass.draw_model_instanced_with_material(
+            //     &self.obj_model,
+            //     &self.debug_material,
+            //     0..self.instances.len() as u32,
+            //     &self.uniform_bind_group,
+            //     &self.light_bind_group,
+            // );
        }
        self.queue.submit(&[encoder.finish()]);
    }
--- a/code/intermediate/tutorial11-normals/src/model.rs
+++ b/code/intermediate/tutorial11-normals/src/model.rs
@ -65,6 +65,46 @@ pub struct Material {
    pub bind_group: wgpu::BindGroup,
 }

+impl Material {
+    pub fn new(
+        device: &wgpu::Device, 
+        name: &str, 
+        diffuse_texture: texture::Texture, 
+        normal_texture: texture::Texture,
+        layout: &wgpu::BindGroupLayout,
+    ) -> Self {
+        let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+            layout,
+            bindings: &[
+                wgpu::Binding {
+                    binding: 0,
+                    resource: wgpu::BindingResource::TextureView(&diffuse_texture.view),
+                },
+                wgpu::Binding {
+                    binding: 1,
+                    resource: wgpu::BindingResource::Sampler(&diffuse_texture.sampler),
+                },
+                wgpu::Binding {
+                    binding: 2,
+                    resource: wgpu::BindingResource::TextureView(&normal_texture.view),
+                },
+                wgpu::Binding {
+                    binding: 3,
+                    resource: wgpu::BindingResource::Sampler(&normal_texture.sampler),
+                },
+            ],
+            label: Some(name),
+        });
+
+        Self { 
+            name: String::from(name),
+            diffuse_texture,
+            normal_texture,
+            bind_group,
+        }
+    }
+}
+
 pub struct Mesh {
    pub name: String,
    pub vertex_buffer: wgpu::Buffer,
@ -105,35 +145,13 @@ impl Model {
            let (normal_texture, cmds) = texture::Texture::load(device, containing_folder.join(normal_path?))?;
            command_buffers.push(cmds);

-            let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
-                layout,
-                bindings: &[
-                    wgpu::Binding {
-                        binding: 0,
-                        resource: wgpu::BindingResource::TextureView(&diffuse_texture.view),
-                    },
-                    wgpu::Binding {
-                        binding: 1,
-                        resource: wgpu::BindingResource::Sampler(&diffuse_texture.sampler),
-                    },
-                    wgpu::Binding {
-                        binding: 2,
-                        resource: wgpu::BindingResource::TextureView(&normal_texture.view),
-                    },
-                    wgpu::Binding {
-                        binding: 3,
-                        resource: wgpu::BindingResource::Sampler(&normal_texture.sampler),
-                    },
-                ],
-                label: None,
-            });
-
-            materials.push(Material {
-                name: mat.name,
+            materials.push(Material::new(
+                device,
+                &mat.name,
                diffuse_texture,
                normal_texture,
-                bind_group,
-            });
+                layout,
+            ));
        }

        let mut meshes = Vec::new();
@ -262,6 +280,14 @@ where
        uniforms: &'b wgpu::BindGroup,
        light: &'b wgpu::BindGroup,
    );
+    fn draw_model_instanced_with_material(
+        &mut self,
+        model: &'b Model,
+        material: &'b Material,
+        instances: Range<u32>,
+        uniforms: &'b wgpu::BindGroup,
+        light: &'b wgpu::BindGroup,
+    );
 }

 impl<'a, 'b> DrawModel<'a, 'b> for wgpu::RenderPass<'a>
@ -315,6 +341,19 @@ where
            self.draw_mesh_instanced(mesh, material, instances.clone(), uniforms, light);
        }
    }
+
+    fn draw_model_instanced_with_material(
+        &mut self,
+        model: &'b Model,
+        material: &'b Material,
+        instances: Range<u32>,
+        uniforms: &'b wgpu::BindGroup,
+        light: &'b wgpu::BindGroup,
+    ) {
+        for mesh in &model.meshes {
+            self.draw_mesh_instanced(mesh, material, instances.clone(), uniforms, light);
+        }
+    }
 }

 pub trait DrawLight<'a, 'b>
--- a/code/intermediate/tutorial11-normals/src/res/alt-diffuse.png
+++ b/code/intermediate/tutorial11-normals/src/res/alt-diffuse.png
--- a/code/intermediate/tutorial11-normals/src/res/alt-normal.jpg
+++ b/code/intermediate/tutorial11-normals/src/res/alt-normal.jpg
--- a/code/intermediate/tutorial11-normals/src/shader.frag
+++ b/code/intermediate/tutorial11-normals/src/shader.frag
@ -2,8 +2,9 @@

 layout(location=0) in vec2 v_tex_coords;
 layout(location=1) in vec3 v_normal;
-layout(location=2) in vec3 v_position_model_tangent_space;
-layout(location=3) in vec3 v_light_position_tangent_space;
+layout(location=2) in vec3 v_position;
+layout(location=3) in vec3 v_light_position;
+layout(location=4) in vec3 v_view_position;

 layout(location=0) out vec4 f_color;

@ -12,12 +13,6 @@ layout(set = 0, binding = 1) uniform sampler s_diffuse;
 layout(set = 0, binding = 2) uniform texture2D t_normal;
 layout(set = 0, binding = 3) uniform sampler s_normal;

-layout(set=1, binding=0) 
-uniform Uniforms {
-    vec3 u_view_position;
-    mat4 u_view_proj; // unused
-};
-
 layout(set = 2, binding = 0) uniform Light {
    vec3 light_position;
    vec3 light_color;
@ -30,19 +25,16 @@ void main() {
    float ambient_strength = 0.01;
    vec3 ambient_color = light_color * ambient_strength;

-    // We're storing our normal map as Rgba8UnormSrgb, if we were
-    // using Rgba8Unorm or another format without Srgb, then we wouldn't
-    // be able to use the normal data directly, and we would have to
+    // We can't use the normal data directly, and we have to
    // transform it for the range [0, 1] to  [-1, 1].
-    vec3 normal = normalize(object_normal.rgb * 2.0 - vec3(1.0));
-    // vec3 normal = normalize(object_normal.rgb);
+    vec3 normal = normalize(object_normal.rgb * 2.0 - 1.0);

-    vec3 light_dir = normalize(v_light_position_tangent_space - v_position_model_tangent_space);
+    vec3 light_dir = normalize(v_light_position - v_position);
    
    float diffuse_strength = max(dot(normal, light_dir), 0.0);
    vec3 diffuse_color = light_color * diffuse_strength;

-    vec3 view_dir = normalize(-v_position_model_tangent_space);
+    vec3 view_dir = normalize(v_view_position - v_position);
    vec3 half_dir = normalize(view_dir + light_dir);
    float specular_strength = pow(max(dot(normal, half_dir), 0.0), 32);
    vec3 specular_color = specular_strength * light_color;
--- a/code/intermediate/tutorial11-normals/src/shader.vert
+++ b/code/intermediate/tutorial11-normals/src/shader.vert
@ -10,9 +10,11 @@ layout(location=0) out vec2 v_tex_coords;
 layout(location=1) out vec3 v_normal;
 layout(location=2) out vec3 v_position_model_tangent_space;
 layout(location=3) out vec3 v_light_position_tangent_space;
+layout(location=4) out vec3 v_view_position_tangent_space;

 layout(set=1, binding=0) 
 uniform Uniforms {
+    vec3 u_view_position;
    mat4 u_view;
    mat4 u_proj;
 };
@ -34,21 +36,25 @@ void main() {
    mat4 model_matrix = s_models[gl_InstanceIndex];
    mat4 model_view_matrix = u_view * model_matrix;

-    vec4 light_position_view_space = u_view * vec4(light_position, 1.0);
-    vec4 position_model_view_space = model_view_matrix * vec4(a_position, 1.0);
+    // vec4 light_position_view_space = u_view * vec4(light_position, 1.0);
+    // vec4 position_model_view_space = model_view_matrix * vec4(a_position, 1.0);
+    vec4 position_world_space = model_matrix * vec4(a_position, 1.0);
+
+    mat3 normal_matrix = transpose(inverse(mat3(model_matrix)));
+    vec3 normal = normal_matrix * normalize(a_normal);
+    vec3 tangent = normal_matrix * normalize(a_tangent);
+    vec3 bitangent = normal_matrix * normalize(a_bitangent);

-    mat3 MV3x3 = mat3(model_view_matrix);
-    vec3 normal_view_space = MV3x3 * normalize(a_normal);
-    vec3 tangent_view_space = MV3x3 * normalize(a_tangent);
-    vec3 bitangent_view_space = MV3x3 * normalize(a_bitangent);
    mat3 TBN = transpose(mat3(
-        tangent_view_space,
-        bitangent_view_space,
-        normal_view_space
+        tangent,
+        bitangent,
+        normal
    ));

-    gl_Position = u_proj * position_model_view_space;
+    // Transform the lighting values
+    v_light_position_tangent_space = TBN * light_position;
+    v_position_model_tangent_space = TBN * position_world_space.xyz;
+    v_view_position_tangent_space = TBN * u_view_position;

-    v_light_position_tangent_space = TBN * light_position_view_space.xyz;
-    v_position_model_tangent_space = TBN * position_model_view_space.xyz;
+    gl_Position = u_proj * u_view * position_world_space;
 }