Merge pull request #4 from webgpu/main

Merge main into my fork.
webgpu · Nov 15, 2023 · ff38128 · ff38128
2 parents 415bd67 + f742f58
commit ff38128
Show file tree

Hide file tree

Showing 16 changed files with 395 additions and 556 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@types/stats.js": "^0.17.0",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.41.0",
-    "@webgpu/types": "^0.1.21",
+    "@webgpu/types": "^0.1.38",
     "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/public/assets/img/brickwall_diffuse.png → public/assets/img/brickwall_albedo.png b/public/assets/img/brickwall_diffuse.png → public/assets/img/brickwall_albedo.png
diff --git a/public/assets/img/toybox_height.png b/public/assets/img/toybox_height.png
diff --git a/public/assets/img/toybox_normal.png b/public/assets/img/toybox_normal.png
diff --git a/public/assets/img/wood_diffuse.png → public/assets/img/wood_albedo.png b/public/assets/img/wood_diffuse.png → public/assets/img/wood_albedo.png
diff --git a/public/img/brickwall_diffuse.png → public/img/brickwall_albedo.png b/public/img/brickwall_diffuse.png → public/img/brickwall_albedo.png
diff --git a/public/img/toybox_height.png b/public/img/toybox_height.png
diff --git a/public/img/toybox_normal.png b/public/img/toybox_normal.png
diff --git a/public/img/wood_diffuse.png → public/img/wood_albedo.png b/public/img/wood_diffuse.png → public/img/wood_albedo.png