Renamed ShaderLib's 'normal2' shader to 'normalmap' as suggested in 4276c9f5882044272ca3a5a8796380a206121fc2.

examples/misc_controls_fly.html

@@ -117,7 +117,7 @@
 
 				var moonTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
 
-				var shader = THREE.ShaderLib[ "normal2" ];
+				var shader = THREE.ShaderLib[ "normalmap" ];
 				var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 				uniforms[ "tNormal" ].value = normalTexture;

examples/webgl_loader_ctm.html

@@ -188,7 +188,7 @@
 
 					var ambient = 0xffffff, diffuse = 0xffffff, specular = 0x0e0e0e, shininess = 50;
 
-					var shader = THREE.ShaderLib[ "normal2" ];
+					var shader = THREE.ShaderLib[ "normalmap" ];
 					var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 					uniforms[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );

examples/webgl_materials_normalmap.html

@@ -155,7 +155,7 @@
 
 				// normal map shader
 
-				var shader = THREE.ShaderLib[ "normal2" ];
+				var shader = THREE.ShaderLib[ "normalmap" ];
 				var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 				uniforms[ "enableAO" ].value = true;

examples/webgl_materials_normalmap2.html

@@ -122,7 +122,7 @@
 
 				var ambient = 0x111111, diffuse = 0xbbbbbb, specular = 0x060606, shininess = 35;
 
-				var shader = THREE.ShaderLib[ "normal2" ];
+				var shader = THREE.ShaderLib[ "normalmap" ];
 				var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 				uniforms[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );

examples/webgl_postprocessing_advanced.html

@@ -330,7 +330,7 @@
 
 				var ambient = 0x444444, diffuse = 0x999999, specular = 0x080808, shininess = 20;
 
-				var shader = THREE.ShaderLib[ "normal2" ];
+				var shader = THREE.ShaderLib[ "normalmap" ];
 				var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 				uniforms[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );

src/loaders/Loader.js

@@ -371,7 +371,7 @@ THREE.Loader.prototype = {
 
 		if ( m.mapNormal ) {
 
-			var shader = THREE.ShaderLib[ "normal2" ];
+			var shader = THREE.ShaderLib[ "normalmap" ];
 			var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 			uniforms[ "tNormal" ].value = mpars.normalMap;

src/loaders/SceneLoader.js

@@ -1048,7 +1048,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 		if ( matJSON.parameters.normalMap ) {
 
-			var shader = THREE.ShaderLib[ "normal2" ];
+			var shader = THREE.ShaderLib[ "normalmap" ];
 			var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
 
 			var diffuse = matJSON.parameters.color;

src/renderers/WebGLShaders.js

@@ -2481,7 +2481,7 @@ THREE.ShaderLib = {
 	//		- point and directional lights (use with "lights: true" material option)
 	 ------------------------------------------------------------------------- */
 
-	'normal2' : {
+	'normalmap' : {
 
 		uniforms: THREE.UniformsUtils.merge( [