diff --git a/src-testing/changes.patch b/src-testing/changes.patch index 52afb9f07..0e70bd2ff 100644 --- a/src-testing/changes.patch +++ b/src-testing/changes.patch @@ -288,7 +288,7 @@ index 97456dbc..c99ecb8a 100644 addMethodChaining('toAttribute', bufferNode => bufferAttribute(bufferNode.value)); diff --git a/src-testing/src/nodes/accessors/TextureNode.ts b/src-testing/src/nodes/accessors/TextureNode.ts -index a3c00279..5503218c 100644 +index 4841d46c..d69010bc 100644 --- a/src-testing/src/nodes/accessors/TextureNode.ts +++ b/src-testing/src/nodes/accessors/TextureNode.ts @@ -4,17 +4,44 @@ import { textureSize } from './TextureSizeNode.js'; @@ -436,10 +436,10 @@ index a3c00279..5503218c 100644 - uv(uvNode) { + uv(uvNode: ShaderNodeObject | null) { - const textureNode = this.clone(); - textureNode.uvNode = nodeObject(uvNode); - textureNode.referenceNode = this.getSelf(); -@@ -270,7 +297,7 @@ class TextureNode extends UniformNode { + // @deprecated, r172 + + console.warn('THREE.TextureNode: .uv() has been renamed. Use .sample() instead.'); +@@ -278,7 +305,7 @@ class TextureNode extends UniformNode { return nodeObject(textureNode); } @@ -448,7 +448,7 @@ index a3c00279..5503218c 100644 const textureNode = this.clone(); textureNode.biasNode = nodeObject(amountNode).mul(maxMipLevel(textureNode)); textureNode.referenceNode = this.getSelf(); -@@ -278,7 +305,7 @@ class TextureNode extends UniformNode { +@@ -286,7 +313,7 @@ class TextureNode extends UniformNode { return nodeObject(textureNode); } diff --git a/three.js b/three.js index 58a9949bd..ed96b8dc2 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 58a9949bd3a66ab06a8fc6d20ce62eeb28e9f4eb +Subproject commit ed96b8dc2a91c6fd3eca13b3bb2e4e4c8ddd96f8 diff --git a/types/three/src/nodes/accessors/TextureNode.d.ts b/types/three/src/nodes/accessors/TextureNode.d.ts index f9cc129f5..25a0addb9 100644 --- a/types/three/src/nodes/accessors/TextureNode.d.ts +++ b/types/three/src/nodes/accessors/TextureNode.d.ts @@ -31,8 +31,13 @@ export default class TextureNode extends UniformNode { getSampler(): boolean; + /** + * @deprecated + */ uv(uvNode: NodeRepresentation): ShaderNodeObject; + sample(uvNode: NodeRepresentation): ShaderNodeObject; + blur(amountNode: NodeRepresentation): ShaderNodeObject; level(levelNode: NodeRepresentation): ShaderNodeObject;