Merged ambient_pars.glsl into lights_pars.glsl

examples/js/ShaderSkin.js

@@ -83,7 +83,6 @@ THREE.ShaderSkin = {
 
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "bsdfs" ],
-			THREE.ShaderChunk[ "ambient_pars" ],
 			THREE.ShaderChunk[ "lights_pars" ],
 			THREE.ShaderChunk[ "shadowmap_pars_fragment" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
@@ -366,7 +365,6 @@ THREE.ShaderSkin = {
 			"varying vec3 vViewPosition;",
 
 			THREE.ShaderChunk[ "common" ],
-			THREE.ShaderChunk[ "ambient_pars" ],
 			THREE.ShaderChunk[ "lights_pars" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 

examples/js/ShaderTerrain.js

@@ -87,7 +87,6 @@ THREE.ShaderTerrain = {
 
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "bsdfs" ],
-			THREE.ShaderChunk[ "ambient_pars" ],
 			THREE.ShaderChunk[ "lights_pars" ],
 			THREE.ShaderChunk[ "shadowmap_pars_fragment" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],

examples/js/loaders/MMDLoader.js

@@ -3754,7 +3754,6 @@ THREE.ShaderLib[ 'mmd' ] = {
 		THREE.ShaderChunk[ "envmap_pars_fragment" ],
 		THREE.ShaderChunk[ "fog_pars_fragment" ],
 		THREE.ShaderChunk[ "bsdfs" ],
-		THREE.ShaderChunk[ "ambient_pars" ],
 		THREE.ShaderChunk[ "lights_pars" ],
 		THREE.ShaderChunk[ "lights_phong_pars_fragment" ],
 		THREE.ShaderChunk[ "shadowmap_pars_fragment" ],

examples/js/nodes/materials/PhongNode.js

@@ -145,7 +145,6 @@ THREE.PhongNode.prototype.build = function( builder ) {
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 			THREE.ShaderChunk[ "bsdfs" ],
-			THREE.ShaderChunk[ "ambient_pars" ],
 			THREE.ShaderChunk[ "lights_pars" ],
 			THREE.ShaderChunk[ "lights_phong_pars_fragment" ],
 			THREE.ShaderChunk[ "shadowmap_pars_fragment" ],

examples/js/nodes/materials/StandardNode.js

@@ -158,7 +158,6 @@ THREE.StandardNode.prototype.build = function( builder ) {
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 			THREE.ShaderChunk[ "bsdfs" ],
-			THREE.ShaderChunk[ "ambient_pars" ],
 			THREE.ShaderChunk[ "lights_pars" ],
 			THREE.ShaderChunk[ "lights_standard_pars_fragment" ],
 			THREE.ShaderChunk[ "shadowmap_pars_fragment" ],

examples/webgl_shaders_tonemapping.html

@@ -161,7 +161,6 @@
 
 						THREE.ShaderChunk[ "common" ],
 						THREE.ShaderChunk[ "bsdfs" ],
-						THREE.ShaderChunk[ "ambient_pars" ],
 						THREE.ShaderChunk[ "lights_pars" ],
 						THREE.ShaderChunk[ "lights_phong_pars_fragment" ],
 

src/renderers/shaders/ShaderChunk/ambient_pars.glsl

@@ -1,7 +0,0 @@
-uniform vec3 ambientLightColor;
-
-vec3 getAmbientLightIrradiance( const in vec3 ambientLightColor ) {
-
-	return PI * ambientLightColor;
-
-}

src/renderers/shaders/ShaderChunk/lights_pars.glsl

@@ -1,3 +1,11 @@
+uniform vec3 ambientLightColor;
+
+vec3 getAmbientLightIrradiance( const in vec3 ambientLightColor ) {
+
+	return PI * ambientLightColor;
+
+}
+
 #if NUM_DIR_LIGHTS > 0
 
 	struct DirectionalLight {

src/renderers/shaders/ShaderLib/meshlambert_frag.glsl

@@ -21,7 +21,6 @@ varying vec3 vLightFront;
 #include <emissivemap_pars_fragment>
 #include <envmap_pars_fragment>
 #include <bsdfs>
-#include <ambient_pars>
 #include <lights_pars>
 #include <fog_pars_fragment>
 #include <shadowmap_pars_fragment>

src/renderers/shaders/ShaderLib/meshphong_frag.glsl

@@ -18,7 +18,6 @@ uniform float opacity;
 #include <envmap_pars_fragment>
 #include <fog_pars_fragment>
 #include <bsdfs>
-#include <ambient_pars>
 #include <lights_pars>
 #include <lights_phong_pars_fragment>
 #include <shadowmap_pars_fragment>

src/renderers/shaders/ShaderLib/meshstandard_frag.glsl

@@ -28,7 +28,6 @@ varying vec3 vViewPosition;
 #include <envmap_pars_fragment>
 #include <fog_pars_fragment>
 #include <bsdfs>
-#include <ambient_pars>
 #include <cube_uv_reflection_fragment>
 #include <lights_pars>
 #include <lights_standard_pars_fragment>

utils/build/includes/common.json

@@ -121,7 +121,6 @@
 	"src/renderers/shaders/ShaderChunk/alphamap_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/alphamap_pars_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl",
-	"src/renderers/shaders/ShaderChunk/ambient_pars.glsl",
 	"src/renderers/shaders/ShaderChunk/aomap_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/aomap_pars_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/begin_vertex.glsl",