|
@@ -12,7 +12,7 @@ import { IntType, UnsignedIntType } from '../../constants.js';
|
|
|
|
|
|
class TextureNode extends UniformNode {
|
|
|
|
|
|
- constructor( value, uvNode = null, levelNode = null ) {
|
|
|
+ constructor( value, uvNode = null, levelNode = null, biasNode = null ) {
|
|
|
|
|
|
super( value );
|
|
|
|
|
@@ -20,6 +20,7 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
this.uvNode = uvNode;
|
|
|
this.levelNode = levelNode;
|
|
|
+ this.biasNode = biasNode;
|
|
|
this.compareNode = null;
|
|
|
this.depthNode = null;
|
|
|
this.gradNode = null;
|
|
@@ -31,6 +32,7 @@ class TextureNode extends UniformNode {
|
|
|
this.referenceNode = null;
|
|
|
|
|
|
this._value = value;
|
|
|
+ this._matrixUniform = null;
|
|
|
|
|
|
this.setUpdateMatrix( uvNode === null );
|
|
|
|
|
@@ -100,9 +102,10 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
getTransformedUV( uvNode ) {
|
|
|
|
|
|
- const texture = this.value;
|
|
|
+ if ( this._matrixUniform === null ) this._matrixUniform = uniform( this.value.matrix );
|
|
|
+
|
|
|
+ return this._matrixUniform.mul( vec3( uvNode, 1 ) ).xy;
|
|
|
|
|
|
- return uniform( texture.matrix ).mul( vec3( uvNode, 1 ) ).xy;
|
|
|
|
|
|
}
|
|
|
|
|
@@ -168,6 +171,7 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
properties.uvNode = uvNode;
|
|
|
properties.levelNode = levelNode;
|
|
|
+ properties.biasNode = this.biasNode;
|
|
|
properties.compareNode = this.compareNode;
|
|
|
properties.gradNode = this.gradNode;
|
|
|
properties.depthNode = this.depthNode;
|
|
@@ -180,7 +184,7 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
}
|
|
|
|
|
|
- generateSnippet( builder, textureProperty, uvSnippet, levelSnippet, depthSnippet, compareSnippet, gradSnippet ) {
|
|
|
+ generateSnippet( builder, textureProperty, uvSnippet, levelSnippet, biasSnippet, depthSnippet, compareSnippet, gradSnippet ) {
|
|
|
|
|
|
const texture = this.value;
|
|
|
|
|
@@ -190,6 +194,10 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
snippet = builder.generateTextureLevel( texture, textureProperty, uvSnippet, levelSnippet, depthSnippet );
|
|
|
|
|
|
+ } else if ( biasSnippet ) {
|
|
|
+
|
|
|
+ snippet = builder.generateTextureBias( texture, textureProperty, uvSnippet, biasSnippet, depthSnippet );
|
|
|
+
|
|
|
} else if ( gradSnippet ) {
|
|
|
|
|
|
snippet = builder.generateTextureGrad( texture, textureProperty, uvSnippet, gradSnippet, depthSnippet );
|
|
@@ -242,10 +250,11 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
if ( propertyName === undefined ) {
|
|
|
|
|
|
- const { uvNode, levelNode, compareNode, depthNode, gradNode } = properties;
|
|
|
+ const { uvNode, levelNode, biasNode, compareNode, depthNode, gradNode } = properties;
|
|
|
|
|
|
const uvSnippet = this.generateUV( builder, uvNode );
|
|
|
const levelSnippet = levelNode ? levelNode.build( builder, 'float' ) : null;
|
|
|
+ const biasSnippet = biasNode ? biasNode.build( builder, 'float' ) : null;
|
|
|
const depthSnippet = depthNode ? depthNode.build( builder, 'int' ) : null;
|
|
|
const compareSnippet = compareNode ? compareNode.build( builder, 'float' ) : null;
|
|
|
const gradSnippet = gradNode ? [ gradNode[ 0 ].build( builder, 'vec2' ), gradNode[ 1 ].build( builder, 'vec2' ) ] : null;
|
|
@@ -254,7 +263,7 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
propertyName = builder.getPropertyName( nodeVar );
|
|
|
|
|
|
- const snippet = this.generateSnippet( builder, textureProperty, uvSnippet, levelSnippet, depthSnippet, compareSnippet, gradSnippet );
|
|
|
+ const snippet = this.generateSnippet( builder, textureProperty, uvSnippet, levelSnippet, biasSnippet, depthSnippet, compareSnippet, gradSnippet );
|
|
|
|
|
|
builder.addLineFlowCode( `${propertyName} = ${snippet}` );
|
|
|
|
|
@@ -297,17 +306,17 @@ class TextureNode extends UniformNode {
|
|
|
uv( uvNode ) {
|
|
|
|
|
|
const textureNode = this.clone();
|
|
|
- textureNode.uvNode = uvNode;
|
|
|
+ textureNode.uvNode = nodeObject( uvNode );
|
|
|
textureNode.referenceNode = this;
|
|
|
|
|
|
return nodeObject( textureNode );
|
|
|
|
|
|
}
|
|
|
|
|
|
- blur( levelNode ) {
|
|
|
+ blur( amountNode ) {
|
|
|
|
|
|
const textureNode = this.clone();
|
|
|
- textureNode.levelNode = levelNode.mul( maxMipLevel( textureNode ) );
|
|
|
+ textureNode.biasNode = nodeObject( amountNode ).mul( maxMipLevel( textureNode ) );
|
|
|
textureNode.referenceNode = this;
|
|
|
|
|
|
return nodeObject( textureNode );
|
|
@@ -317,10 +326,10 @@ class TextureNode extends UniformNode {
|
|
|
level( levelNode ) {
|
|
|
|
|
|
const textureNode = this.clone();
|
|
|
- textureNode.levelNode = levelNode;
|
|
|
+ textureNode.levelNode = nodeObject( levelNode );
|
|
|
textureNode.referenceNode = this;
|
|
|
|
|
|
- return textureNode;
|
|
|
+ return nodeObject( textureNode );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -330,6 +339,16 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ bias( biasNode ) {
|
|
|
+
|
|
|
+ const textureNode = this.clone();
|
|
|
+ textureNode.biasNode = nodeObject( biasNode );
|
|
|
+ textureNode.referenceNode = this;
|
|
|
+
|
|
|
+ return nodeObject( textureNode );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
compare( compareNode ) {
|
|
|
|
|
|
const textureNode = this.clone();
|
|
@@ -382,6 +401,9 @@ class TextureNode extends UniformNode {
|
|
|
update() {
|
|
|
|
|
|
const texture = this.value;
|
|
|
+ const matrixUniform = this._matrixUniform;
|
|
|
+
|
|
|
+ if ( matrixUniform !== null ) matrixUniform.value = texture.matrix;
|
|
|
|
|
|
if ( texture.matrixAutoUpdate === true ) {
|
|
|
|
|
@@ -393,7 +415,7 @@ class TextureNode extends UniformNode {
|
|
|
|
|
|
clone() {
|
|
|
|
|
|
- const newNode = new this.constructor( this.value, this.uvNode, this.levelNode );
|
|
|
+ const newNode = new this.constructor( this.value, this.uvNode, this.levelNode, this.biasNode );
|
|
|
newNode.sampler = this.sampler;
|
|
|
|
|
|
return newNode;
|