Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TSL: Rename viewportTopLeft -> viewportUV #1203

Merged
merged 6 commits into from
Aug 25, 2024
Merged

TSL: Rename viewportTopLeft -> viewportUV #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c24edbd
TSL: Rename viewportTopLeft -> viewportUV
Methuselah96 Aug 25, 2024
98edb28
Update three.js
Methuselah96 Aug 25, 2024
7300a16
Add examples
Methuselah96 Aug 25, 2024
e7a9fa2
Update patch and delete examples
Methuselah96 Aug 25, 2024
9e0ec56
Add src
Methuselah96 Aug 25, 2024
4b676bd
Update patch and delete src
Methuselah96 Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13217,7 +13217,7 @@ index d0255e43..c924d666 100644
init();

diff --git a/examples-testing/examples/webgpu_backdrop_area.ts b/examples-testing/examples/webgpu_backdrop_area.ts
index 208bb15e..ad6da1e5 100644
index 733fe4fb..73038ec7 100644
--- a/examples-testing/examples/webgpu_backdrop_area.ts
+++ b/examples-testing/examples/webgpu_backdrop_area.ts
@@ -1,4 +1,4 @@
Expand Down Expand Up @@ -14366,7 +14366,7 @@ index ea9f8658..b81d7761 100644
}
});
diff --git a/examples-testing/examples/webgpu_mrt.ts b/examples-testing/examples/webgpu_mrt.ts
index 371c898c..88bd24eb 100644
index e1d45570..84c1dfdf 100644
--- a/examples-testing/examples/webgpu_mrt.ts
+++ b/examples-testing/examples/webgpu_mrt.ts
@@ -1,4 +1,4 @@
Expand All @@ -14387,25 +14387,25 @@ index 371c898c..88bd24eb 100644
init();

diff --git a/examples-testing/examples/webgpu_multiple_rendertargets_readback.ts b/examples-testing/examples/webgpu_multiple_rendertargets_readback.ts
index 2405b8ad..bd503c49 100644
index ace1533a..52bd9288 100644
--- a/examples-testing/examples/webgpu_multiple_rendertargets_readback.ts
+++ b/examples-testing/examples/webgpu_multiple_rendertargets_readback.ts
@@ -1,12 +1,31 @@
-import * as THREE from 'three';
-import { mix, step, texture, viewportTopLeft, mrt, output, transformedNormalWorld, uv, vec2 } from 'three/tsl';
-import { mix, step, texture, viewportUV, mrt, output, transformedNormalWorld, uv, vec2 } from 'three/tsl';
+import * as THREE from 'three/webgpu';
+import {
+ mix,
+ step,
+ texture,
+ viewportTopLeft,
+ viewportUV,
+ mrt,
+ output,
+ transformedNormalWorld,
+ uv,
+ vec2,
+ MRTNode,
+ ShaderNodeObject,
+ MRTNode,
+} from 'three/tsl';

import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
Expand Down Expand Up @@ -14942,13 +14942,13 @@ index a4f56b17..ce7e7ad3 100644
compose = sceneMask2.mix(compose, texture(texture2));

diff --git a/examples-testing/examples/webgpu_postprocessing_motion_blur.ts b/examples-testing/examples/webgpu_postprocessing_motion_blur.ts
index aa76acb9..77f5f8b1 100644
index 7e86bb48..c5ac9f2e 100644
--- a/examples-testing/examples/webgpu_postprocessing_motion_blur.ts
+++ b/examples-testing/examples/webgpu_postprocessing_motion_blur.ts
@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import * as THREE from 'three/webgpu';
import { pass, texture, motionBlur, uniform, output, mrt, mix, velocity, uv, viewportTopLeft } from 'three/tsl';
import { pass, texture, motionBlur, uniform, output, mrt, mix, velocity, uv, viewportUV } from 'three/tsl';

import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
@@ -9,11 +9,11 @@ import { GUI } from 'three/addons/libs/lil-gui.module.min.js';
Expand Down Expand Up @@ -15275,13 +15275,13 @@ index d4228f90..191b58f2 100644
init();
render();
diff --git a/examples-testing/examples/webgpu_refraction.ts b/examples-testing/examples/webgpu_refraction.ts
index bf36d911..0e77df7c 100644
index 912997c1..2ce61b2f 100644
--- a/examples-testing/examples/webgpu_refraction.ts
+++ b/examples-testing/examples/webgpu_refraction.ts
@@ -1,13 +1,13 @@
-import * as THREE from 'three';
+import * as THREE from 'three/webgpu';
import { viewportSafeUV, viewportSharedTexture, viewportTopLeft, texture, uv } from 'three/tsl';
import { viewportSafeUV, viewportSharedTexture, viewportUV, texture, uv } from 'three/tsl';

import { OrbitControls } from 'three/addons/controls/OrbitControls.js';

Expand Down
Loading
Loading