Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #17273 from EliasHasle/patch-12

Simplify FogExp2 GLSL, correct documentation and rename internal fogExp param. to fogExp2
Mr.doob 6 years ago
parent
147ad0071d a82a98769d
commit
a37ada09b2
4 changed files with 6 additions and 6 deletions
Unified View Show Diff Stats
  1. 1 1
      docs/api/en/scenes/FogExp2.html
  2. 1 1
      src/renderers/shaders/ShaderChunk/fog_fragment.glsl.js
  3. 2 2
      src/renderers/webgl/WebGLProgram.js
  4. 2 2
      src/renderers/webgl/WebGLPrograms.js

+ 1 - 1
docs/api/en/scenes/FogExp2.html
View File 

@@ -10,7 +10,7 @@
 
 	<body>
 
 	<body>
 
 		<h1>[name]</h1>
 
 		<h1>[name]</h1>
 
 
 
-		<p class="desc">This class contains the parameters that define exponential fog, i.e., that grows exponentially denser with the distance.</p>
 
+		<p class="desc">This class contains the parameters that define exponential squared fog, which gives a clear view near the camera and a faster than exponentially densening fog farther from the camera.</p>
 
 
 
 
 
 		<h2>Constructor</h2>
 
 		<h2>Constructor</h2>

+ 1 - 1
src/renderers/shaders/ShaderChunk/fog_fragment.glsl.js
View File 

@@ -3,7 +3,7 @@ export default /* glsl */`
 
 
 
 	#ifdef FOG_EXP2
 
 	#ifdef FOG_EXP2
 
 
 
-		float fogFactor = whiteCompliment( exp2( - fogDensity * fogDensity * fogDepth * fogDepth * LOG2 ) );
 
+		float fogFactor = 1.0 - exp( - fogDensity * fogDensity * fogDepth * fogDepth );
 
 
 
 	#else
 
 	#else

+ 2 - 2
src/renderers/webgl/WebGLProgram.js
View File 

@@ -380,7 +380,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 
 
 			'#define MAX_BONES ' + parameters.maxBones,
 
 			'#define MAX_BONES ' + parameters.maxBones,
 
 			( parameters.useFog && parameters.fog ) ? '#define USE_FOG' : '',
 
 			( parameters.useFog && parameters.fog ) ? '#define USE_FOG' : '',
 
-			( parameters.useFog && parameters.fogExp ) ? '#define FOG_EXP2' : '',
 
+			( parameters.useFog && parameters.fogExp2 ) ? '#define FOG_EXP2' : '',
 
 
 
 			parameters.map ? '#define USE_MAP' : '',
 
 			parameters.map ? '#define USE_MAP' : '',
 
 			parameters.envMap ? '#define USE_ENVMAP' : '',
 
 			parameters.envMap ? '#define USE_ENVMAP' : '',
 
@@ -495,7 +495,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 			'#define GAMMA_FACTOR ' + gammaFactorDefine,
 
 			'#define GAMMA_FACTOR ' + gammaFactorDefine,
 
 
 
 			( parameters.useFog && parameters.fog ) ? '#define USE_FOG' : '',
 
 			( parameters.useFog && parameters.fog ) ? '#define USE_FOG' : '',
 
-			( parameters.useFog && parameters.fogExp ) ? '#define FOG_EXP2' : '',
 
+			( parameters.useFog && parameters.fogExp2 ) ? '#define FOG_EXP2' : '',
 
 
 
 			parameters.map ? '#define USE_MAP' : '',
 
 			parameters.map ? '#define USE_MAP' : '',
 
 			parameters.matcap ? '#define USE_MATCAP' : '',
 
 			parameters.matcap ? '#define USE_MATCAP' : '',

+ 2 - 2
src/renderers/webgl/WebGLPrograms.js
View File 

@@ -31,7 +31,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 		"precision", "supportsVertexTextures", "map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding",
 
 		"precision", "supportsVertexTextures", "map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding",
 
 		"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "clearCoatNormalMap", "displacementMap", "specularMap",
 
 		"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "clearCoatNormalMap", "displacementMap", "specularMap",
 
 		"roughnessMap", "metalnessMap", "gradientMap",
 
 		"roughnessMap", "metalnessMap", "gradientMap",
 
-		"alphaMap", "combine", "vertexColors", "vertexTangents", "fog", "useFog", "fogExp",
 
+		"alphaMap", "combine", "vertexColors", "vertexTangents", "fog", "useFog", "fogExp2",
 
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 
 		"maxMorphTargets", "maxMorphNormals", "premultipliedAlpha",
 
 		"maxMorphTargets", "maxMorphNormals", "premultipliedAlpha",
 
@@ -170,7 +170,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 
 
 			fog: !! fog,
 
 			fog: !! fog,
 
 			useFog: material.fog,
 
 			useFog: material.fog,
 
-			fogExp: ( fog && fog.isFogExp2 ),
 
+			fogExp2: ( fog && fog.isFogExp2 ),
 
 
 
 			flatShading: material.flatShading,
 
 			flatShading: material.flatShading,