From fd49fdd857e94077f2971d6502636183cd90097f Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 17 May 2024 20:06:56 -0400 Subject: [PATCH] Update examples (#947) * Update three.js * Add examples * Update patch * Delete examples --- examples-testing/changes.patch | 36 ++++++++++++++++++++++++++++++++++ three.js | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index 3a031ff14..747bddea4 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -13622,6 +13622,42 @@ index e8de51c0..1db14de9 100644 init(); +diff --git a/examples-testing/examples/webgpu_materials_displacementmap.ts b/examples-testing/examples/webgpu_materials_displacementmap.ts +index 5c7287ff..da3d0831 100644 +--- a/examples-testing/examples/webgpu_materials_displacementmap.ts ++++ b/examples-testing/examples/webgpu_materials_displacementmap.ts +@@ -10,8 +10,8 @@ import { OBJLoader } from 'three/addons/loaders/OBJLoader.js'; + + import { MeshStandardNodeMaterial } from 'three/nodes'; + +-let stats; +-let camera, scene, renderer, controls; ++let stats: Stats; ++let camera: THREE.OrthographicCamera, scene: THREE.Scene, renderer: WebGPURenderer, controls: OrbitControls; + + const settings = { + metalness: 1.0, +@@ -23,9 +23,9 @@ const settings = { + normalScale: 1.0, + }; + +-let mesh, material; ++let mesh: THREE.Mesh, material: MeshStandardNodeMaterial; + +-let pointLight, ambientLight; ++let pointLight: THREE.PointLight, ambientLight: THREE.AmbientLight; + + const height = 500; // of camera frustum + +@@ -177,7 +177,7 @@ function init() { + + const loader = new OBJLoader(); + loader.load('models/obj/ninja/ninjaHead_Low.obj', function (group) { +- const geometry = group.children[0].geometry; ++ const geometry = (group.children[0] as THREE.Mesh).geometry; + geometry.center(); + + mesh = new THREE.Mesh(geometry, material); diff --git a/examples-testing/examples/webgpu_materials_lightmap.ts b/examples-testing/examples/webgpu_materials_lightmap.ts index 99b484c4..9eb3c67b 100644 --- a/examples-testing/examples/webgpu_materials_lightmap.ts diff --git a/three.js b/three.js index 61444937d..32d19ebee 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 61444937d1f0f4da72ca630749bc6b02fc22d4a1 +Subproject commit 32d19ebeef7a5a3b7a86a4865df3f883c050e88f