Browse Source

Merge pull request #7546 from WestLangley/dev-env

MeshStandardMaterial: Fix envMapIntensity
Mr.doob 9 years ago
parent
commit
176ae43bd9

+ 2 - 0
src/materials/MeshStandardMaterial.js

@@ -39,6 +39,8 @@
  *  alphaMap: new THREE.Texture( <Image> ),
  *  alphaMap: new THREE.Texture( <Image> ),
  *
  *
  *  envMap: new THREE.CubeTexture( [posx, negx, posy, negy, posz, negz] ),
  *  envMap: new THREE.CubeTexture( [posx, negx, posy, negy, posz, negz] ),
+ *  envMapIntensity: <float>
+ *
  *  refractionRatio: <float>,
  *  refractionRatio: <float>,
  *
  *
  *  shading: THREE.SmoothShading,
  *  shading: THREE.SmoothShading,

+ 1 - 0
src/renderers/shaders/ShaderChunk/envmap_pars_fragment.glsl

@@ -1,5 +1,6 @@
 #if defined( USE_ENVMAP ) || defined( STANDARD )
 #if defined( USE_ENVMAP ) || defined( STANDARD )
 	uniform float reflectivity;
 	uniform float reflectivity;
+	uniform float envMapIntenstiy;
 #endif
 #endif
 
 
 #ifdef USE_ENVMAP
 #ifdef USE_ENVMAP

+ 2 - 2
src/renderers/shaders/ShaderChunk/lights_pars.glsl

@@ -167,7 +167,7 @@ vec3 getAmbientLightIrradiance( const in vec3 ambientLightColor ) {
 
 
 		envMapColor.rgb = inputToLinear( envMapColor.rgb );
 		envMapColor.rgb = inputToLinear( envMapColor.rgb );
 
 
-		return PI * envMapColor.rgb;
+		return PI * envMapColor.rgb * envMapIntensity;
 
 
 	}
 	}
 
 
@@ -241,7 +241,7 @@ vec3 getAmbientLightIrradiance( const in vec3 ambientLightColor ) {
 
 
 		envMapColor.rgb = inputToLinear( envMapColor.rgb );
 		envMapColor.rgb = inputToLinear( envMapColor.rgb );
 
 
-		return envMapColor.rgb;
+		return envMapColor.rgb * envMapIntensity;
 
 
 	}
 	}