fix(bloom): fix bloom uniform data offset

fix bloom uniform data offset
Orillusion · Sep 6, 2023 · 39819ee · 39819ee
1 parent 1cc1515
commit 39819ee
Show file tree

Hide file tree

Showing 16 changed files with 117 additions and 165 deletions.
diff --git a/samples/base/Sample_AddRemove.ts b/samples/base/Sample_AddRemove.ts
@@ -51,7 +51,9 @@ class Sample_AddRemove {
             clone.transform.x = Math.random() * 100 - 50;
             clone.transform.y = Math.random() * 100 - 50;
             clone.transform.z = Math.random() * 100 - 50;
-            clone.transform.localScale.set(20, 20, 20)
+            clone.transform.scaleX = 20;
+            clone.transform.scaleY = 20;
+            clone.transform.scaleZ = 20;
 
             this.view.scene.addChild(clone);
             list.push(clone);

diff --git a/samples/material/Sample_ChangeMaterial.ts b/samples/material/Sample_ChangeMaterial.ts
@@ -17,6 +17,7 @@ class Sample_ChangeMaterial {
             blurX: 4,
             blurY: 4,
             luminosityThreshold: 0.8,
+            exposure: 1,
             strength: 0.86,
             radius: 4,
             debug: false

diff --git a/samples/material/Sample_ClearCoat.ts b/samples/material/Sample_ClearCoat.ts
@@ -20,6 +20,7 @@ class Sample_ClearCoat {
             enable: true,
             blurX: 4,
             blurY: 4,
+            exposure: 1,
             luminosityThreshold: 0.8,
             strength: 0.86,
             radius: 4,

diff --git a/samples/material/Sample_PBRMaterial.ts b/samples/material/Sample_PBRMaterial.ts
@@ -7,20 +7,23 @@ class Sample_PBRMaterial {
     scene: Scene3D;
 
     async run() {
-        await Engine3D.init({ canvasConfig: { alpha: true, zIndex: 11, backgroundImage: '/logo/bg.webp' } });
 
         //config settings
+        Engine3D.setting.render.debug = true;
         Engine3D.setting.shadow.shadowBound = 50;
         Engine3D.setting.render.postProcessing.bloom = {
             enable: true,
             blurX: 4,
             blurY: 4,
             luminosityThreshold: 0.8,
             strength: 0.86,
+            exposure: 1,
             radius: 4,
             debug: false
         };
 
+        await Engine3D.init({ canvasConfig: { alpha: true, zIndex: 11, backgroundImage: '/logo/bg.webp' } });
+
         GUIHelp.init(999);
 
         this.scene = new Scene3D();
@@ -35,6 +38,8 @@ class Sample_PBRMaterial {
 
         Engine3D.startRenderView(view);
         await this.initScene();
+
+        GUIUtil.renderDebug();
     }
 
     async initScene() {
@@ -67,6 +72,8 @@ class Sample_PBRMaterial {
                 let material = item.material;
                 if (material instanceof LitMaterial) {
                     material.metallic = 1;
+                    material.roughness = 0.35;
+                    material.defaultPass.setDefine("USE_TANGENT", false);
                 }
             }
             model.transform.scaleX = 10;

diff --git a/samples/material/Sample_UVMove.ts b/samples/material/Sample_UVMove.ts
@@ -16,6 +16,7 @@ class Sample_UVMove {
             enable: true,
             blurX: 4,
             blurY: 4,
+            exposure: 1,
             luminosityThreshold: 0.8,
             strength: 0.86,
             radius: 4,

diff --git a/samples/post/Sample_Bloom.ts b/samples/post/Sample_Bloom.ts
@@ -5,6 +5,8 @@ import {
 	CameraUtil, webGPUContext, BoxGeometry, TAAPost, AtmosphericComponent, GTAOPost, Color, HDRBloomPost
 } from '@orillusion/core';
 import { GUIHelp } from '@orillusion/debug/GUIHelp';
+import { GUI } from '@orillusion/debug/dat.gui.module';
+import { GUIUtil } from '@samples/utils/GUIUtil';
 
 class Sample_Bloom {
 	lightObj: Object3D;
@@ -35,11 +37,13 @@ class Sample_Bloom {
 
 		let postProcessing = this.scene.addComponent(PostProcessingComponent);
 		let post = postProcessing.addPost(HDRBloomPost);
-		post.blurX = 4;
-		post.blurY = 4;
-		post.luminosityThreshold = 1.5;
-		post.strength = 4.0;
-		this.gui();
+		post.blurX = 5;
+		post.blurY = 5;
+		post.luminosityThreshold = 1.1;
+		post.strength = 1.0;
+
+		GUIHelp.init();
+		GUIUtil.renderBloom(post, true);
 	}
 
 	async initScene() {
@@ -131,21 +135,6 @@ class Sample_Bloom {
 			}
 		}
 	}
-
-	private gui() {
-		GUIHelp.init();
-		let postProcessing = this.scene.getComponent(PostProcessingComponent);
-		let post = postProcessing.getPost(HDRBloomPost);
-
-		GUIHelp.addFolder("Bloom");
-		GUIHelp.add(post, "blurX", 0.0, 5, 1);
-		GUIHelp.add(post, "blurY", 0.0, 5, 1);
-		GUIHelp.add(post, "radius", 0.0, 5, 1);
-		GUIHelp.add(post, "luminosityThreshold", 0.0, 5, 0.001);
-		GUIHelp.add(post, "strength", 0.0, 10, 0.001);
-		GUIHelp.endFolder();
-	}
-
 }
 
 new Sample_Bloom().run();
diff --git a/samples/utils/GUIUtil.ts b/samples/utils/GUIUtil.ts
@@ -82,8 +82,9 @@ export class GUIUtil {
         GUIHelp.add(bloom, 'enable');
         GUIHelp.addColor(bloom, 'tintColor');
         GUIHelp.add(bloom, 'luminosityThreshold');
-        GUIHelp.add(bloom, 'strength');
-        GUIHelp.add(bloom, 'radius');
+        GUIHelp.add(bloom, 'strength', 0, 3, 0.001);
+        GUIHelp.add(bloom, 'exposure');
+        GUIHelp.add(bloom, 'radius', 0, 1.0, 0.001);
         GUIHelp.add(bloom, 'blurX');
         GUIHelp.add(bloom, 'blurY');
         open && GUIHelp.open();
@@ -376,9 +377,9 @@ export class GUIUtil {
         let debugChanel = {
             PositionView: 0,
             ColorView: 1,
-            NormalView: 2,
+            normalView: 2,
             IrradianceView: 3,
-            LightView: 4,
+            tangentView: 4,
             FinalView: 5,
             EmissiveView: 6,
             specularRadiance: 7,

diff --git a/src/Engine3D.ts b/src/Engine3D.ts
@@ -208,6 +208,7 @@ export class Engine3D {
                     blurX: 4,
                     blurY: 4,
                     strength: 0.25,
+                    exposure: 1,
                     radius: 1.3,
                     luminosityThreshold: 0.98,
                     debug: false,

diff --git a/src/assets/shader/lighting/BxDF_frag.ts b/src/assets/shader/lighting/BxDF_frag.ts
@@ -60,7 +60,7 @@ export let BxDF_frag: string = /*wgsl*/ `
       fragData.Irradiance = LinearToGammaSpace(irradiance.rgb) ;
 
       #if USE_TANGENT
-        fragData.TangentChannel = ORI_VertexVarying.TANGENT.xyz * ORI_VertexVarying.TANGENT.w ;
+        fragData.TangentChannel = vec3<f32>(ORI_VertexVarying.TANGENT.w);// ORI_VertexVarying.TANGENT.xyz * ORI_VertexVarying.TANGENT.w ;
       #endif
 
       //***********lighting-PBR part********* 

diff --git a/src/assets/shader/materials/PBRLItShader.ts b/src/assets/shader/materials/PBRLItShader.ts
@@ -103,7 +103,7 @@ export let PBRLItShader: string = /*wgsl*/ `
         ORI_ShadingInput.Roughness = clamp(ORI_ShadingInput.Roughness,0.084,1.0);
         ORI_ShadingInput.Specular = 0.5 ;
 
-        var emissiveColor = textureSample(emissiveMap, emissiveMapSampler , ORI_VertexVarying.fragUV1.xy) ;
+        var emissiveColor = textureSample(emissiveMap, emissiveMapSampler , ORI_VertexVarying.fragUV0.xy) ;
         emissiveColor = vec4<f32>(gammaToLiner(emissiveColor.rgb),emissiveColor.w);
         ORI_ShadingInput.EmissiveColor = vec4<f32>(materialUniform.emissiveColor.rgb * emissiveColor.rgb * materialUniform.emissiveIntensity,1.0);
 

diff --git a/src/assets/shader/materials/program/BxdfDebug_frag.ts b/src/assets/shader/materials/program/BxdfDebug_frag.ts
@@ -77,7 +77,7 @@ export let BxdfDebug_frag: string = /*wgsl*/ `
                     debugIrradiance();
                   }
                   case 4: {
-                    debugDiffuse();
+                    debugTangent();
                   }
                   case 5: {
                     // debugTangent();
@@ -140,7 +140,7 @@ export let BxdfDebug_frag: string = /*wgsl*/ `
                     debugIrradiance();
                   }
                   case 4: {
-                    debugDiffuse();
+                    debugTangent();
                   }
                   case 5: {
                     // debugTangent();

diff --git a/src/assets/shader/materials/program/NormalMap_frag.ts b/src/assets/shader/materials/program/NormalMap_frag.ts
@@ -7,11 +7,13 @@ export let NormalMap_frag: string = /*wgsl*/ `
         var N = surf_norm;
         var q1perp = cross( q1, N );
         var q0perp = cross( N, q0 );
+
         #if USE_TANGENT
             var T = ORI_VertexVarying.TANGENT.xyz ;
         #else
             var T = q1perp * st0.x + q0perp * st1.x;
         #endif
+        
         var B = q1perp * st0.y + q0perp * st1.y;
 
         var det = max( dot( T, T ), dot( B, B ) );