x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/Layout/ScreenGroup.js

@@ -56,19 +56,17 @@ define ([
 	"x_ite/Bits/TraverseType",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Vector4",
-	"standard/Math/Numbers/Rotation4",
 	"standard/Math/Numbers/Matrix4",
 	"standard/Math/Geometry/ViewVolume",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DGroupingNode, 
+          X3DGroupingNode,
           X3DConstants,
           TraverseType,
           Vector3,
           Vector4,
-          Rotation4,
           Matrix4,
           ViewVolume)
 {
@@ -80,7 +78,7 @@ function (Fields,
 
 		this .addType (X3DConstants .ScreenGroup);
 
-		this .screenMatrix = new Matrix4 ();
+		this .matrix = new Matrix4 ();
 	}
 
 	ScreenGroup .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
@@ -88,6 +86,8 @@ function (Fields,
 		constructor: ScreenGroup,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",       new Fields .SFNode ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",        new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay",    new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",       new Fields .SFVec3f (-1, -1, -1)),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",     new Fields .SFVec3f ()),
 			new X3DFieldDefinition (X3DConstants .inputOnly,      "addChildren",    new Fields .MFNode ()),
@@ -106,19 +106,12 @@ function (Fields,
 		{
 			return "children";
 		},
-		getBBox: function (bbox)
+		getBBox: function (bbox, shadow)
 		{
-			return X3DGroupingNode .prototype .getBBox .call (this, bbox) .multRight (this .getMatrix ());
+			return X3DGroupingNode .prototype .getBBox .call (this, bbox, shadow) .multRight (this .matrix);
 		},
 		getMatrix: function ()
 		{
-			try
-			{
-				this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
-			}
-			catch (error)
-			{ }
-
 			return this .matrix;
 		},
 		scale: (function ()
@@ -127,18 +120,18 @@ function (Fields,
 				x            = new Vector4 (0, 0, 0, 0),
 				y            = new Vector4 (0, 0, 0, 0),
 				z            = new Vector4 (0, 0, 0, 0),
-				screenPoint  = new Vector3 (0, 0, 0);
+				screenPoint  = new Vector3 (0, 0, 0),
+				screenMatrix = new Matrix4 ();
 
 			return function (renderObject)
 			{
 				// throws domain error
-	
+
 				var
 					modelViewMatrix  = renderObject .getModelViewMatrix () .get (),
 					projectionMatrix = renderObject .getProjectionMatrix () .get (),
-					viewport         = renderObject .getViewVolume () .getViewport (),
-					screenMatrix     = this .screenMatrix;
-			
+					viewport         = renderObject .getViewVolume () .getViewport ();
+
 				// Determine screenMatrix.
 				// Same as in ScreenText.
 
@@ -156,7 +149,7 @@ function (Fields,
 				                   y .x, y .y, y .z, y .w,
 				                   z .x, z .y, z .z, z .w,
 				                   modelViewMatrix [12], modelViewMatrix [13], modelViewMatrix [14], modelViewMatrix [15]);
-	
+
 				// Snap to whole pixel.
 
 				ViewVolume .projectPoint (Vector3 .Zero, screenMatrix, projectionMatrix, viewport, screenPoint);
@@ -168,32 +161,35 @@ function (Fields,
 
 				screenPoint .z = 0;
 				screenMatrix .translate (screenPoint);
-	
-				// Return modelViewMatrix
-	
-				return screenMatrix;
+
+				// Assign relative matrix.
+
+				this .matrix .assign (modelViewMatrix) .inverse () .multLeft (screenMatrix);
 			};
 		})(),
 		traverse: function (type, renderObject)
 		{
 			try
 			{
-				var modelViewMatrix = renderObject .getModelViewMatrix ();
-
 				switch (type)
 				{
 					case TraverseType .CAMERA:
-					case TraverseType .DEPTH: // ???
+					case TraverseType .PICKING:
+					case TraverseType .SHADOW: // ???
 						// No clone support for shadow, generated cube map texture and bbox
-						modelViewMatrix .pushMatrix (this .screenMatrix);
 						break;
 					default:
-						modelViewMatrix .pushMatrix (this .scale (renderObject));
+						this .scale (renderObject);
 						break;
 				}
 
+				var modelViewMatrix = renderObject .getModelViewMatrix ();
+
+				modelViewMatrix .push ();
+				modelViewMatrix .multLeft (this .matrix);
+
 				X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
-	
+
 				modelViewMatrix .pop ();
 			}
 			catch (error)
@@ -203,5 +199,3 @@ function (Fields,
 
 	return ScreenGroup;
 });
-
-

package/src/x_ite/Components/Lighting/DirectionalLight.js

@@ -85,7 +85,7 @@ function (Fields,
 "use strict";
 
 	var DirectionalLights = ObjectCache (DirectionalLightContainer);
-	
+
 	function DirectionalLightContainer ()
 	{
 		this .direction                     = new Vector3 (0, 0, 0);
@@ -100,7 +100,6 @@ function (Fields,
 		this .invLightSpaceProjectionMatrix = new Matrix4 ();
 		this .shadowMatrix                  = new Matrix4 ();
 		this .shadowMatrixArray             = new Float32Array (16);
-		this .invGroupMatrix                = new Matrix4 ();
 		this .rotation                      = new Rotation4 ();
 		this .textureUnit                   = 0;
 	}
@@ -138,13 +137,11 @@ function (Fields,
 
 						gl .activeTexture (gl .TEXTURE0 + this .textureUnit);
 
-						if (browser .getExtension ("WEBGL_depth_texture"))
+						if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
 							gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getDepthTexture ());
 						else
 							gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getColorTexture ());
 
-						gl .texParameteri (gl .TEXTURE_2D, gl .TEXTURE_MIN_FILTER, gl .LINEAR);
-						gl .texParameteri (gl .TEXTURE_2D, gl .TEXTURE_MAG_FILTER, gl .LINEAR);
 						gl .activeTexture (gl .TEXTURE0);
 					}
 					else
@@ -175,28 +172,26 @@ function (Fields,
 				invLightSpaceMatrix .inverse ();
 
 				var
-					groupBBox        = X3DGroupingNode .prototype .getBBox .call (this .groupNode, this .bbox), // Group bbox.
-					lightBBox        = groupBBox .multRight (invLightSpaceMatrix),                              // Group bbox from the perspective of the light.
+					groupBBox        = this .groupNode .getSubBBox (this .bbox, true), // Group bbox.
+					lightBBox        = groupBBox .multRight (invLightSpaceMatrix),     // Group bbox from the perspective of the light.
 					shadowMapSize    = lightNode .getShadowMapSize (),
 					viewport         = this .viewport .set (0, 0, shadowMapSize, shadowMapSize),
-					projectionMatrix = Camera .orthoBox (lightBBox, this .projectionMatrix),
-					invGroupMatrix   = this .invGroupMatrix .assign (this .groupNode .getMatrix ()) .inverse ();
+					projectionMatrix = Camera .orthoBox (lightBBox, this .projectionMatrix);
 
 				this .shadowBuffer .bind ();
 
 				renderObject .getViewVolumes      () .push (this .viewVolume .set (projectionMatrix, viewport, viewport));
 				renderObject .getProjectionMatrix () .pushMatrix (projectionMatrix);
 				renderObject .getModelViewMatrix  () .pushMatrix (invLightSpaceMatrix);
-				renderObject .getModelViewMatrix  () .multLeft (invGroupMatrix);
 
-				renderObject .render (TraverseType .DEPTH, this .groupNode);
+				renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
 
 				renderObject .getModelViewMatrix  () .pop ();
 				renderObject .getProjectionMatrix () .pop ();
 				renderObject .getViewVolumes      () .pop ();
 
 				this .shadowBuffer .unbind ();
-	
+
 				if (! lightNode .getGlobal ())
 					invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
@@ -217,12 +212,15 @@ function (Fields,
 		},
 		setShaderUniforms: function (gl, shaderObject)
 		{
+			var i = shaderObject .numLights ++;
+
+			if (shaderObject .hasLight (i, this))
+				return;
+
 			var
-				lightNode   = this .lightNode,
-				color       = lightNode .getColor (),
-				direction   = this .direction,
-				shadowColor = lightNode .getShadowColor (),
-				i           = shaderObject .numLights ++;
+				lightNode = this .lightNode,
+				color     = lightNode .getColor (),
+				direction = this .direction;
 
 			gl .uniform1i (shaderObject .x3d_LightType [i],             1);
 			gl .uniform3f (shaderObject .x3d_LightColor [i],            color .r, color .g, color .b);
@@ -232,6 +230,8 @@ function (Fields,
 
 			if (this .textureUnit)
 			{
+				var shadowColor = lightNode .getShadowColor ();
+
 				gl .uniform3f        (shaderObject .x3d_ShadowColor [i],         shadowColor .r, shadowColor .g, shadowColor .b);
 				gl .uniform1f        (shaderObject .x3d_ShadowIntensity [i],     lightNode .getShadowIntensity ());
 				gl .uniform1f        (shaderObject .x3d_ShadowBias [i],          lightNode .getShadowBias ());
@@ -239,6 +239,11 @@ function (Fields,
 				gl .uniform1i        (shaderObject .x3d_ShadowMapSize [i],       lightNode .getShadowMapSize ());
 				gl .uniform1i        (shaderObject .x3d_ShadowMap [i],           this .textureUnit);
 			}
+			else
+			{
+				// Must be set to zero in case of multiple lights.
+				gl .uniform1f (shaderObject .x3d_ShadowIntensity [i], 0);
+			}
 		},
 		dispose: function ()
 		{
@@ -268,7 +273,8 @@ function (Fields,
 
 		this .addType (X3DConstants .DirectionalLight);
 
-		this .global_ = false;
+		if (executionContext .getSpecificationVersion () === "2.0")
+			this .global_ = true;
 	}
 
 	DirectionalLight .prototype = Object .assign (Object .create (X3DLightNode .prototype),
@@ -276,15 +282,16 @@ function (Fields,
 		constructor: DirectionalLight,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",         new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "global",           new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "global",           new Fields .SFBool (false)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "on",               new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "color",            new Fields .SFColor (1, 1, 1)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "intensity",        new Fields .SFFloat (1)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "ambientIntensity", new Fields .SFFloat ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "direction",        new Fields .SFVec3f (0, 0, -1)),
 
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadows",         new  Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowColor",     new  Fields .SFColor ()),        // Color of shadow.
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowIntensity", new  Fields .SFFloat ()),        // Intensity of shadow color in the range (0, 1).
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowIntensity", new  Fields .SFFloat (1)),       // Intensity of shadow color in the range (0, 1).
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowBias",      new  Fields .SFFloat (0.005)),   // Bias of the shadow.
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "shadowMapSize",   new  Fields .SFInt32 (1024)),    // Size of the shadow map in pixels in the range (0, inf).
 		]),
@@ -308,5 +315,3 @@ function (Fields,
 
 	return DirectionalLight;
 });
-
-

package/src/x_ite/Components/Lighting/PointLight.js

@@ -55,7 +55,6 @@ define ([
 	"x_ite/Components/Grouping/X3DGroupingNode",
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
-	"standard/Math/Geometry/Box3",
 	"standard/Math/Geometry/Camera",
 	"standard/Math/Geometry/ViewVolume",
 	"standard/Math/Numbers/Vector3",
@@ -70,11 +69,10 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DLightNode, 
-          X3DGroupingNode, 
+          X3DLightNode,
+          X3DGroupingNode,
           TraverseType,
           X3DConstants,
-          Box3,
           Camera,
           ViewVolume,
           Vector3,
@@ -109,11 +107,11 @@ function (Fields,
 		new Vector4 (0.75, 0.5, 0.25, 0.5), // front
 		new Vector4 (0.25, 0.5, 0.25, 0.5), // back
 		new Vector4 (0.0,  0,   0.5,  0.5), // bottom
-		new Vector4 (0.5,  0,   0.5,  0.5), // top   
+		new Vector4 (0.5,  0,   0.5,  0.5), // top
 	];
 
 	var PointLights = ObjectCache (PointLightContainer);
-	
+
 	function PointLightContainer ()
 	{
 		this .location                      = new Vector3 (0, 0, 0);
@@ -128,7 +126,6 @@ function (Fields,
 		this .invLightSpaceProjectionMatrix = new Matrix4 ();
 		this .shadowMatrix                  = new Matrix4 ();
 		this .shadowMatrixArray             = new Float32Array (16);
-		this .invGroupMatrix                = new Matrix4 ();
 		this .rotation                      = new Rotation4 ();
 		this .rotationMatrix                = new Matrix4 ();
 		this .textureUnit                   = 0;
@@ -176,13 +173,11 @@ function (Fields,
 
 						gl .activeTexture (gl .TEXTURE0 + this .textureUnit);
 
-						if (browser .getExtension ("WEBGL_depth_texture"))
+						if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
 							gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getDepthTexture ());
 						else
 							gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getColorTexture ());
 
-						gl .texParameteri (gl .TEXTURE_2D, gl .TEXTURE_MIN_FILTER, gl .NEAREST);
-						gl .texParameteri (gl .TEXTURE_2D, gl .TEXTURE_MAG_FILTER, gl .NEAREST);
 						gl .activeTexture (gl .TEXTURE0);
 					}
 					else
@@ -212,9 +207,7 @@ function (Fields,
 				invLightSpaceMatrix .translate (lightNode .getLocation ());
 				invLightSpaceMatrix .inverse ();
 
-				var
-					shadowMapSize  = lightNode .getShadowMapSize (),
-					invGroupMatrix = this .invGroupMatrix .assign (this .groupNode .getMatrix ()) .inverse ();
+				var shadowMapSize  = lightNode .getShadowMapSize ();
 
 				this .shadowBuffer .bind ();
 
@@ -229,17 +222,16 @@ function (Fields,
 					renderObject .getProjectionMatrix () .pushMatrix (this .projectionMatrix);
 					renderObject .getModelViewMatrix  () .pushMatrix (orientationMatrices [i]);
 					renderObject .getModelViewMatrix  () .multLeft (invLightSpaceMatrix);
-					renderObject .getModelViewMatrix  () .multLeft (invGroupMatrix);
-	
-					renderObject .render (TraverseType .DEPTH, this .groupNode);
-	
+
+					renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
+
 					renderObject .getModelViewMatrix  () .pop ();
 					renderObject .getProjectionMatrix () .pop ();
 					renderObject .getViewVolumes () .pop ();
 				}
 
 				this .shadowBuffer .unbind ();
-	
+
 				if (! lightNode .getGlobal ())
 					invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
@@ -260,17 +252,16 @@ function (Fields,
 		},
 		setShaderUniforms: function (gl, shaderObject)
 		{
-			// For correct results the radius must be transform by the modelViewMatrix. This can only be done in the shader.
-			// distanceOfLightToFragmentInLightSpace = |(FragmentPosition - LightPosition) * inverseModelViewMatrixOfLight|
-			// distanceOfLightToFragmentInLightSpace can then be compared with radius.
+			var i = shaderObject .numLights ++;
+
+			if (shaderObject .hasLight (i, this))
+				return;
 
-			var 
+			var
 				lightNode   = this .lightNode,
 				color       = lightNode .getColor (),
 				attenuation = lightNode .getAttenuation (),
-				location    = this .location,
-				shadowColor = lightNode .getShadowColor (),
-				i           = shaderObject .numLights ++;
+				location    = this .location;
 
 			gl .uniform1i        (shaderObject .x3d_LightType [i],             2);
 			gl .uniform3f        (shaderObject .x3d_LightColor [i],            color .r, color .g, color .b);
@@ -283,6 +274,8 @@ function (Fields,
 
 			if (this .textureUnit)
 			{
+				var shadowColor = lightNode .getShadowColor ();
+
 				gl .uniform3f        (shaderObject .x3d_ShadowColor [i],         shadowColor .r, shadowColor .g, shadowColor .b);
 				gl .uniform1f        (shaderObject .x3d_ShadowIntensity [i],     lightNode .getShadowIntensity ());
 				gl .uniform1f        (shaderObject .x3d_ShadowBias [i],          lightNode .getShadowBias ());
@@ -290,6 +283,11 @@ function (Fields,
 				gl .uniform1i        (shaderObject .x3d_ShadowMapSize [i],       lightNode .getShadowMapSize ());
 				gl .uniform1i        (shaderObject .x3d_ShadowMap [i],           this .textureUnit);
 			}
+			else
+			{
+				// Must be set to zero in case of multiple lights.
+				gl .uniform1f (shaderObject .x3d_ShadowIntensity [i], 0);
+			}
 		},
 		dispose: function ()
 		{
@@ -336,9 +334,10 @@ function (Fields,
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "attenuation",      new Fields .SFVec3f (1, 0, 0)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "location",         new Fields .SFVec3f ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "radius",           new Fields .SFFloat (100)),
-																				   
+
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadows",         new  Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowColor",     new  Fields .SFColor ()),        // Color of shadow.
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowIntensity", new  Fields .SFFloat ()),        // Intensity of shadow color in the range (0, 1).
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowIntensity", new  Fields .SFFloat (1)),        // Intensity of shadow color in the range (0, 1).
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowBias",      new  Fields .SFFloat (0.005)),   // Bias of the shadow.
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "shadowMapSize",   new  Fields .SFInt32 (1024)),    // Size of the shadow map in pixels in the range (0, inf).
 		]),
@@ -374,5 +373,3 @@ function (Fields,
 
 	return PointLight;
 });
-
-

package/src/x_ite/Components/Lighting/SpotLight.js

@@ -70,8 +70,8 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DLightNode, 
-          X3DGroupingNode, 
+          X3DLightNode,
+          X3DGroupingNode,
           TraverseType,
           X3DConstants,
           Box3,
@@ -89,13 +89,13 @@ function (Fields,
 "use strict";
 
 	var SpotLights = ObjectCache (SpotLightContainer);
-	
+
 	function SpotLightContainer ()
 	{
 		this .location                      = new Vector3 (0, 0, 0);
 		this .direction                     = new Vector3 (0, 0, 0);
 		this .matrixArray                   = new Float32Array (9);
-		this .renderShadow                  = true; 
+		this .renderShadow                  = true;
 		this .shadowBuffer                  = null;
 		this .bbox                          = new Box3 ();
 		this .viewVolume                    = new ViewVolume ();
@@ -107,7 +107,6 @@ function (Fields,
 		this .invLightSpaceProjectionMatrix = new Matrix4 ();
 		this .shadowMatrix                  = new Matrix4 ();
 		this .shadowMatrixArray             = new Float32Array (16);
-		this .invGroupMatrix                = new Matrix4 ();
 		this .rotation                      = new Rotation4 ();
 		this .lightBBoxMin                  = new Vector3 (0, 0, 0);
 		this .lightBBoxMax                  = new Vector3 (0, 0, 0);
@@ -156,13 +155,11 @@ function (Fields,
 
 						gl .activeTexture (gl .TEXTURE0 + this .textureUnit);
 
-						if (browser .getExtension ("WEBGL_depth_texture"))
+						if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
 							gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getDepthTexture ());
 						else
 							gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getColorTexture ());
 
-						gl .texParameteri (gl .TEXTURE_2D, gl .TEXTURE_MIN_FILTER, gl .LINEAR);
-						gl .texParameteri (gl .TEXTURE_2D, gl .TEXTURE_MAG_FILTER, gl .LINEAR);
 						gl .activeTexture (gl .TEXTURE0);
 					}
 					else
@@ -194,13 +191,13 @@ function (Fields,
 				invLightSpaceMatrix .inverse ();
 
 				var
-					groupBBox        = X3DGroupingNode .prototype .getBBox .call (this .groupNode, this .bbox), // Group bbox.
-					lightBBox        = groupBBox .multRight (invLightSpaceMatrix),                              // Group bbox from the perspective of the light.
+					groupBBox        = this .groupNode .getSubBBox (this .bbox, true),                 // Group bbox.
+					lightBBox        = groupBBox .multRight (invLightSpaceMatrix),                     // Group bbox from the perspective of the light.
+					lightBBoxExtents = lightBBox .getExtents (this .lightBBoxMin, this .lightBBoxMax), // Result not used, but arguments.
 					shadowMapSize    = lightNode .getShadowMapSize (),
 					farValue         = Math .min (lightNode .getRadius (), -this .lightBBoxMin .z),
 					viewport         = this .viewport .set (0, 0, shadowMapSize, shadowMapSize),
-					projectionMatrix = Camera .perspective (lightNode .getCutOffAngle () * 2, 0.125, Math .max (10000, farValue), shadowMapSize, shadowMapSize, this .projectionMatrix), // Use higher far value for better precision.
-					invGroupMatrix   = this .invGroupMatrix .assign (this .groupNode .getMatrix ()) .inverse ();
+					projectionMatrix = Camera .perspective (lightNode .getCutOffAngle () * 2, 0.125, Math .max (10000, farValue), shadowMapSize, shadowMapSize, this .projectionMatrix); // Use higher far value for better precision.
 
 				this .renderShadow = farValue > 0;
 
@@ -209,16 +206,15 @@ function (Fields,
 				renderObject .getViewVolumes      () .push (this .viewVolume .set (projectionMatrix, viewport, viewport));
 				renderObject .getProjectionMatrix () .pushMatrix (projectionMatrix);
 				renderObject .getModelViewMatrix  () .pushMatrix (invLightSpaceMatrix);
-				renderObject .getModelViewMatrix  () .multLeft (invGroupMatrix);
 
-				renderObject .render (TraverseType .DEPTH, this .groupNode);
+				renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
 
 				renderObject .getModelViewMatrix  () .pop ();
 				renderObject .getProjectionMatrix () .pop ();
 				renderObject .getViewVolumes      () .pop ();
 
 				this .shadowBuffer .unbind ();
-	
+
 				if (! lightNode .getGlobal ())
 					invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
@@ -232,7 +228,7 @@ function (Fields,
 		},
 		setGlobalVariables: function (renderObject)
 		{
-			var 
+			var
 				lightNode       = this .lightNode,
 				modelViewMatrix = this .modelViewMatrix .get ();
 
@@ -244,14 +240,17 @@ function (Fields,
 		},
 		setShaderUniforms: function (gl, shaderObject)
 		{
-			var 
+			var i = shaderObject .numLights ++;
+
+			if (shaderObject .hasLight (i, this))
+				return;
+
+			var
 				lightNode   = this .lightNode,
 				color       = lightNode .getColor (),
 				attenuation = lightNode .getAttenuation (),
 				location    = this .location,
-				direction   = this .direction,
-				shadowColor = lightNode .getShadowColor (),
-				i           = shaderObject .numLights ++;
+				direction   = this .direction;
 
 			gl .uniform1i        (shaderObject .x3d_LightType [i],             3);
 			gl .uniform3f        (shaderObject .x3d_LightColor [i],            color .r, color .g, color .b);
@@ -267,6 +266,8 @@ function (Fields,
 
 			if (this .renderShadow && this .textureUnit)
 			{
+				var shadowColor = lightNode .getShadowColor ();
+
 				gl .uniform3f        (shaderObject .x3d_ShadowColor [i],         shadowColor .r, shadowColor .g, shadowColor .b);
 				gl .uniform1f        (shaderObject .x3d_ShadowIntensity [i],     lightNode .getShadowIntensity ());
 				gl .uniform1f        (shaderObject .x3d_ShadowBias [i],          lightNode .getShadowBias ());
@@ -274,6 +275,11 @@ function (Fields,
 				gl .uniform1i        (shaderObject .x3d_ShadowMapSize [i],       lightNode .getShadowMapSize ());
 				gl .uniform1i        (shaderObject .x3d_ShadowMap [i],           this .textureUnit);
 			}
+			else
+			{
+				// Must be set to zero in case of multiple lights.
+				gl .uniform1f (shaderObject .x3d_ShadowIntensity [i], 0);
+			}
 		},
 		dispose: function ()
 		{
@@ -325,9 +331,10 @@ function (Fields,
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "radius",           new Fields .SFFloat (100)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "beamWidth",        new Fields .SFFloat (0.785398)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "cutOffAngle",      new Fields .SFFloat (1.5708)),
-																				   
+
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadows",         new  Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowColor",     new  Fields .SFColor ()),        // Color of shadow.
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowIntensity", new  Fields .SFFloat ()),        // Intensity of shadow color in the range (0, 1).
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowIntensity", new  Fields .SFFloat (1)),       // Intensity of shadow color in the range (0, 1).
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "shadowBias",      new  Fields .SFFloat (0.005)),   // Bias of the shadow.
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "shadowMapSize",   new  Fields .SFInt32 (1024)),    // Size of the shadow map in pixels in the range (0, inf).
 		]),
@@ -380,5 +387,3 @@ function (Fields,
 
 	return SpotLight;
 });
-
-