From a7787251e7632161a9e70f5d66753b6befe8ee90 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 30 Aug 2024 08:22:11 -0400 Subject: [PATCH] Update three.js for testing (#1220) * Update three.js * Add examples * Update patch and delete examples --- examples-testing/changes.patch | 20 ++++++++++---------- three.js | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index b9eabbd91..c4e9f91b9 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -15267,10 +15267,10 @@ index 097d06af..3836e7ee 100644 init(); -diff --git a/examples-testing/examples/webgpu_texture2darray_compressed.ts b/examples-testing/examples/webgpu_texture2darray_compressed.ts +diff --git a/examples-testing/examples/webgpu_textures_2d-array_compressed.ts b/examples-testing/examples/webgpu_textures_2d-array_compressed.ts index 3e8bf7ee..56db87fd 100644 ---- a/examples-testing/examples/webgpu_texture2darray_compressed.ts -+++ b/examples-testing/examples/webgpu_texture2darray_compressed.ts +--- a/examples-testing/examples/webgpu_textures_2d-array_compressed.ts ++++ b/examples-testing/examples/webgpu_textures_2d-array_compressed.ts @@ -1,11 +1,16 @@ -import * as THREE from 'three'; +import * as THREE from 'three/webgpu'; @@ -15361,7 +15361,7 @@ index e8ebe87d..9fae06bd 100644 const data = texture.image.data; diff --git a/examples-testing/examples/webgpu_tsl_coffee_smoke.ts b/examples-testing/examples/webgpu_tsl_coffee_smoke.ts -index 5c2c8ea4..2b11fc73 100644 +index 9e2404cc..9bd5ef8a 100644 --- a/examples-testing/examples/webgpu_tsl_coffee_smoke.ts +++ b/examples-testing/examples/webgpu_tsl_coffee_smoke.ts @@ -1,4 +1,4 @@ @@ -15370,7 +15370,7 @@ index 5c2c8ea4..2b11fc73 100644 import { mix, mul, -@@ -17,7 +17,7 @@ import { +@@ -18,7 +18,7 @@ import { import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js'; @@ -15379,7 +15379,7 @@ index 5c2c8ea4..2b11fc73 100644 init(); -@@ -35,7 +35,9 @@ function init() { +@@ -36,7 +36,9 @@ function init() { // baked model gltfLoader.load('./models/gltf/coffeeMug.glb', gltf => { @@ -15391,7 +15391,7 @@ index 5c2c8ea4..2b11fc73 100644 }); diff --git a/examples-testing/examples/webgpu_tsl_vfx_flames.ts b/examples-testing/examples/webgpu_tsl_vfx_flames.ts -index a9110fa8..42bf54e3 100644 +index 6e72392a..b04fdc77 100644 --- a/examples-testing/examples/webgpu_tsl_vfx_flames.ts +++ b/examples-testing/examples/webgpu_tsl_vfx_flames.ts @@ -1,4 +1,4 @@ @@ -15399,8 +15399,8 @@ index a9110fa8..42bf54e3 100644 +import * as THREE from 'three/webgpu'; import { PI2, - spherizeUV, -@@ -17,7 +17,15 @@ import { + oneMinus, +@@ -18,7 +18,15 @@ import { import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; @@ -15417,7 +15417,7 @@ index a9110fa8..42bf54e3 100644 init(); -@@ -37,11 +45,11 @@ function init() { +@@ -38,11 +46,11 @@ function init() { // gradient canvas diff --git a/three.js b/three.js index db2025100..17abdb5e4 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit db2025100e5e87b4dc2cb0cad5f054f25984f680 +Subproject commit 17abdb5e4b88368a6c1528743d014e641b32cf85