From c959ec486227a931098ff2b85da6aa2a41be3ded Mon Sep 17 00:00:00 2001 From: Benjamin Hansen Date: Sun, 15 Oct 2023 21:38:29 -0600 Subject: [PATCH] cleaning up --- code/beginner/tutorial1-window/Cargo.toml | 2 +- code/beginner/tutorial2-surface/Cargo.toml | 2 +- code/beginner/tutorial3-pipeline/Cargo.toml | 2 +- code/beginner/tutorial4-buffer/Cargo.toml | 2 +- code/beginner/tutorial5-textures/Cargo.toml | 2 +- code/beginner/tutorial6-uniforms/Cargo.toml | 2 +- code/beginner/tutorial7-instancing/Cargo.toml | 2 +- code/beginner/tutorial8-depth/Cargo.toml | 2 +- code/beginner/tutorial9-models/Cargo.toml | 2 +- code/intermediate/tutorial10-lighting/Cargo.toml | 2 +- code/intermediate/tutorial11-normals/Cargo.toml | 2 +- code/intermediate/tutorial12-camera/Cargo.toml | 2 +- code/intermediate/tutorial13-hdr/src/camera.rs | 11 ++--------- code/intermediate/tutorial13-hdr/src/hdr.wgsl | 2 -- code/intermediate/tutorial13-hdr/src/lib.rs | 5 +++-- code/intermediate/tutorial13-hdr/src/resources.rs | 4 ---- code/intermediate/tutorial13-hdr/src/shader.wgsl | 9 +++------ .../{tutorial13-terrain => wip-terrain}/Cargo.toml | 2 +- .../{tutorial13-terrain => wip-terrain}/build.rs | 0 .../{tutorial13-terrain => wip-terrain}/index.html | 0 .../res/cobble-diffuse.png | Bin .../res/cobble-normal.png | Bin .../res/cube-diffuse.jpg | Bin .../res/cube-normal.png | Bin .../res/cube.mtl | 0 .../res/cube.obj | 0 .../res/cube.zip | Bin .../res/slate2-tiled-bl4/About these PBR files.txt | 0 .../res/slate2-tiled-bl4/desktop.ini | 0 .../res/slate2-tiled-bl4/slate2-tiled-albedo2.png | Bin .../res/slate2-tiled-bl4/slate2-tiled-ao.png | Bin .../res/slate2-tiled-bl4/slate2-tiled-height.png | Bin .../res/slate2-tiled-bl4/slate2-tiled-metalness.png | Bin .../res/slate2-tiled-bl4/slate2-tiled-ogl.png | Bin .../res/slate2-tiled-bl4/slate2-tiled-rough.png | Bin .../src/bindgroups.rs | 0 .../src/camera.rs | 0 .../{tutorial13-terrain => wip-terrain}/src/lib.rs | 0 .../src/light.wgsl | 0 .../{tutorial13-terrain => wip-terrain}/src/main.rs | 0 .../src/model.rs | 0 .../src/resources.rs | 0 .../src/shader.wgsl | 0 .../src/terrain.rs | 0 .../src/terrain.wgsl | 0 .../src/texture.rs | 0 code/showcase/compute/Cargo.toml | 2 +- code/showcase/framework/Cargo.toml | 2 +- code/showcase/gifs/Cargo.toml | 2 +- code/showcase/imgui-demo/Cargo.toml | 2 +- code/showcase/mouse-picking/Cargo.toml | 2 +- code/showcase/pong/Cargo.toml | 2 +- code/showcase/threading/Cargo.toml | 2 +- code/showcase/windowless/Cargo.toml | 2 +- 54 files changed, 29 insertions(+), 44 deletions(-) rename code/intermediate/{tutorial13-terrain => wip-terrain}/Cargo.toml (94%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/build.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/index.html (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cobble-diffuse.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cobble-normal.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cube-diffuse.jpg (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cube-normal.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cube.mtl (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cube.obj (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/cube.zip (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/About these PBR files.txt (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/desktop.ini (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/slate2-tiled-albedo2.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/slate2-tiled-ao.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/slate2-tiled-height.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/slate2-tiled-metalness.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/slate2-tiled-ogl.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/res/slate2-tiled-bl4/slate2-tiled-rough.png (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/bindgroups.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/camera.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/lib.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/light.wgsl (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/main.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/model.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/resources.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/shader.wgsl (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/terrain.rs (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/terrain.wgsl (100%) rename code/intermediate/{tutorial13-terrain => wip-terrain}/src/texture.rs (100%) diff --git a/code/beginner/tutorial1-window/Cargo.toml b/code/beginner/tutorial1-window/Cargo.toml index f1b20d33..a9821b6b 100644 --- a/code/beginner/tutorial1-window/Cargo.toml +++ b/code/beginner/tutorial1-window/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial1-window" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial2-surface/Cargo.toml b/code/beginner/tutorial2-surface/Cargo.toml index 59dc58ec..21c9386f 100644 --- a/code/beginner/tutorial2-surface/Cargo.toml +++ b/code/beginner/tutorial2-surface/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial2-surface" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml index 387130ac..601a814c 100644 --- a/code/beginner/tutorial3-pipeline/Cargo.toml +++ b/code/beginner/tutorial3-pipeline/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial3-pipeline" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml index 8ee76869..8df23688 100644 --- a/code/beginner/tutorial4-buffer/Cargo.toml +++ b/code/beginner/tutorial4-buffer/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial4-buffer" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial5-textures/Cargo.toml b/code/beginner/tutorial5-textures/Cargo.toml index 1f690231..251eed69 100644 --- a/code/beginner/tutorial5-textures/Cargo.toml +++ b/code/beginner/tutorial5-textures/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial5-textures" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial6-uniforms/Cargo.toml b/code/beginner/tutorial6-uniforms/Cargo.toml index 95b629e6..a0a08653 100644 --- a/code/beginner/tutorial6-uniforms/Cargo.toml +++ b/code/beginner/tutorial6-uniforms/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial6-uniforms" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial7-instancing/Cargo.toml b/code/beginner/tutorial7-instancing/Cargo.toml index 6c5a4ab9..922dcbae 100644 --- a/code/beginner/tutorial7-instancing/Cargo.toml +++ b/code/beginner/tutorial7-instancing/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial7-instancing" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial8-depth/Cargo.toml b/code/beginner/tutorial8-depth/Cargo.toml index 2479a9f9..d153acf7 100644 --- a/code/beginner/tutorial8-depth/Cargo.toml +++ b/code/beginner/tutorial8-depth/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial8-depth" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml index 9079708e..882670a1 100644 --- a/code/beginner/tutorial9-models/Cargo.toml +++ b/code/beginner/tutorial9-models/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial9-models" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml index 7ca3b781..929ef949 100644 --- a/code/intermediate/tutorial10-lighting/Cargo.toml +++ b/code/intermediate/tutorial10-lighting/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial10-lighting" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml index baceecb5..3a4b1348 100644 --- a/code/intermediate/tutorial11-normals/Cargo.toml +++ b/code/intermediate/tutorial11-normals/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial11-normals" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml index 9b4cc358..8907b2b0 100644 --- a/code/intermediate/tutorial12-camera/Cargo.toml +++ b/code/intermediate/tutorial12-camera/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial12-camera" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/intermediate/tutorial13-hdr/src/camera.rs b/code/intermediate/tutorial13-hdr/src/camera.rs index 10ad9fe8..2b7532f5 100644 --- a/code/intermediate/tutorial13-hdr/src/camera.rs +++ b/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 = 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 { - /* OPENGL_TO_WGPU_MATRIX * */ perspective(self.fovy, self.aspect, self.znear, self.zfar) + // UDPATE + perspective(self.fovy, self.aspect, self.znear, self.zfar) } } diff --git a/code/intermediate/tutorial13-hdr/src/hdr.wgsl b/code/intermediate/tutorial13-hdr/src/hdr.wgsl index 12976d2d..c669e372 100644 --- a/code/intermediate/tutorial13-hdr/src/hdr.wgsl +++ b/code/intermediate/tutorial13-hdr/src/hdr.wgsl @@ -48,7 +48,5 @@ var hdr_sampler: sampler; fn fs_main(vs: VertexOutput) -> @location(0) vec4 { let hdr = textureSample(hdr_image, hdr_sampler, vs.uv); let sdr = aces_tone_map(hdr.rgb); - let size = vec2(textureDimensions(hdr_image)); return vec4(sdr, hdr.a); - // return hdr; } \ No newline at end of file diff --git a/code/intermediate/tutorial13-hdr/src/lib.rs b/code/intermediate/tutorial13-hdr/src/lib.rs index 2263fc19..a62f6163 100644 --- a/code/intermediate/tutorial13-hdr/src/lib.rs +++ b/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(); diff --git a/code/intermediate/tutorial13-hdr/src/resources.rs b/code/intermediate/tutorial13-hdr/src/resources.rs index ef15466c..ec64aed4 100644 --- a/code/intermediate/tutorial13-hdr/src/resources.rs +++ b/code/intermediate/tutorial13-hdr/src/resources.rs @@ -73,12 +73,10 @@ pub async fn load_model( queue: &wgpu::Queue, layout: &wgpu::BindGroupLayout, ) -> anyhow::Result { - 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?; diff --git a/code/intermediate/tutorial13-hdr/src/shader.wgsl b/code/intermediate/tutorial13-hdr/src/shader.wgsl index 1ee2d4d3..ec9d8c59 100644 --- a/code/intermediate/tutorial13-hdr/src/shader.wgsl +++ b/code/intermediate/tutorial13-hdr/src/shader.wgsl @@ -99,10 +99,6 @@ var env_sampler: sampler; fn fs_main(in: VertexOutput) -> @location(0) vec4 { let object_color: vec4 = textureSample(t_diffuse, s_diffuse, in.tex_coords); let object_normal: vec4 = 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 { // 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(result, object_color.a); } \ No newline at end of file diff --git a/code/intermediate/tutorial13-terrain/Cargo.toml b/code/intermediate/wip-terrain/Cargo.toml similarity index 94% rename from code/intermediate/tutorial13-terrain/Cargo.toml rename to code/intermediate/wip-terrain/Cargo.toml index a3d31961..7130d15e 100644 --- a/code/intermediate/tutorial13-terrain/Cargo.toml +++ b/code/intermediate/wip-terrain/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tutorial13-terrain" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/intermediate/tutorial13-terrain/build.rs b/code/intermediate/wip-terrain/build.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/build.rs rename to code/intermediate/wip-terrain/build.rs diff --git a/code/intermediate/tutorial13-terrain/index.html b/code/intermediate/wip-terrain/index.html similarity index 100% rename from code/intermediate/tutorial13-terrain/index.html rename to code/intermediate/wip-terrain/index.html diff --git a/code/intermediate/tutorial13-terrain/res/cobble-diffuse.png b/code/intermediate/wip-terrain/res/cobble-diffuse.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cobble-diffuse.png rename to code/intermediate/wip-terrain/res/cobble-diffuse.png diff --git a/code/intermediate/tutorial13-terrain/res/cobble-normal.png b/code/intermediate/wip-terrain/res/cobble-normal.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cobble-normal.png rename to code/intermediate/wip-terrain/res/cobble-normal.png diff --git a/code/intermediate/tutorial13-terrain/res/cube-diffuse.jpg b/code/intermediate/wip-terrain/res/cube-diffuse.jpg similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cube-diffuse.jpg rename to code/intermediate/wip-terrain/res/cube-diffuse.jpg diff --git a/code/intermediate/tutorial13-terrain/res/cube-normal.png b/code/intermediate/wip-terrain/res/cube-normal.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cube-normal.png rename to code/intermediate/wip-terrain/res/cube-normal.png diff --git a/code/intermediate/tutorial13-terrain/res/cube.mtl b/code/intermediate/wip-terrain/res/cube.mtl similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cube.mtl rename to code/intermediate/wip-terrain/res/cube.mtl diff --git a/code/intermediate/tutorial13-terrain/res/cube.obj b/code/intermediate/wip-terrain/res/cube.obj similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cube.obj rename to code/intermediate/wip-terrain/res/cube.obj diff --git a/code/intermediate/tutorial13-terrain/res/cube.zip b/code/intermediate/wip-terrain/res/cube.zip similarity index 100% rename from code/intermediate/tutorial13-terrain/res/cube.zip rename to code/intermediate/wip-terrain/res/cube.zip diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/About these PBR files.txt b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/About these PBR files.txt similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/About these PBR files.txt rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/About these PBR files.txt diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/desktop.ini b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/desktop.ini similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/desktop.ini rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/desktop.ini diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-albedo2.png b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-albedo2.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-albedo2.png rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-albedo2.png diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-ao.png b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-ao.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-ao.png rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-ao.png diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-height.png b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-height.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-height.png rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-height.png diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-metalness.png b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-metalness.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-metalness.png rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-metalness.png diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-ogl.png b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-ogl.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-ogl.png rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-ogl.png diff --git a/code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-rough.png b/code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-rough.png similarity index 100% rename from code/intermediate/tutorial13-terrain/res/slate2-tiled-bl4/slate2-tiled-rough.png rename to code/intermediate/wip-terrain/res/slate2-tiled-bl4/slate2-tiled-rough.png diff --git a/code/intermediate/tutorial13-terrain/src/bindgroups.rs b/code/intermediate/wip-terrain/src/bindgroups.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/bindgroups.rs rename to code/intermediate/wip-terrain/src/bindgroups.rs diff --git a/code/intermediate/tutorial13-terrain/src/camera.rs b/code/intermediate/wip-terrain/src/camera.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/camera.rs rename to code/intermediate/wip-terrain/src/camera.rs diff --git a/code/intermediate/tutorial13-terrain/src/lib.rs b/code/intermediate/wip-terrain/src/lib.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/lib.rs rename to code/intermediate/wip-terrain/src/lib.rs diff --git a/code/intermediate/tutorial13-terrain/src/light.wgsl b/code/intermediate/wip-terrain/src/light.wgsl similarity index 100% rename from code/intermediate/tutorial13-terrain/src/light.wgsl rename to code/intermediate/wip-terrain/src/light.wgsl diff --git a/code/intermediate/tutorial13-terrain/src/main.rs b/code/intermediate/wip-terrain/src/main.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/main.rs rename to code/intermediate/wip-terrain/src/main.rs diff --git a/code/intermediate/tutorial13-terrain/src/model.rs b/code/intermediate/wip-terrain/src/model.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/model.rs rename to code/intermediate/wip-terrain/src/model.rs diff --git a/code/intermediate/tutorial13-terrain/src/resources.rs b/code/intermediate/wip-terrain/src/resources.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/resources.rs rename to code/intermediate/wip-terrain/src/resources.rs diff --git a/code/intermediate/tutorial13-terrain/src/shader.wgsl b/code/intermediate/wip-terrain/src/shader.wgsl similarity index 100% rename from code/intermediate/tutorial13-terrain/src/shader.wgsl rename to code/intermediate/wip-terrain/src/shader.wgsl diff --git a/code/intermediate/tutorial13-terrain/src/terrain.rs b/code/intermediate/wip-terrain/src/terrain.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/terrain.rs rename to code/intermediate/wip-terrain/src/terrain.rs diff --git a/code/intermediate/tutorial13-terrain/src/terrain.wgsl b/code/intermediate/wip-terrain/src/terrain.wgsl similarity index 100% rename from code/intermediate/tutorial13-terrain/src/terrain.wgsl rename to code/intermediate/wip-terrain/src/terrain.wgsl diff --git a/code/intermediate/tutorial13-terrain/src/texture.rs b/code/intermediate/wip-terrain/src/texture.rs similarity index 100% rename from code/intermediate/tutorial13-terrain/src/texture.rs rename to code/intermediate/wip-terrain/src/texture.rs diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml index f1b0a961..4c97ad78 100644 --- a/code/showcase/compute/Cargo.toml +++ b/code/showcase/compute/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "compute" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [dependencies] diff --git a/code/showcase/framework/Cargo.toml b/code/showcase/framework/Cargo.toml index 083f65c5..f07e6e16 100644 --- a/code/showcase/framework/Cargo.toml +++ b/code/showcase/framework/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "framework" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [dependencies] diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml index a79ecb26..5cb80750 100644 --- a/code/showcase/gifs/Cargo.toml +++ b/code/showcase/gifs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "gifs" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" diff --git a/code/showcase/imgui-demo/Cargo.toml b/code/showcase/imgui-demo/Cargo.toml index d74d3693..36ff408a 100644 --- a/code/showcase/imgui-demo/Cargo.toml +++ b/code/showcase/imgui-demo/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "imgui-demo" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/code/showcase/mouse-picking/Cargo.toml b/code/showcase/mouse-picking/Cargo.toml index 0525a3cf..e07dd666 100644 --- a/code/showcase/mouse-picking/Cargo.toml +++ b/code/showcase/mouse-picking/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mouse-picking" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/showcase/pong/Cargo.toml b/code/showcase/pong/Cargo.toml index c06d122e..a79b3baa 100644 --- a/code/showcase/pong/Cargo.toml +++ b/code/showcase/pong/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pong" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/showcase/threading/Cargo.toml b/code/showcase/threading/Cargo.toml index f3b2517e..7bb50f19 100644 --- a/code/showcase/threading/Cargo.toml +++ b/code/showcase/threading/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "threading" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" [lib] diff --git a/code/showcase/windowless/Cargo.toml b/code/showcase/windowless/Cargo.toml index de320b50..5d0e6f9f 100644 --- a/code/showcase/windowless/Cargo.toml +++ b/code/showcase/windowless/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "windowless" version = "0.1.0" -authors = ["Ben Hansen "] +authors = ["Ben Hansen "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html