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: Prevent viewportBottomLeft breaking change and cleanup #1208

Merged
merged 3 commits into from
Aug 26, 2024
Merged

TSL: Prevent viewportBottomLeft breaking change and cleanup #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c29bba
Update three.js
Methuselah96 Aug 26, 2024
b8ae65a
Add examples
Methuselah96 Aug 26, 2024
31c5f8c
Update patch and delete examples
Methuselah96 Aug 26, 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
8 changes: 4 additions & 4 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14750,7 +14750,7 @@ index 432d641a..1434cc30 100644
const params = {
distanceExponent: 1,
diff --git a/examples-testing/examples/webgpu_postprocessing_bloom.ts b/examples-testing/examples/webgpu_postprocessing_bloom.ts
index f1819db4..f8c8cf06 100644
index d38a7abb..80478cf8 100644
--- a/examples-testing/examples/webgpu_postprocessing_bloom.ts
+++ b/examples-testing/examples/webgpu_postprocessing_bloom.ts
@@ -1,4 +1,4 @@
Expand Down Expand Up @@ -14783,7 +14783,7 @@ index f1819db4..f8c8cf06 100644
clock = new THREE.Clock();

diff --git a/examples-testing/examples/webgpu_postprocessing_bloom_emissive.ts b/examples-testing/examples/webgpu_postprocessing_bloom_emissive.ts
index 97186836..583a9eb3 100644
index 3cec4ebe..a0584093 100644
--- a/examples-testing/examples/webgpu_postprocessing_bloom_emissive.ts
+++ b/examples-testing/examples/webgpu_postprocessing_bloom_emissive.ts
@@ -1,4 +1,4 @@
Expand All @@ -14804,7 +14804,7 @@ index 97186836..583a9eb3 100644
init();

diff --git a/examples-testing/examples/webgpu_postprocessing_bloom_selective.ts b/examples-testing/examples/webgpu_postprocessing_bloom_selective.ts
index c180acb1..60fd7075 100644
index 066a4766..6ce4437c 100644
--- a/examples-testing/examples/webgpu_postprocessing_bloom_selective.ts
+++ b/examples-testing/examples/webgpu_postprocessing_bloom_selective.ts
@@ -1,5 +1,5 @@
Expand All @@ -14815,7 +14815,7 @@ index c180acb1..60fd7075 100644

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

@@ -87,9 +87,10 @@ window.addEventListener('pointerdown', event => {
@@ -84,9 +84,10 @@ window.addEventListener('pointerdown', event => {
const intersects = raycaster.intersectObjects(scene.children, false);

if (intersects.length > 0) {
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 9 files
+3 −3 .github/workflows/codeql-code-scanning.yml
+2 −2 examples/jsm/objects/Water2Mesh.js
+2 −2 examples/webgpu_materials.html
+2 −2 src/nodes/Nodes.js
+6 −0 src/nodes/core/IndexNode.js
+8 −0 src/nodes/display/ViewportNode.js
+0 −2 src/nodes/materials/InstancedPointsNodeMaterial.js
+10 −0 src/renderers/webgl-fallback/nodes/GLSLNodeBuilder.js
+6 −0 src/renderers/webgpu/nodes/WGSLNodeBuilder.js
1 change: 1 addition & 0 deletions types/three/src/nodes/Nodes.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ export { default as ViewportDepthTextureNode, viewportDepthTexture } from "./dis
export {
default as ViewportNode,
viewport,
viewportBottomLeft,
viewportCoordinate,
ViewportNodeScope,
viewportResolution,
Expand Down
5 changes: 5 additions & 0 deletions types/three/src/nodes/display/ViewportNode.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@ export const viewportUV: ShaderNodeObject<ViewportNode>;
* @deprecated "viewportTopLeft" is deprecated. Use "viewportUV" instead.
*/
export const viewportTopLeft: ShaderNodeObject<ViewportNode>;

/**
* @deprecated "viewportBottomLeft" is deprecated. Use "viewportUV.flipY()" instead.
*/
export const viewportBottomLeft: ShaderNodeObject<ViewportNode>;
Loading