From 2814373a6d062942a18b359ee313bb716c582595 Mon Sep 17 00:00:00 2001
From: Johnathon Selstad <makeshifted@gmail.com>
Date: Wed, 10 Sep 2025 18:19:47 -0700
Subject: [PATCH 1/4] Improve GI Blending

Consider if SSRT3's Blending is necessary
---
 examples/webgpu_postprocessing_ssgi.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/webgpu_postprocessing_ssgi.html b/examples/webgpu_postprocessing_ssgi.html
index c764d741f5e5b9..f6f503e40ce7df 100644
--- a/examples/webgpu_postprocessing_ssgi.html
+++ b/examples/webgpu_postprocessing_ssgi.html
@@ -28,7 +28,7 @@
 		<script type="module">
 
 			import * as THREE from 'three/webgpu';
-			import { pass, mrt, output, normalView, velocity, add, vec3, vec4 } from 'three/tsl';
+			import { pass, mrt, output, normalView, diffuseColor, velocity, add, vec3, vec4 } from 'three/tsl';
 			import { ssgi } from 'three/addons/tsl/display/SSGINode.js';
 			import { traa } from 'three/addons/tsl/display/TRAANode.js';
 
@@ -78,11 +78,13 @@
 				const scenePass = pass( scene, camera );
 				scenePass.setMRT( mrt( {
 					output: output,
+					diffuseColor: diffuseColor,
 					normal: normalView,
 					velocity: velocity
 				} ) );
 
 				const scenePassColor = scenePass.getTextureNode( 'output' );
+				const scenePassDiffuse = scenePass.getTextureNode( 'diffuseColor' );
 				const scenePassDepth = scenePass.getTextureNode( 'depth' );
 				const scenePassNormal = scenePass.getTextureNode( 'normal' );
 				const scenePassVelocity = scenePass.getTextureNode( 'velocity' );
@@ -98,7 +100,7 @@
 				const gi = giPass.rgb;
 				const ao = giPass.a;
 			
-				const compositePass = vec4( add( scenePassColor.rgb, gi ).mul( ao ), scenePassColor.a );
+				const compositePass = vec4( scenePassColor.rgb.mul( ao ).add( scenePassDiffuse.rgb.mul( gi ) ), scenePassColor.a );
 			
 				// traa
 

From 71b43f5e3744a82a5b1830d9e623a8532f8ec370 Mon Sep 17 00:00:00 2001
From: Johnathon Selstad <makeshifted@gmail.com>
Date: Wed, 10 Sep 2025 18:38:30 -0700
Subject: [PATCH 2/4] Also fix the TRAA Toggle

---
 examples/webgpu_postprocessing_ssgi.html | 37 ++++++++++++------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/examples/webgpu_postprocessing_ssgi.html b/examples/webgpu_postprocessing_ssgi.html
index f6f503e40ce7df..f057322d3c9416 100644
--- a/examples/webgpu_postprocessing_ssgi.html
+++ b/examples/webgpu_postprocessing_ssgi.html
@@ -99,8 +99,8 @@
 
 				const gi = giPass.rgb;
 				const ao = giPass.a;
-			
-				const compositePass = vec4( scenePassColor.rgb.mul( ao ).add( scenePassDiffuse.rgb.mul( gi ) ), scenePassColor.a );
+
+				const compositePass = vec4( add ( scenePassColor.rgb.mul( ao ), ( scenePassDiffuse.rgb.mul( gi ) ) ), scenePassColor.a );
 			
 				// traa
 
@@ -125,27 +125,16 @@
 
 				//
 
-				const gui = new GUI();
-				gui.title( 'SSGI settings' );
-				gui.add( giPass.sliceCount, 'value', 1, 4 ).step( 1 ).name( 'slice count' );
-				gui.add( giPass.stepCount, 'value', 1, 32 ).step( 1 ).name( 'step count' );
-				gui.add( giPass.radius, 'value', 1, 25 ).name( 'radius' );
-				gui.add( giPass.expFactor, 'value', 1, 3 ).name( 'exp factor' );
-				gui.add( giPass.thickness, 'value', 0.01, 10 ).name( 'thickness' );
-				gui.add( giPass.backfaceLighting, 'value', 0, 1 ).name( 'backface lighting' );
-				gui.add( giPass.aoIntensity, 'value', 0, 4 ).name( 'AO intenstiy' );
-				gui.add( giPass.giIntensity, 'value', 0, 100 ).name( 'GI intenstiy' );
-				gui.add( giPass.useLinearThickness, 'value' ).name( 'use linear thickness' );
-				gui.add( giPass.useScreenSpaceSampling, 'value' ).name( 'screen-space sampling' );
-				gui.add( giPass, 'useTemporalFiltering' ).name( 'temporal filtering' );
-
 				const params = {
 					output: 0
 				};
 
 				const types = { Default: 0, AO: 1, GI: 2, Beauty: 3 };
 
-				gui.add( params, 'output', types ).onChange( value => {
+				const gui = new GUI();
+				gui.title( 'SSGI settings' );
+				let outputDropdown = gui.add( params, 'output', types )
+				outputDropdown.onChange( value => {
 			
 					if ( value === 1 ) {
 
@@ -161,14 +150,24 @@
 
 					} else {
 
-						postProcessing.outputNode = traaPass;
+						postProcessing.outputNode = giPass.useTemporalFiltering ? traaPass : compositePass;
 
 					}
 
 					postProcessing.needsUpdate = true;
 
 				} );
-
+				gui.add( giPass.sliceCount, 'value', 1, 4 ).step( 1 ).name( 'slice count' );
+				gui.add( giPass.stepCount, 'value', 1, 32 ).step( 1 ).name( 'step count' );
+				gui.add( giPass.radius, 'value', 1, 25 ).name( 'radius' );
+				gui.add( giPass.expFactor, 'value', 1, 3 ).name( 'exp factor' );
+				gui.add( giPass.thickness, 'value', 0.01, 10 ).name( 'thickness' );
+				gui.add( giPass.backfaceLighting, 'value', 0, 1 ).name( 'backface lighting' );
+				gui.add( giPass.aoIntensity, 'value', 0, 4 ).name( 'AO intenstiy' );
+				gui.add( giPass.giIntensity, 'value', 0, 100 ).name( 'GI intenstiy' );
+				gui.add( giPass.useLinearThickness, 'value' ).name( 'use linear thickness' );
+				gui.add( giPass.useScreenSpaceSampling, 'value' ).name( 'screen-space sampling' );
+				gui.add( giPass, 'useTemporalFiltering' ).name( 'temporal filtering' ).onChange( outputDropdown._onChange );
 			}
 
 			function onWindowResize() {

From e83617c462a07a8930a9722863e78bc4629f4683 Mon Sep 17 00:00:00 2001
From: Johnathon Selstad <makeshifted@gmail.com>
Date: Wed, 10 Sep 2025 18:42:01 -0700
Subject: [PATCH 3/4] Add missing semi-colon

---
 examples/webgpu_postprocessing_ssgi.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/webgpu_postprocessing_ssgi.html b/examples/webgpu_postprocessing_ssgi.html
index f057322d3c9416..b263f9218e669d 100644
--- a/examples/webgpu_postprocessing_ssgi.html
+++ b/examples/webgpu_postprocessing_ssgi.html
@@ -133,7 +133,7 @@
 
 				const gui = new GUI();
 				gui.title( 'SSGI settings' );
-				let outputDropdown = gui.add( params, 'output', types )
+				let outputDropdown = gui.add( params, 'output', types );
 				outputDropdown.onChange( value => {
 			
 					if ( value === 1 ) {

From 0573e4f389839696217310d2fdfc930c657b0e88 Mon Sep 17 00:00:00 2001
From: Johnathon Selstad <makeshifted@gmail.com>
Date: Wed, 10 Sep 2025 20:20:02 -0700
Subject: [PATCH 4/4] Fix Radius Changing with Step Count

This bug is also present here:
https://github.com/cdrinmatane/SSRT3/blob/main/HDRP/Shaders/Resources/SSRTCS.compute#L239-L240
---
 examples/jsm/tsl/display/SSGINode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/jsm/tsl/display/SSGINode.js b/examples/jsm/tsl/display/SSGINode.js
index 8e48d4a863d57d..37ab2b0dc9e032 100644
--- a/examples/jsm/tsl/display/SSGINode.js
+++ b/examples/jsm/tsl/display/SSGINode.js
@@ -471,7 +471,7 @@ class SSGINode extends TempNode {
 
 			If( this.useScreenSpaceSampling.equal( true ), () => {
 
-				stepRadius.assign( RADIUS.mul( this._resolution.x.div( 2 ) ).div( float( STEP_COUNT ) ) );
+				stepRadius.assign( RADIUS.mul( this._resolution.x.div( 2 ) ).div( float( 16 ) ) ); // SSRT3 has a bug where stepRadius is divided by STEP_COUNT twice; fix here
 
 			} ).Else( () => {