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

GTAONode: Add resolutionScale. #29826

Merged
merged 1 commit into from
Nov 6, 2024
Merged

GTAONode: Add resolutionScale. #29826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions examples/jsm/tsl/display/DenoiseNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ class DenoiseNode extends TempNode {
this.normalNode = normalNode;
this.noiseNode = noiseNode;

this.cameraProjectionMatrixInverse = uniform( camera.projectionMatrixInverse );
this.lumaPhi = uniform( 5 );
this.depthPhi = uniform( 5 );
this.normalPhi = uniform( 5 );
this.radius = uniform( 5 );
this.index = uniform( 0 );

this.updateBeforeType = NodeUpdateType.FRAME;

// uniforms

this._resolution = uniform( new Vector2() );
this._sampleVectors = uniformArray( generatePdSamplePointInitializer( 16, 2, 1 ) );

this.updateBeforeType = NodeUpdateType.FRAME;
this._cameraProjectionMatrixInverse = uniform( camera.projectionMatrixInverse );

}

Expand All @@ -46,7 +48,7 @@ class DenoiseNode extends TempNode {

const sampleTexture = ( uv ) => this.textureNode.uv( uv );
const sampleDepth = ( uv ) => this.depthNode.uv( uv ).x;
const sampleNormal = ( uv ) => ( this.normalNode !== null ) ? this.normalNode.uv( uv ).rgb.normalize() : getNormalFromDepth( uv, this.depthNode.value, this.cameraProjectionMatrixInverse );
const sampleNormal = ( uv ) => ( this.normalNode !== null ) ? this.normalNode.uv( uv ).rgb.normalize() : getNormalFromDepth( uv, this.depthNode.value, this._cameraProjectionMatrixInverse );
const sampleNoise = ( uv ) => this.noiseNode.uv( uv );

const denoiseSample = Fn( ( [ center, viewNormal, viewPosition, sampleUv ] ) => {
Expand All @@ -55,7 +57,7 @@ class DenoiseNode extends TempNode {
const depth = sampleDepth( sampleUv ).toVar();
const normal = sampleNormal( sampleUv ).toVar();
const neighborColor = texel.rgb;
const viewPos = getViewPosition( sampleUv, depth, this.cameraProjectionMatrixInverse ).toVar();
const viewPos = getViewPosition( sampleUv, depth, this._cameraProjectionMatrixInverse ).toVar();

const normalDiff = dot( viewNormal, normal ).toVar();
const normalSimilarity = pow( max( normalDiff, 0 ), this.normalPhi ).toVar();
Expand Down Expand Up @@ -84,7 +86,7 @@ class DenoiseNode extends TempNode {

const center = vec3( texel.rgb ).toVar();

const viewPosition = getViewPosition( uvNode, depth, this.cameraProjectionMatrixInverse ).toVar();
const viewPosition = getViewPosition( uvNode, depth, this._cameraProjectionMatrixInverse ).toVar();

const noiseResolution = textureSize( this.noiseNode, 0 );
let noiseUv = vec2( uvNode.x, uvNode.y.oneMinus() );
Expand Down
56 changes: 35 additions & 21 deletions examples/jsm/tsl/display/GTAONode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,37 @@ class GTAONode extends TempNode {
this.depthNode = depthNode;
this.normalNode = normalNode;

this.resolutionScale = 1;

this.radius = uniform( 0.25 );
this.resolution = uniform( new Vector2() );
this.thickness = uniform( 1 );
this.distanceExponent = uniform( 1 );
this.distanceFallOff = uniform( 1 );
this.scale = uniform( 1 );
this.noiseNode = texture( generateMagicSquareNoise() );
this.samples = uniform( 16 );

this.cameraProjectionMatrix = uniform( camera.projectionMatrix );
this.cameraProjectionMatrixInverse = uniform( camera.projectionMatrixInverse );
this.updateBeforeType = NodeUpdateType.FRAME;

this.SAMPLES = uniform( 16 );
// render targets

this._aoRenderTarget = new RenderTarget( 1, 1, { depthBuffer: false } );
this._aoRenderTarget.texture.name = 'GTAONode.AO';

this._material = null;
this._textureNode = passTexture( this, this._aoRenderTarget.texture );
// uniforms

this.updateBeforeType = NodeUpdateType.FRAME;
this._noiseNode = texture( generateMagicSquareNoise() );
this._cameraProjectionMatrix = uniform( camera.projectionMatrix );
this._cameraProjectionMatrixInverse = uniform( camera.projectionMatrixInverse );

// materials

this._material = new NodeMaterial();
this._material.name = 'GTAO';

//

this._textureNode = passTexture( this, this._aoRenderTarget.texture );

}

Expand All @@ -56,6 +67,9 @@ class GTAONode extends TempNode {

setSize( width, height ) {

width = Math.round( this.resolutionScale * width );
height = Math.round( this.resolutionScale * height );

this.resolution.value.set( width, height );
this._aoRenderTarget.setSize( width, height );

Expand Down Expand Up @@ -94,21 +108,21 @@ class GTAONode extends TempNode {
const uvNode = uv();

const sampleDepth = ( uv ) => this.depthNode.uv( uv ).x;
const sampleNoise = ( uv ) => this.noiseNode.uv( uv );
const sampleNormal = ( uv ) => ( this.normalNode !== null ) ? this.normalNode.uv( uv ).rgb.normalize() : getNormalFromDepth( uv, this.depthNode.value, this.cameraProjectionMatrixInverse );
const sampleNoise = ( uv ) => this._noiseNode.uv( uv );
const sampleNormal = ( uv ) => ( this.normalNode !== null ) ? this.normalNode.uv( uv ).rgb.normalize() : getNormalFromDepth( uv, this.depthNode.value, this._cameraProjectionMatrixInverse );

const ao = Fn( () => {

const depth = sampleDepth( uvNode ).toVar();

depth.greaterThanEqual( 1.0 ).discard();

const viewPosition = getViewPosition( uvNode, depth, this.cameraProjectionMatrixInverse ).toVar();
const viewPosition = getViewPosition( uvNode, depth, this._cameraProjectionMatrixInverse ).toVar();
const viewNormal = sampleNormal( uvNode ).toVar();

const radiusToUse = this.radius;

const noiseResolution = textureSize( this.noiseNode, 0 );
const noiseResolution = textureSize( this._noiseNode, 0 );
let noiseUv = vec2( uvNode.x, uvNode.y.oneMinus() );
noiseUv = noiseUv.mul( this.resolution.div( noiseResolution ) );
const noiseTexel = sampleNoise( noiseUv );
Expand All @@ -117,8 +131,8 @@ class GTAONode extends TempNode {
const bitangent = vec3( tangent.y.mul( - 1.0 ), tangent.x, 0.0 );
const kernelMatrix = mat3( tangent, bitangent, vec3( 0.0, 0.0, 1.0 ) );

const DIRECTIONS = this.SAMPLES.lessThan( 30 ).select( 3, 5 ).toVar();
const STEPS = add( this.SAMPLES, DIRECTIONS.sub( 1 ) ).div( DIRECTIONS ).toVar();
const DIRECTIONS = this.samples.lessThan( 30 ).select( 3, 5 ).toVar();
const STEPS = add( this.samples, DIRECTIONS.sub( 1 ) ).div( DIRECTIONS ).toVar();

const ao = float( 0 ).toVar();

Expand All @@ -142,9 +156,9 @@ class GTAONode extends TempNode {

// x

const sampleScreenPositionX = getScreenPosition( viewPosition.add( sampleViewOffset ), this.cameraProjectionMatrix ).toVar();
const sampleScreenPositionX = getScreenPosition( viewPosition.add( sampleViewOffset ), this._cameraProjectionMatrix ).toVar();
const sampleDepthX = sampleDepth( sampleScreenPositionX ).toVar();
const sampleSceneViewPositionX = getViewPosition( sampleScreenPositionX, sampleDepthX, this.cameraProjectionMatrixInverse ).toVar();
const sampleSceneViewPositionX = getViewPosition( sampleScreenPositionX, sampleDepthX, this._cameraProjectionMatrixInverse ).toVar();
const viewDeltaX = sampleSceneViewPositionX.sub( viewPosition ).toVar();

If( abs( viewDeltaX.z ).lessThan( this.thickness ), () => {
Expand All @@ -156,9 +170,9 @@ class GTAONode extends TempNode {

// y

const sampleScreenPositionY = getScreenPosition( viewPosition.sub( sampleViewOffset ), this.cameraProjectionMatrix ).toVar();
const sampleScreenPositionY = getScreenPosition( viewPosition.sub( sampleViewOffset ), this._cameraProjectionMatrix ).toVar();
const sampleDepthY = sampleDepth( sampleScreenPositionY ).toVar();
const sampleSceneViewPositionY = getViewPosition( sampleScreenPositionY, sampleDepthY, this.cameraProjectionMatrixInverse ).toVar();
const sampleSceneViewPositionY = getViewPosition( sampleScreenPositionY, sampleDepthY, this._cameraProjectionMatrixInverse ).toVar();
const viewDeltaY = sampleSceneViewPositionY.sub( viewPosition ).toVar();

If( abs( viewDeltaY.z ).lessThan( this.thickness ), () => {
Expand Down Expand Up @@ -187,10 +201,8 @@ class GTAONode extends TempNode {

} );

const material = this._material || ( this._material = new NodeMaterial() );
material.fragmentNode = ao().context( builder.getSharedContext() );
material.name = 'GTAO';
material.needsUpdate = true;
this._material.fragmentNode = ao().context( builder.getSharedContext() );
this._material.needsUpdate = true;

//

Expand All @@ -202,6 +214,8 @@ class GTAONode extends TempNode {

this._aoRenderTarget.dispose();

this._material.dispose();

}

}
Expand Down