Browse Source

Merged ambient uniform into lights uniform.

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

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

@@ -33,7 +33,6 @@ THREE.ShaderLib = {
 			THREE.UniformsLib[ "lightmap" ],
 			THREE.UniformsLib[ "emissivemap" ],
 			THREE.UniformsLib[ "fog" ],
-			THREE.UniformsLib[ "ambient" ],
 			THREE.UniformsLib[ "lights" ],
 
 			{
@@ -59,7 +58,6 @@ THREE.ShaderLib = {
 			THREE.UniformsLib[ "normalmap" ],
 			THREE.UniformsLib[ "displacementmap" ],
 			THREE.UniformsLib[ "fog" ],
-			THREE.UniformsLib[ "ambient" ],
 			THREE.UniformsLib[ "lights" ],
 
 			{
@@ -89,7 +87,6 @@ THREE.ShaderLib = {
 			THREE.UniformsLib[ "roughnessmap" ],
 			THREE.UniformsLib[ "metalnessmap" ],
 			THREE.UniformsLib[ "fog" ],
-			THREE.UniformsLib[ "ambient" ],
 			THREE.UniformsLib[ "lights" ],
 
 			{

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

@@ -85,14 +85,10 @@ THREE.UniformsLib = {
 
 	},
 
-	ambient: {
-
-		"ambientLightColor": { type: "fv", value: [] }
-
-	},
-
 	lights: {
 
+		"ambientLightColor": { type: "fv", value: [] },
+
 		"directionalLights": { type: "sa", value: [], properties: {
 			"direction": { type: "v3" },
 			"color": { type: "c" },