add envBrdfOld chunk for non-phong non-metallic code path

raytranuk · raytranuk · commit 0ceae4a68f82 · 2021-06-02T15:25:46.000+01:00
diff --git a/src/graphics/program-lib/chunks/chunks.js b/src/graphics/program-lib/chunks/chunks.js
@@ -43,6 +43,7 @@ import endPS from './end.frag';
 import endVS from './end.vert';
 import envBrdfNonePS from './envBrdfNone.frag';
 import envBrdfApproxPS from './envBrdfApprox.frag';
+import envBrdfOldPS from './envBrdfOld.frag';
 import envConstPS from './envConst.frag';
 import envMultiplyPS from './envMultiply.frag';
 import extensionPS from './extension.frag';
@@ -249,6 +250,7 @@ var shaderChunks = {
     emissivePS: emissivePS,
     endPS: endPS,
     endVS: endVS,
+    envBrdfOldPS: envBrdfOldPS,
     envBrdfApproxPS: envBrdfApproxPS,
     envBrdfNonePS: envBrdfNonePS,
     envConstPS: envConstPS,
diff --git a/src/graphics/program-lib/chunks/envBrdfOld.frag b/src/graphics/program-lib/chunks/envBrdfOld.frag
@@ -0,0 +1,3 @@
+vec3 envBrdf(vec3 f0, float glossiness, vec3 normal) {
+    return f0; 
+}
diff --git a/src/graphics/program-lib/programs/standard.js b/src/graphics/program-lib/programs/standard.js
@@ -1213,7 +1213,7 @@ var standard = {
             if (options.useMetalness) {
                 code += chunks.envBrdfApproxPS;
             } else {
-                code += chunks.envBrdfNonePS;
+                code += options.shadingModel === SPECULAR_PHONG ? chunks.envBrdfNonePS : chunks.envBrdfOldPS;
             }
 
             var reflectionDecode = options.rgbmReflection ? "decodeRGBM" : (options.hdrReflection ? "" : "gammaCorrectInput");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+vec3 envBrdf(vec3 f0, float glossiness, vec3 normal) {`
	`2`	`+ return f0;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1213,7 +1213,7 @@ var standard = {`
`1213`	`1213`	`if (options.useMetalness) {`
`1214`	`1214`	`code += chunks.envBrdfApproxPS;`
`1215`	`1215`	`} else {`
`1216`		`- code += chunks.envBrdfNonePS;`
	`1216`	`+ code += options.shadingModel === SPECULAR_PHONG ? chunks.envBrdfNonePS : chunks.envBrdfOldPS;`
`1217`	`1217`	`}`
`1218`	`1218`
`1219`	`1219`	`var reflectionDecode = options.rgbmReflection ? "decodeRGBM" : (options.hdrReflection ? "" : "gammaCorrectInput");`