RectAreaLightUniformsLib clean up.

examples/js/lights/RectAreaLightUniformsLib.js

@@ -54,49 +54,47 @@ Object.assign(THREE.ShaderLib, {
 
 	'phong': {
 
-		uniforms: THREE.UniformsUtils.merge( [
-
-			THREE.UniformsLib[ 'common' ],
-			THREE.UniformsLib[ 'aomap' ],
-			THREE.UniformsLib[ 'lightmap' ],
-			THREE.UniformsLib[ 'emissivemap' ],
-			THREE.UniformsLib[ 'bumpmap' ],
-			THREE.UniformsLib[ 'normalmap' ],
-			THREE.UniformsLib[ 'displacementmap' ],
-			THREE.UniformsLib[ 'fog' ],
-			THREE.UniformsLib[ 'ltc_brdf' ],
-			THREE.UniformsLib[ 'lights' ],
-
+		uniforms: Object.assign( {},
+
+			THREE.UniformsLib.common,
+			THREE.UniformsLib.aomap,
+			THREE.UniformsLib.lightmap,
+			THREE.UniformsLib.emissivemap,
+			THREE.UniformsLib.bumpmap,
+			THREE.UniformsLib.normalmap,
+			THREE.UniformsLib.displacementmap,
+			THREE.UniformsLib.fog,
+			THREE.UniformsLib.ltc_brdf,
+			THREE.UniformsLib.lights,
 			{
 				"emissive" : { value: new THREE.Color( 0x000000 ) },
 				"specular" : { value: new THREE.Color( 0x111111 ) },
 				"shininess": { value: 30 }
 			}
 
-		] ),
+		),
 
-		vertexShader: THREE.ShaderChunk[ 'meshphong_vert' ],
-		fragmentShader: THREE.ShaderChunk[ 'meshphong_frag' ]
+		vertexShader: THREE.ShaderChunk.meshphong_vert,
+		fragmentShader: THREE.ShaderChunk.meshphong_frag
 
 	},
 
 	'standard': {
 
-		uniforms: THREE.UniformsUtils.merge( [
-
-			THREE.UniformsLib[ 'common' ],
-			THREE.UniformsLib[ 'aomap' ],
-			THREE.UniformsLib[ 'lightmap' ],
-			THREE.UniformsLib[ 'emissivemap' ],
-			THREE.UniformsLib[ 'bumpmap' ],
-			THREE.UniformsLib[ 'normalmap' ],
-			THREE.UniformsLib[ 'displacementmap' ],
-			THREE.UniformsLib[ 'roughnessmap' ],
-			THREE.UniformsLib[ 'metalnessmap' ],
-			THREE.UniformsLib[ 'fog' ],
-			THREE.UniformsLib[ 'ltc_brdf' ],
-			THREE.UniformsLib[ 'lights' ],
-
+		uniforms: Object.assign( {},
+
+			THREE.UniformsLib.common,
+			THREE.UniformsLib.aomap,
+			THREE.UniformsLib.lightmap,
+			THREE.UniformsLib.emissivemap,
+			THREE.UniformsLib.bumpmap,
+			THREE.UniformsLib.normalmap,
+			THREE.UniformsLib.displacementmap,
+			THREE.UniformsLib.roughnessmap,
+			THREE.UniformsLib.metalnessmap,
+			THREE.UniformsLib.fog,
+			THREE.UniformsLib.ltc_brdf,
+			THREE.UniformsLib.lights,
 			{
 				"emissive" : { value: new THREE.Color( 0x000000 ) },
 				"roughness": { value: 0.5 },
@@ -104,30 +102,29 @@ Object.assign(THREE.ShaderLib, {
 				"envMapIntensity" : { value: 1 }, // temporary
 			}
 
-		] ),
+		),
 
-		vertexShader: THREE.ShaderChunk[ 'meshphysical_vert' ],
-		fragmentShader: THREE.ShaderChunk[ 'meshphysical_frag' ]
+		vertexShader: THREE.ShaderChunk.meshphysical_vert,
+		fragmentShader: THREE.ShaderChunk.meshphysical_frag
 
 	},
 
 } );
 
 // Standard must be redefined before defining physical
-THREE.ShaderLib[ 'physical' ] = {
-
-	uniforms: THREE.UniformsUtils.merge( [
+THREE.ShaderLib.physical = {
 
-		THREE.ShaderLib[ 'standard' ].uniforms,
+	uniforms: Object.assign( {},
 
+		THREE.ShaderLib.standard.uniforms,
 		{
 			"clearCoat": { value: 0 },
 			"clearCoatRoughness": { value: 0 }
 		}
 
-	] ),
+	),
 
-	vertexShader: THREE.ShaderChunk[ 'meshphysical_vert' ],
-	fragmentShader: THREE.ShaderChunk[ 'meshphysical_frag' ]
+	vertexShader: THREE.ShaderChunk.meshphysical_vert,
+	fragmentShader: THREE.ShaderChunk.meshphysical_frag
 
 };