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

TextureNode: Rename .uv() -> .sample() #1439

Merged
merged 4 commits into from
Dec 15, 2024
Merged

TextureNode: Rename .uv() -> .sample() #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
651c914
TextureNode: Rename .uv() -> .sample()
Methuselah96 Dec 15, 2024
62f3149
Update three.js
Methuselah96 Dec 15, 2024
7fb816f
Add src
Methuselah96 Dec 15, 2024
81da66c
Update patch and delete src
Methuselah96 Dec 15, 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
12 changes: 6 additions & 6 deletions src-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -436,10 +436,10 @@ index a3c00279..5503218c 100644

- uv(uvNode) {
+ uv(uvNode: ShaderNodeObject<Node> | 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);
}

Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 49 files
+0 −3 docs/api/ar/materials/MeshDepthMaterial.html
+0 −3 docs/api/ar/materials/MeshDistanceMaterial.html
+0 −3 docs/api/en/materials/MeshDepthMaterial.html
+0 −3 docs/api/en/materials/MeshDistanceMaterial.html
+0 −3 docs/api/fr/materials/MeshDepthMaterial.html
+0 −3 docs/api/fr/materials/MeshDistanceMaterial.html
+0 −3 docs/api/it/materials/MeshDepthMaterial.html
+0 −3 docs/api/it/materials/MeshDistanceMaterial.html
+0 −3 docs/api/zh/materials/MeshDepthMaterial.html
+0 −3 docs/api/zh/materials/MeshDistanceMaterial.html
+11 −8 examples/jsm/csm/CSMShadowNode.js
+10 −10 examples/jsm/misc/ProgressiveLightMapGPU.js
+2 −2 examples/jsm/objects/Water2Mesh.js
+4 −4 examples/jsm/objects/WaterMesh.js
+1 −1 examples/jsm/tsl/display/AfterImageNode.js
+2 −2 examples/jsm/tsl/display/AnaglyphPassNode.js
+1 −1 examples/jsm/tsl/display/AnamorphicNode.js
+1 −1 examples/jsm/tsl/display/BloomNode.js
+4 −4 examples/jsm/tsl/display/DenoiseNode.js
+1 −1 examples/jsm/tsl/display/DepthOfFieldNode.js
+1 −1 examples/jsm/tsl/display/FXAANode.js
+3 −3 examples/jsm/tsl/display/GTAONode.js
+2 −2 examples/jsm/tsl/display/GaussianBlurNode.js
+1 −1 examples/jsm/tsl/display/LensflareNode.js
+1 −1 examples/jsm/tsl/display/Lut3DNode.js
+1 −1 examples/jsm/tsl/display/MotionBlur.js
+8 −8 examples/jsm/tsl/display/OutlineNode.js
+2 −2 examples/jsm/tsl/display/ParallaxBarrierPassNode.js
+3 −3 examples/jsm/tsl/display/PixelationPassNode.js
+1 −1 examples/jsm/tsl/display/RGBShiftNode.js
+24 −24 examples/jsm/tsl/display/SMAANode.js
+4 −4 examples/jsm/tsl/display/SSRNode.js
+1 −1 examples/jsm/tsl/display/SobelOperatorNode.js
+5 −5 examples/jsm/tsl/display/TRAAPassNode.js
+1 −1 examples/jsm/tsl/display/TransitionNode.js
+1 −1 examples/jsm/tsl/display/hashBlur.js
+1 −1 examples/webgpu_volume_cloud.html
+1 −0 src/Three.TSL.js
+1 −1 src/materials/nodes/VolumeNodeMaterial.js
+1 −0 src/nodes/Nodes.js
+3 −3 src/nodes/accessors/Texture3DNode.js
+2 −2 src/nodes/accessors/TextureBicubic.js
+9 −1 src/nodes/accessors/TextureNode.js
+12 −4 src/nodes/accessors/UniformArrayNode.js
+3 −3 src/nodes/functions/PhysicalLightingModel.js
+24 −0 src/nodes/lighting/LightsNode.js
+43 −0 src/nodes/lighting/ShadowBaseNode.js
+10 −15 src/nodes/lighting/ShadowNode.js
+1 −1 src/nodes/pmrem/PMREMUtils.js
5 changes: 5 additions & 0 deletions types/three/src/nodes/accessors/TextureNode.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,13 @@ export default class TextureNode extends UniformNode<Texture> {

getSampler(): boolean;

/**
* @deprecated
*/
uv(uvNode: NodeRepresentation): ShaderNodeObject<Node>;

sample(uvNode: NodeRepresentation): ShaderNodeObject<Node>;

blur(amountNode: NodeRepresentation): ShaderNodeObject<Node>;

level(levelNode: NodeRepresentation): ShaderNodeObject<Node>;
Expand Down
Loading