fixed tobj not building due to ahash

sotrh · Sep 14, 2024 · ad3d08b · ad3d08b
1 parent b31249b
commit ad3d08b
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ target/
 /image.png
 /output*.*
 output/
+debug-target.json
 
 /trace
 *trace.zip

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = "0.18"
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = "22.0"
 winit = { version = "0.29", features = ["rwh_05"] }
 

diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = "0.18"
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 

diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = "0.18"
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 

diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = "0.18"
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 instant = "0.1"

diff --git a/code/intermediate/tutorial13-hdr/Cargo.toml b/code/intermediate/tutorial13-hdr/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = "0.18"
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 instant = "0.1"

diff --git a/code/intermediate/wip-terrain/Cargo.toml b/code/intermediate/wip-terrain/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = { version = "0.18", features = [ "swizzle" ] }
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 instant = "0.1"

diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml
@@ -13,7 +13,7 @@ env_logger = "0.10"
 pollster = "0.3"
 image = "0.24.2"
 log = "0.4"
-tobj = "3.1"
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = "22.0"
 winit = { version = "0.29", features = ["rwh_05"] }
 gif = "0.11.4"

diff --git a/code/showcase/mouse-picking/Cargo.toml b/code/showcase/mouse-picking/Cargo.toml
@@ -15,7 +15,7 @@ cgmath = "0.18"
 env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 instant = "0.1"

diff --git a/code/showcase/threading/Cargo.toml b/code/showcase/threading/Cargo.toml
@@ -16,7 +16,7 @@ env_logger = "0.10"
 pollster = "0.3"
 log = "0.4"
 rayon = "1.4" # NEW!
-tobj = { version = "3.2", features = ["async"]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 wgpu = { version = "22.0"}
 winit = { version = "0.29", features = ["rwh_05"] }
 instant = "0.1"

diff --git a/docs/beginner/tutorial4-buffer/README.md b/docs/beginner/tutorial4-buffer/README.md
@@ -425,6 +425,7 @@ render_pass.draw_indexed(0..self.num_indices, 0, 0..1); // 2.
 ```
 
 A couple of things to note:
+
 1. The method name is `set_index_buffer`, not `set_index_buffers`. You can only have one index buffer set at a time.
 2. When using an index buffer, you need to use `draw_indexed`. The `draw` method ignores the index buffer. Also, make sure you use the number of indices (`num_indices`), not vertices, as your model will either draw wrong or the method will `panic` because there are not enough indices.
 

diff --git a/docs/beginner/tutorial9-models/README.md b/docs/beginner/tutorial9-models/README.md
@@ -233,9 +233,7 @@ We're going to use the [tobj](https://docs.rs/tobj/3.0/tobj/) library to load ou
 ```toml
 [dependencies]
 # other dependencies...
-tobj = { version = "3.2.1", features = [
-    "async",
-]}
+tobj = { version = "3.2", default-features = false, features = ["async"]}
 ```
 
 Before we can load our model, though, we need somewhere to put it.
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     A couple of things to note:
 . The method name is `set_index_buffer`, not `set_index_buffers`. You can only have one index buffer set at a time.
 . When using an index buffer, you need to use `draw_indexed`. The `draw` method ignores the index buffer. Also, make sure you use the number of indices (`num_indices`), not vertices, as your model will either draw wrong or the method will `panic` because there are not enough indices.
@@ Expand Down @@