Merge pull request #17176 from sunag/dev-energy-preservation

Remove non-ENERGY_PRESERVATION code

src/materials/MeshStandardMaterial.js

@@ -44,8 +44,6 @@ import { Color } from '../math/Color.js';
  *  envMap: new THREE.CubeTexture( [posx, negx, posy, negy, posz, negz] ),
  *  envMapIntensity: <float>
  *
- *  energyPreservation: <bool>,
- *
  *  refractionRatio: <float>,
  *
  *  wireframe: <boolean>,
@@ -101,8 +99,6 @@ function MeshStandardMaterial( parameters ) {
 	this.envMap = null;
 	this.envMapIntensity = 1.0;
 
-	this.energyPreservation = true;
-
 	this.refractionRatio = 0.98;
 
 	this.wireframe = false;
@@ -165,8 +161,6 @@ MeshStandardMaterial.prototype.copy = function ( source ) {
 	this.envMap = source.envMap;
 	this.envMapIntensity = source.envMapIntensity;
 
-	this.energyPreservation = source.energyPreservation;
-
 	this.refractionRatio = source.refractionRatio;
 
 	this.wireframe = source.wireframe;

src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js

@@ -116,13 +116,6 @@ void RE_Direct_Physical( const in IncidentLight directLight, const in GeometricC
 
 void RE_IndirectDiffuse_Physical( const in vec3 irradiance, const in GeometricContext geometry, const in PhysicalMaterial material, inout ReflectedLight reflectedLight ) {
 
-	// Defer to the IndirectSpecular function to compute
-	// the indirectDiffuse if energy preservation is enabled.
-	#ifndef ENERGY_PRESERVATION
-
-		reflectedLight.indirectDiffuse += irradiance * BRDF_Diffuse_Lambert( material.diffuseColor );
-
-	#endif
 
 }
 
@@ -157,23 +150,22 @@ void RE_IndirectSpecular_Physical( const in vec3 radiance, const in vec3 irradia
 
 	// Both indirect specular and diffuse light accumulate here
 	// if energy preservation enabled, and PMREM provided.
-	#if defined( ENERGY_PRESERVATION )
 
-		vec3 singleScattering = vec3( 0.0 );
-		vec3 multiScattering = vec3( 0.0 );
-		vec3 cosineWeightedIrradiance = irradiance * RECIPROCAL_PI;
+	vec3 singleScattering = vec3( 0.0 );
+	vec3 multiScattering = vec3( 0.0 );
+	vec3 cosineWeightedIrradiance = irradiance * RECIPROCAL_PI;
 
-		BRDF_Specular_Multiscattering_Environment( geometry, material.specularColor, material.specularRoughness, singleScattering, multiScattering );
+	BRDF_Specular_Multiscattering_Environment( geometry, material.specularColor, material.specularRoughness, singleScattering, multiScattering );
 
-		vec3 diffuse = material.diffuseColor * ( 1.0 - ( singleScattering + multiScattering ) );
+	vec3 diffuse = material.diffuseColor * ( 1.0 - ( singleScattering + multiScattering ) );
 
-		reflectedLight.indirectSpecular += clearCoatInv * radiance * singleScattering;
-		reflectedLight.indirectDiffuse += multiScattering * cosineWeightedIrradiance;
-		reflectedLight.indirectDiffuse += diffuse * cosineWeightedIrradiance;
+	reflectedLight.indirectSpecular += clearCoatInv * radiance * singleScattering;
+	reflectedLight.indirectDiffuse += multiScattering * cosineWeightedIrradiance;
+	reflectedLight.indirectDiffuse += diffuse * cosineWeightedIrradiance;
 
-	#else
+	#ifndef STANDARD
 
-		reflectedLight.indirectSpecular += clearCoatInv * radiance * BRDF_Specular_GGX_Environment( geometry.viewDir, geometry.normal, material.specularColor, material.specularRoughness );
+		reflectedLight.indirectSpecular += clearCoatRadiance * material.clearCoat * BRDF_Specular_GGX_Environment( geometry, vec3( DEFAULT_SPECULAR_COEFFICIENT ), material.clearCoatRoughness );
 
 	#endif
 

src/renderers/webgl/WebGLProgram.js

@@ -529,8 +529,6 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 			parameters.physicallyCorrectLights ? '#define PHYSICALLY_CORRECT_LIGHTS' : '',
 
-			parameters.energyPreservation ? '#define ENERGY_PRESERVATION' : '',
-
 			parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
 			parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
 

src/renderers/webgl/WebGLPrograms.js

@@ -206,8 +206,6 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 			toneMapping: renderer.toneMapping,
 			physicallyCorrectLights: renderer.physicallyCorrectLights,
 
-			energyPreservation: material.energyPreservation,
-
 			premultipliedAlpha: material.premultipliedAlpha,
 
 			alphaTest: material.alphaTest,