让 hdr 章节支持 wasm 环境运行

jinleili · Jan 1, 2024 · 7784c15 · 7784c15
1 parent 53f961f
commit 7784c15
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/code/intermediate/hdr/res/cube.mtl b/code/intermediate/hdr/res/cube.mtl
@@ -0,0 +1,14 @@
+# Blender MTL File: 'cube.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 323.999994
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Bump cube-normal.png
+map_Kd cube-diffuse.jpg
diff --git a/code/intermediate/hdr/src/main.rs b/code/intermediate/hdr/src/main.rs
@@ -348,7 +348,6 @@ impl State {
             label: Some("camera_bind_group"),
         });
 
-        // 在异步运行时环境中运行异步任务
         let obj_model =
             resources::load_model("cube.obj", &device, &queue, &texture_bind_group_layout)
                 .await

diff --git a/docs/.vitepress/components/WasmExample.vue b/docs/.vitepress/components/WasmExample.vue
@@ -6,8 +6,8 @@
     <div class="loading" v-if="loading">
       正在加载 WASM 模块 ...
     </div>
-    <button v-if="!exampleStarted" @click="loadExample()" :disabled="loading">点击运行
-      {{ exampleName }}</button>
+    <button v-if="!exampleStarted" @click="loadExample()" :disabled="loading">点此运行
+      {{ exampleName }} 示例</button>
   </div>
 </template>
 

diff --git a/docs/intermediate/hdr/index.md b/docs/intermediate/hdr/index.md
@@ -1182,16 +1182,6 @@ A little note on the reflection math. The `view_dir` gives us the direction to t
 
 ## 示例
 
-<div class="warn">
-
-此示例目前还只能在本地运行，浏览器端加载 hdr 资源时会报错：
-
-```sh
- Format error decoding Hdr: Radiance HDR signature not found
-```
-
-</div>
-
 <WasmExample example="hdr"></WasmExample>
 
 <AutoGithubLink/>
diff --git a/docs/public/pure-sky.hdr b/docs/public/pure-sky.hdr
diff --git a/run-wasm/src/main.rs b/run-wasm/src/main.rs
@@ -36,6 +36,11 @@ fn main() {
                     res_dir = res_dir.join("beginner/tutorial9-models/res");
                     is_need_copy = true;
                 }
+                Some("hdr") => {
+                    out_dir = out_dir.join("hdr");
+                    res_dir = res_dir.join("intermediate/hdr/res");
+                    is_need_copy = true;
+                }
                 _ => {}
             }