Browse Source

ShaderLib: Using fog uniforms in points.

Mr.doob 9 years ago
parent
commit
c8e9852dac
2 changed files with 2 additions and 6 deletions
  1. 1 0
      src/renderers/shaders/ShaderLib.js
  2. 1 6
      src/renderers/shaders/UniformsLib.js

+ 1 - 0
src/renderers/shaders/ShaderLib.js

@@ -581,6 +581,7 @@ THREE.ShaderLib = {
 		uniforms: THREE.UniformsUtils.merge( [
 
 			THREE.UniformsLib[ "points" ],
+			THREE.UniformsLib[ "fog" ],
 			THREE.UniformsLib[ "shadowmap" ]
 
 		] ),

+ 1 - 6
src/renderers/shaders/UniformsLib.js

@@ -130,12 +130,7 @@ THREE.UniformsLib = {
 		"size" : { type: "f", value: 1.0 },
 		"scale" : { type: "f", value: 1.0 },
 		"map" : { type: "t", value: null },
-		"offsetRepeat" : { type: "v4", value: new THREE.Vector4( 0, 0, 1, 1 ) },
-
-		"fogDensity" : { type: "f", value: 0.00025 },
-		"fogNear" : { type: "f", value: 1 },
-		"fogFar" : { type: "f", value: 2000 },
-		"fogColor" : { type: "c", value: new THREE.Color( 0xffffff ) }
+		"offsetRepeat" : { type: "v4", value: new THREE.Vector4( 0, 0, 1, 1 ) }
 
 	},