Nodes: Renamed DFGApprox to DFG (#32399)

Author: mrdoob

src/Three.TSL.js

@@ -7,7 +7,7 @@ export const BasicShadowFilter = TSL.BasicShadowFilter;
 export const Break = TSL.Break;
 export const Const = TSL.Const;
 export const Continue = TSL.Continue;
-export const DFGApprox = TSL.DFGApprox;
+export const DFGLUT = TSL.DFGLUT;
 export const D_GGX = TSL.D_GGX;
 export const Discard = TSL.Discard;
 export const EPSILON = TSL.EPSILON;

src/nodes/TSL.js

@@ -163,7 +163,7 @@ export * from './materialx/MaterialXNodes.js';
 export { default as BRDF_GGX } from './functions/BSDF/BRDF_GGX.js';
 export { default as BRDF_Lambert } from './functions/BSDF/BRDF_Lambert.js';
 export { default as D_GGX } from './functions/BSDF/D_GGX.js';
-export { default as DFGApprox } from './functions/BSDF/DFGApprox.js';
+export { default as DFGLUT } from './functions/BSDF/DFGLUT.js';
 export { default as F_Schlick } from './functions/BSDF/F_Schlick.js';
 export { default as Schlick_to_F0 } from './functions/BSDF/Schlick_to_F0.js';
 export { default as V_GGX_SmithCorrelated } from './functions/BSDF/V_GGX_SmithCorrelated.js';

src/nodes/functions/BSDF/BRDF_GGX_Multiscatter.js

@@ -1,5 +1,5 @@
 import BRDF_GGX from './BRDF_GGX.js';
-import DFGApprox from './DFGApprox.js';
+import DFGLUT from './DFGLUT.js';
 import { normalView } from '../../accessors/Normal.js';
 import { positionViewDirection } from '../../accessors/Position.js';
 import { EPSILON } from '../../math/MathNode.js';
@@ -19,8 +19,8 @@ const BRDF_GGX_Multiscatter = /*@__PURE__*/ Fn( ( { lightDirection, f0, f90, rou
 	const dotNV = normalView.dot( positionViewDirection ).clamp();
 
 	// Precomputed DFG values for view and light directions
-	const dfgV = DFGApprox( { roughness: _roughness, dotNV } );
-	const dfgL = DFGApprox( { roughness: _roughness, dotNV: dotNL } );
+	const dfgV = DFGLUT( { roughness: _roughness, dotNV } );
+	const dfgL = DFGLUT( { roughness: _roughness, dotNV: dotNL } );
 
 	// Single-scattering energy for view and light
 	const FssEss_V = f0.mul( dfgV.x ).add( f90.mul( dfgV.y ) );

src/nodes/functions/BSDF/DFGApprox.js renamed to src/nodes/functions/BSDF/DFGLUT.js

@@ -32,7 +32,7 @@ const DATA = new Uint16Array( [
 
 let lut = null;
 
-const DFGApprox = /*@__PURE__*/ Fn( ( { roughness, dotNV } ) => {
+const DFGLUT = /*@__PURE__*/ Fn( ( { roughness, dotNV } ) => {
 
 	if ( lut === null ) {
 
@@ -53,4 +53,4 @@ const DFGApprox = /*@__PURE__*/ Fn( ( { roughness, dotNV } ) => {
 
 } );
 
-export default DFGApprox;
+export default DFGLUT;

src/nodes/functions/BSDF/EnvironmentBRDF.js

@@ -1,11 +1,11 @@
-import DFGApprox from './DFGApprox.js';
+import DFGLUT from './DFGLUT.js';
 import { Fn } from '../../tsl/TSLBase.js';
 
 const EnvironmentBRDF = /*@__PURE__*/ Fn( ( inputs ) => {
 
 	const { dotNV, specularColor, specularF90, roughness } = inputs;
 
-	const fab = DFGApprox( { dotNV, roughness } );
+	const fab = DFGLUT( { dotNV, roughness } );
 	return specularColor.mul( fab.x ).add( specularF90.mul( fab.y ) );
 
 } );

src/nodes/functions/PhysicalLightingModel.js

@@ -1,7 +1,7 @@
 import BRDF_Lambert from './BSDF/BRDF_Lambert.js';
 import BRDF_GGX from './BSDF/BRDF_GGX.js';
 import BRDF_GGX_Multiscatter from './BSDF/BRDF_GGX_Multiscatter.js';
-import DFGApprox from './BSDF/DFGApprox.js';
+import DFGLUT from './BSDF/DFGLUT.js';
 import EnvironmentBRDF from './BSDF/EnvironmentBRDF.js';
 import F_Schlick from './BSDF/F_Schlick.js';
 import Schlick_to_F0 from './BSDF/Schlick_to_F0.js';
@@ -571,7 +571,7 @@ class PhysicalLightingModel extends LightingModel {
 
 		const dotNV = normalView.dot( positionViewDirection ).clamp(); // @ TODO: Move to core dotNV
 
-		const fab = DFGApprox( { roughness, dotNV } );
+		const fab = DFGLUT( { roughness, dotNV } );
 
 		const Fr = iridescenceF0 ? iridescence.mix( f0, iridescenceF0 ) : f0;
 

utils/generateDFGLUT.js

@@ -297,7 +297,7 @@ ${rows.join( ',\n' )}
 
 let lut = null;
 
-const DFGApprox = /*@__PURE__*/ Fn( ( { roughness, dotNV } ) => {
+const DFG = /*@__PURE__*/ Fn( ( { roughness, dotNV } ) => {
 
 	if ( lut === null ) {
 
@@ -318,14 +318,14 @@ const DFGApprox = /*@__PURE__*/ Fn( ( { roughness, dotNV } ) => {
 
 } );
 
-export default DFGApprox;
+export default DFG;
 `;
 
 	fs.writeFileSync( './src/renderers/shaders/DFGLUTData.js', webgl );
 	console.log( 'Saved WebGL version to ./src/renderers/shaders/DFGLUTData.js' );
 
-	fs.writeFileSync( './src/nodes/functions/BSDF/DFGApprox.js', webgpu );
-	console.log( 'Saved WebGPU version to ./src/nodes/functions/BSDF/DFGApprox.js' );
+	fs.writeFileSync( './src/nodes/functions/BSDF/DFG.js', webgpu );
+	console.log( 'Saved WebGPU version to ./src/nodes/functions/BSDF/DFG.js' );
 
 }