x_ite 4.2.17 → 4.7.7

package/dist/{components → assets/components}/particle-systems.js

@@ -1,9 +1,18 @@
-(function () {
+(function (globalModule, globalRequire)
+{
 
-	var
-		define  = X3D .define,
-		require = X3D .require;
+if (typeof __filename === "undefined")
+{
+	globalModule  = undefined;
+	globalRequire = undefined;
+}
+
+// Undefine global variables.
+var module = { }, exports, process;
 
+const
+	define  = X3D .define,
+	require = X3D .require;
 /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
  *******************************************************************************
  *
@@ -63,7 +72,7 @@ define ('x_ite/Components/ParticleSystems/X3DParticleEmitterNode',[
 	"standard/Math/Algorithm",
 	"standard/Math/Algorithms/QuickSort",
 ],
-function (X3DNode, 
+function (X3DNode,
           X3DConstants,
           Vector3,
           Rotation4,
@@ -147,7 +156,7 @@ function (X3DNode,
 				v   = particleLifetime * lifetimeVariation,
 				min = Math .max (0, particleLifetime - v),
 				max = particleLifetime + v;
-		
+
 			return Math .random () * (max - min) + min;
 		},
 		getRandomSpeed: function ()
@@ -157,7 +166,7 @@ function (X3DNode,
 				v     = speed * this .variation,
 				min   = Math .max (0, speed - v),
 				max   = speed + v;
-		
+
 			return Math .random () * (max - min) + min;
 		},
 		getSphericalRandomVelocity: function (velocity)
@@ -175,7 +184,7 @@ function (X3DNode,
 				cphi  = this .getRandomValue (-1, 1),
 				phi   = Math .acos (cphi),
 				r     = Math .sin (phi);
-		
+
 			return normal .set (Math .sin (theta) * r,
 			                    Math .cos (theta) * r,
 			                    cphi);
@@ -187,7 +196,7 @@ function (X3DNode,
 				cphi  = this .getRandomValue (Math .cos (angle), 1),
 				phi   = Math .acos (cphi),
 				r     = Math .sin (phi);
-		
+
 			return normal .set (Math .sin (theta) * r,
 			                    Math .cos (theta) * r,
 			                    cphi);
@@ -205,7 +214,7 @@ function (X3DNode,
 				cphi  = Math .pow (Math .random (), 1/3),
 				phi   = Math .acos (cphi),
 				r     = Math .sin (phi);
-		
+
 			return normal .set (Math .sin (theta) * r,
 			                    Math .cos (theta) * r,
 			                    cphi);
@@ -237,7 +246,7 @@ function (X3DNode,
 				var
 					particle    = particles [i],
 					elapsedTime = particle .elapsedTime + deltaTime;
-		
+
 				if (elapsedTime > particle .lifetime)
 				{
 					// Create new particle or hide particle.
@@ -276,7 +285,7 @@ function (X3DNode,
 						position .x += velocity .x * deltaTime;
 						position .y += velocity .y * deltaTime;
 						position .z += velocity .z * deltaTime;
-			
+
 						this .bounce (boundedVolume, fromPosition, position, velocity);
 					}
 					else
@@ -285,14 +294,14 @@ function (X3DNode,
 						position .y += velocity .y * deltaTime;
 						position .z += velocity .z * deltaTime;
 					}
-				
+
 					particle .elapsedTime = elapsedTime;
 				}
 			}
 
 			// Animate color if needed.
 
-			if (particleSystem .colorMaterial)
+			if (particleSystem .geometryContext .colorMaterial)
 				this .getColors (particles, particleSystem .colorKeys, particleSystem .colorRamp, numParticles);
 		},
 		bounce: function (boundedVolume, fromPosition, toPosition, velocity)
@@ -300,7 +309,7 @@ function (X3DNode,
 			normal .assign (velocity) .normalize ();
 
 			line .set (fromPosition, normal);
-		
+
 			var
 				intersections       = this .intersections,
 				intersectionNormals = this .intersectionNormals,
@@ -312,11 +321,11 @@ function (X3DNode,
 					intersections [i] .index = i;
 
 				plane .set (fromPosition, normal);
-		
+
 				this .sorter .sort (0, numIntersections);
 
 				var index = Algorithm .upperBound (intersections, 0, numIntersections, 0, PlaneCompareValue);
-				
+
 				if (index < numIntersections)
 				{
 					var
@@ -324,7 +333,7 @@ function (X3DNode,
 						intersectionNormal = intersectionNormals [intersection .index];
 
 					plane .set (intersection, intersectionNormal);
-		
+
 					if (plane .getDistanceToPoint (fromPosition) * plane .getDistanceToPoint (toPosition) < 0)
 					{
 						var dot2 = 2 * intersectionNormal .dot (velocity);
@@ -351,7 +360,7 @@ function (X3DNode,
 				index0 = 0,
 				index1 = 0,
 				weight = 0;
-		
+
 			for (var i = 0; i < numParticles; ++ i)
 			{
 				// Determine index0, index1 and weight.
@@ -376,16 +385,16 @@ function (X3DNode,
 				else
 				{
 					var index = Algorithm .upperBound (colorKeys, 0, length, fraction, Algorithm .less);
-	
+
 					if (index < length)
 					{
 						index1 = index;
 						index0 = index - 1;
-				
+
 						var
 							key0 = colorKeys [index0],
 							key1 = colorKeys [index1];
-				
+
 						weight = Algorithm .clamp ((fraction - key0) / (key1 - key0), 0, 1);
 					}
 					else
@@ -395,13 +404,13 @@ function (X3DNode,
 						weight = 0;
 					}
 				}
-	
+
 				// Interpolate and set color.
 
 				var
 					color0 = colorRamp [index0],
 					color1 = colorRamp [index1];
-	
+
 				// Algorithm .lerp (color0, color1, weight);
 				color .x = color0 .x + weight * (color1 .x - color0 .x);
 				color .y = color0 .y + weight * (color1 .y - color0 .y);
@@ -414,8 +423,6 @@ function (X3DNode,
 	return X3DParticleEmitterNode;
 });
 
-
-
 /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
  *******************************************************************************
  *
@@ -621,18 +628,17 @@ define ('x_ite/Browser/ParticleSystems/X3DParticleSystemsContext',[
 function (PointEmitter)
 {
 "use strict";
-	
+
 	function X3DParticleSystemsContext () { }
 
 	X3DParticleSystemsContext .prototype =
 	{
 		getDefaultEmitter: function ()
 		{
-			if (! this .defaultEmitter)
-			{
-				this .defaultEmitter = new PointEmitter (this .getPrivateScene ());
-				this .defaultEmitter .setup ();
-			}
+			this .defaultEmitter = new PointEmitter (this .getPrivateScene ());
+			this .defaultEmitter .setup ();
+
+			this .getDefaultEmitter = function () { return this .defaultEmitter; };
 
 			return this .defaultEmitter;
 		},
@@ -822,12 +828,12 @@ function (Fields,
 		set_geometry__: function ()
 		{
 			if (this .geometryNode)
-				this .geometryNode .removeInterest ("addNodeEvent", this);
+				this .geometryNode .rebuild_ .removeInterest ("addNodeEvent", this);
 
 			this .geometryNode = X3DCast (X3DConstants .X3DGeometryNode, this .geometry_);
 
 			if (this .geometryNode)
-				this .geometryNode .addInterest ("addNodeEvent", this);
+				this .geometryNode .rebuild_ .addInterest ("addNodeEvent", this);
 		},
 		addGeometry: function (boundedNormals, boundedVertices)
 		{
@@ -1301,14 +1307,14 @@ function (Vector3,
 {
 "use strict";
 
-	var
+	const
 		v0  = new Vector3 (0, 0, 0),
 		v1  = new Vector3 (0, 0, 0),
 		v2  = new Vector3 (0, 0, 0),
 		uvt = { u: 0, v: 0, t: 0 };
 
 	// Box normals for bbox / line intersection.
-	var boxNormals = [
+	const boxNormals = [
 		new Vector3 (0,  0,  1), // front
 		new Vector3 (0,  0, -1), // back
 		new Vector3 (0,  1,  0), // top
@@ -1321,7 +1327,7 @@ function (Vector3,
 	{
 		function compare (a, b)
 		{
-			var
+			const
 				vertices = compare .vertices;
 				axis     = compare .axis;
 
@@ -1347,7 +1353,7 @@ function (Vector3,
 	{
 		intersectsLine: function (line, intersections, intersectionNormals)
 		{
-			var
+			const
 				vertices = this .vertices,
 				normals  = this .normals,
 				i4       = this .i4,
@@ -1361,14 +1367,14 @@ function (Vector3,
 			{
 				// Get barycentric coordinates.
 
-				var
+				const
 					u = uvt .u,
 					v = uvt .v,
 					t = 1 - u - v;
 
 				// Determine vectors for X3DPointingDeviceSensors.
 
-				var i = intersections .size ++;
+				const i = intersections .size ++;
 
 				if (i >= intersections .length)
 					intersections .push (new Vector3 (0, 0, 0));
@@ -1397,19 +1403,20 @@ function (Vector3,
 		this .planes       = [ ];
 		this .intersection = new Vector3 (0, 0, 0);
 
-		var
+		const
 			vertices = tree .vertices,
 			min      = this .min,
 			max      = this .max,
-			last     = first + size,
-			t        = triangles [first] * 12;
+			last     = first + size;
+
+		let t = triangles [first] * 12;
 
 		// Calculate bbox
 
 		min .set (vertices [t], vertices [t + 1], vertices [t + 2]);
 		max .assign (min);
 
-		for (var i = first; i < last; ++ i)
+		for (let i = first; i < last; ++ i)
 		{
 			t = triangles [i] * 12;
 
@@ -1421,7 +1428,7 @@ function (Vector3,
 			max .max (v0, v1, v2);
 		}
 
-		for (var i = 0; i < 5; ++ i)
+		for (let i = 0; i < 5; ++ i)
 			this .planes [i] = new Plane3 (i % 2 ? min : max, boxNormals [i]);
 
 		// Sort and split array
@@ -1442,7 +1449,7 @@ function (Vector3,
 
 		// Split array
 
-		var rightSize = size - leftSize;
+		const rightSize = size - leftSize;
 
 		// Construct left and right node
 
@@ -1469,7 +1476,7 @@ function (Vector3,
 		},
 		intersectsBBox: function (line)
 		{
-			var
+			const
 				planes       = this .planes,
 				min          = this .min,
 				max          = this .max,
@@ -1525,11 +1532,11 @@ function (Vector3,
 		},
 		getLongestAxis: function (min, max)
 		{
-			var
+			const
 				x = max .x - min .x,
 				y = max .y - min .y,
 				z = max .z - min .z;
-	
+
 			if (x < y)
 			{
 				if (y < z)
@@ -1552,8 +1559,8 @@ function (Vector3,
 		this .vertices = vertices;
 		this .normals  = normals;
 
-		var numTriangles = vertices .length / 12;
-	
+		const numTriangles = vertices .length / 12;
+
 		switch (numTriangles)
 		{
 			case 0:
@@ -1568,9 +1575,9 @@ function (Vector3,
 			}
 			default:
 			{
-				var triangles = [ ];
+				const triangles = [ ];
 
-				for (var i = 0; i < numTriangles; ++ i)
+				for (let i = 0; i < numTriangles; ++ i)
 					triangles .push (i);
 
 				this .sorter = new QuickSort (triangles, SortComparator (vertices, 0));
@@ -1584,7 +1591,7 @@ function (Vector3,
 	BVH .prototype =
 	{
 		constructor: BVH,
-		
+
 		intersectsLine: function (line, intersections, intersectionNormals)
 		{
 			intersections .size = 0;
@@ -1659,7 +1666,7 @@ define ('x_ite/Components/ParticleSystems/ParticleSystem',[
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/Bits/X3DCast",
-	"standard/Math/Numbers/Color4",
+	"x_ite/Browser/Shape/AlphaMode",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Vector4",
 	"standard/Math/Numbers/Matrix4",
@@ -1675,7 +1682,7 @@ function (Fields,
           TraverseType,
           X3DConstants,
           X3DCast,
-          Color4,
+			 AlphaMode,
           Vector3,
           Vector4,
           Matrix4,
@@ -1686,8 +1693,9 @@ function (Fields,
 {
 "use strict";
 
-	var
-		i        = 0,
+	var i = 0;
+
+	const
 		POINT    = i ++,
 		LINE     = i ++,
 		TRIANGLE = i ++,
@@ -1695,7 +1703,7 @@ function (Fields,
 		GEOMETRY = i ++,
 		SPRITE   = i ++;
 
-	var GeometryTypes = {
+	const GeometryTypes = {
 		POINT:    POINT,
 		LINE:     LINE,
 		TRIANGLE: TRIANGLE,
@@ -1704,7 +1712,7 @@ function (Fields,
 		SPRITE:   SPRITE,
 	};
 
-	var
+	const
 		invModelViewMatrix = new Matrix4 (),
 		billboardToScreen  = new Vector3 (0, 0, 0),
 		viewerYAxis        = new Vector3 (0, 0, 0),
@@ -1750,16 +1758,16 @@ function (Fields,
 		this .colorKeys                = [ ];
 		this .colorRamppNode           = null;
 		this .colorRamp                = [ ];
-		this .colorMaterial            = false;
 		this .texCoordKeys             = [ ];
 		this .texCoordRampNode         = null;
 		this .texCoordRamp             = [ ];
 		this .texCoordAnim             = false;
 		this .vertexCount              = 0;
-		this .shaderNode               = this .getBrowser () .getPointShader ();
+		this .shaderNode               = null;
 		this .rotation                 = new Matrix3 ();
 		this .particleSorter           = new QuickSort (this .particles, compareDistance);
 		this .sortParticles            = false;
+		this .geometryContext          = { };
 	}
 
 	ParticleSystem .prototype = Object .assign (Object .create (X3DShapeNode .prototype),
@@ -1781,6 +1789,9 @@ function (Fields,
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "texCoordKey",       new Fields .MFFloat ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "texCoordRamp",      new Fields .SFNode ()),
 			new X3DFieldDefinition (X3DConstants .outputOnly,     "isActive",          new Fields .SFBool ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",           new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "castShadow",        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 .inputOutput,    "appearance",        new Fields .SFNode ()),
@@ -1802,12 +1813,13 @@ function (Fields,
 		{
 			X3DShapeNode .prototype .initialize .call (this);
 
-			var gl = this .getBrowser () .getContext ();
+			const
+				browser = this .getBrowser (),
+				gl      = browser .getContext ();
 
 			this .isLive () .addInterest ("set_live__", this);
 
-			this .getBrowser () .getBrowserOptions () .Shading_ .addInterest ("set_shader__", this);
-			//this .getBrowser () .getDefaultShader () .addInterest ("set_shader__", this);
+			browser .getBrowserOptions () .Shading_ .addInterest ("set_shader__", this);
 
 			this .enabled_           .addInterest ("set_enabled__",           this);
 			this .createParticles_   .addInterest ("set_createParticles__",   this);
@@ -1831,6 +1843,9 @@ function (Fields,
 			this .normalBuffer       = gl .createBuffer ();
 			this .vertexBuffer       = gl .createBuffer ();
 
+			for (var i = 1, channels = this .getBrowser () .getMaxTextures (); i < channels; ++ i)
+				this .texCoordBuffers .push (this .texCoordBuffers [0]);
+
 			this .idArray          = new Float32Array ();
 			this .positionArray    = new Float32Array ();
 			this .elapsedTimeArray = new Float32Array ();
@@ -1842,6 +1857,11 @@ function (Fields,
 
 			this .primitiveMode = gl .TRIANGLES;
 
+			// Geometry context
+
+			this .geometryContext .fogCoords             = false;
+			this .geometryContext .textureCoordinateNode = browser .getDefaultTextureCoordinate ();
+
 			// Call order is higly important at startup.
 			this .set_emitter__ ();
 			this .set_enabled__ ();
@@ -1854,31 +1874,38 @@ function (Fields,
 		},
 		set_bbox__: function ()
 		{
-			if (this .bboxSize_ .getValue () .equals (this .defaultBBoxSize))
+			if (this .bboxSize_ .getValue () .equals (this .getDefaultBBoxSize ()))
 				this .bbox .set ();
 			else
 				this .bbox .set (this .bboxSize_ .getValue (), this .bboxCenter_ .getValue ());
-			
-			this .bboxSize   = this .bbox .size;
-			this .bboxCenter = this .bbox .center;
+
+			this .bboxSize   .assign (this .bbox .size);
+			this .bboxCenter .assign (this .bbox .center);
 		},
 		set_transparent__: function ()
 		{
-			switch (this .geometryType)
+			if (this .getAppearance () .getAlphaMode () === AlphaMode .AUTO)
 			{
-				case POINT:
+				switch (this .geometryType)
 				{
-					this .setTransparent (true);
-					break;
-				}
-				default:
-				{
-					this .setTransparent ((this .getAppearance () && this .getAppearance () .transparent_ .getValue ()) ||
-					                      (this .colorRampNode && this .colorRampNode .isTransparent ()) ||
-					                      (this .geometryType === GEOMETRY && this .geometryNode && this .geometryNode .transparent_ .getValue ()));
-					break;
+					case POINT:
+					{
+						this .setTransparent (true);
+						break;
+					}
+					default:
+					{
+						this .setTransparent (this .getAppearance () .getTransparent () ||
+													 (this .colorRampNode && this .colorRampNode .getTransparent ()) ||
+													 (this .geometryType === GEOMETRY && this .geometryNode && this .geometryNode .getTransparent ()));
+						break;
+					}
 				}
 			}
+			else
+			{
+				this .setTransparent (this .getAppearance () .getTransparent ());
+			}
 		},
 		set_live__: function ()
 		{
@@ -1887,7 +1914,7 @@ function (Fields,
 				if (this .isActive_ .getValue () && this .maxParticles_ .getValue ())
 				{
 					this .getBrowser () .sensorEvents () .addInterest ("animateParticles", this);
-		
+
 					if (this .pauseTime)
 					{
 						this .creationTime += performance .now () / 1000 - this .pauseTime;
@@ -1900,7 +1927,7 @@ function (Fields,
 				if (this .isActive_ .getValue () && this .maxParticles_ .getValue ())
 				{
 					this .getBrowser () .sensorEvents () .removeInterest ("animateParticles", this);
-		
+
 					if (this .pauseTime === 0)
 						this .pauseTime = performance .now () / 1000;
 				}
@@ -1915,7 +1942,7 @@ function (Fields,
 					if (this .isLive () .getValue ())
 					{
 						this .getBrowser () .sensorEvents () .addInterest ("animateParticles", this);
-			
+
 						this .pauseTime = 0;
 					}
 					else
@@ -1932,9 +1959,9 @@ function (Fields,
 					{
 						this .getBrowser () .sensorEvents () .removeInterest ("animateParticles", this);
 					}
-	
+
 					this .isActive_ = false;
-					
+
 					this .numParticles = 0;
 				}
 			}
@@ -1979,9 +2006,12 @@ function (Fields,
 					this .colorArray  .fill (1);
 					this .vertexArray .fill (1);
 
+					this .testWireframe = false;
 					this .primitiveMode = gl .POINTS;
 					this .texCoordCount = 0;
 					this .vertexCount   = 1;
+
+					this .geometryContext .geometryType = 0;
 					break;
 				}
 				case LINE:
@@ -2001,9 +2031,12 @@ function (Fields,
 					this .colorArray  .fill (1);
 					this .vertexArray .fill (1);
 
+					this .testWireframe = false;
 					this .primitiveMode = gl .LINES;
 					this .texCoordCount = 2;
 					this .vertexCount   = 2;
+
+					this .geometryContext .geometryType = 1;
 					break;
 				}
 				case TRIANGLE:
@@ -2078,9 +2111,12 @@ function (Fields,
 					gl .bindBuffer (gl .ARRAY_BUFFER, this .texCoordBuffers [0]);
 					gl .bufferData (gl .ARRAY_BUFFER, this .texCoordArray, gl .STATIC_DRAW);
 
+					this .testWireframe = true;
 					this .primitiveMode = gl .TRIANGLES;
 					this .texCoordCount = 4;
 					this .vertexCount   = 6;
+
+					this .geometryContext .geometryType = 2;
 					break;
 				}
 				case GEOMETRY:
@@ -2103,28 +2139,20 @@ function (Fields,
 			{
 				case POINT:
 				{
-					this .shaderGeometryType = 0;
-					this .shaderNode         = this .getBrowser () .getPointShader ();
+					this .shaderNode = this .getBrowser () .getPointShader ();
 					break;
 				}
 				case LINE:
 				{
-					this .shaderGeometryType = 1;
-					this .shaderNode         = this .getBrowser () .getLineShader ();
+					this .shaderNode = this .getBrowser () .getLineShader ();
 					break;
 				}
 				case TRIANGLE:
 				case QUAD:
 				case SPRITE:
-				{
-					this .shaderGeometryType = 3;
-					this .shaderNode         = this .getBrowser () .getDefaultShader ();
-					break;
-				}
 				case GEOMETRY:
 				{
-					this .shaderGeometryType = 3; // determine from geometry node.
-					this .shaderNode         = this .getBrowser () .getDefaultShader ();
+					this .shaderNode = null;
 					break;
 				}
 			}
@@ -2144,12 +2172,13 @@ function (Fields,
 			for (var i = particles .length, length = maxParticles; i < length; ++ i)
 			{
 				particles [i] = {
+					id: i,
 					life: 1,
 					lifetime: -1,
 					elapsedTime: 0,
 					position: new Vector3 (0, 0, 0),
 					velocity: new Vector3 (0, 0, 0),
-					color:    new Vector4 (1, 1, 1, 1),
+					color: new Vector4 (1, 1, 1, 1),
 					distance: 0,
 				};
 			}
@@ -2176,7 +2205,7 @@ function (Fields,
 
 			if (! this .emitterNode)
 				this .emitterNode = this .getBrowser () .getDefaultEmitter ();
-				
+
 			this .createParticles = this .createParticles_ .getValue ();
 		},
 		set_physics__: function ()
@@ -2279,7 +2308,7 @@ function (Fields,
 
 			colorRamp .length = length;
 
-			this .colorMaterial = Boolean (colorKeys .length && this .colorRampNode);
+			this .geometryContext .colorMaterial = !! (colorKeys .length && this .colorRampNode);
 		},
 		set_texCoordRamp__: function ()
 		{
@@ -2313,7 +2342,7 @@ function (Fields,
 
 			texCoordRamp .length = length;
 
-			this .texCoordAnim = Boolean (texCoordKeys .length && this .texCoordRampNode);
+			this .texCoordAnim = !! (texCoordKeys .length && this .texCoordRampNode);
 		},
 		intersectsBox: function (box, clipPlanes)
 		{
@@ -2339,14 +2368,14 @@ function (Fields,
 				var
 					now              = performance .now () / 1000,
 					particleLifetime = this .particleLifetime + this .particleLifetime * this .lifetimeVariation;
-	
+
 				if (this .numParticles === 0 || now - this .creationTime > particleLifetime)
 				{
 					this .creationTime    = now;
 					this .numParticles    = this .maxParticles;
 					this .createParticles = this .createParticles_ .getValue ();
 
-					deltaTime = Number .POSITIVE_INFINITY; 
+					deltaTime = Number .POSITIVE_INFINITY;
 				}
 				else
 					this .createParticles = false;
@@ -2358,7 +2387,7 @@ function (Fields,
 					var
 						now          = performance .now () / 1000,
 						newParticles = Math .max (0, Math .floor ((now - this .creationTime) * this .maxParticles / this .particleLifetime));
-	
+
 					if (newParticles)
 						this .creationTime = now;
 
@@ -2443,20 +2472,20 @@ function (Fields,
 
 			// Colors
 
-			if (this .colorMaterial)
+			if (this .geometryContext .colorMaterial)
 			{
 				for (var i = 0; i < numParticles; ++ i)
 				{
 					var
 						color = particles [i] .color,
 						i4    = i * 4;
-	
+
 					colorArray [i4]     = color .x;
 					colorArray [i4 + 1] = color .y;
 					colorArray [i4 + 2] = color .z;
 					colorArray [i4 + 3] = color .w;
 				}
-	
+
 				gl .bindBuffer (gl .ARRAY_BUFFER, this .colorBuffer);
 				gl .bufferData (gl .ARRAY_BUFFER, this .colorArray, gl .STATIC_DRAW);
 			}
@@ -2507,14 +2536,14 @@ function (Fields,
 
 			// Colors
 
-			if (this .colorMaterial)
+			if (this .geometryContext .colorMaterial)
 			{
 				for (var i = 0; i < numParticles; ++ i)
 				{
 					var
 						color = particles [i] .color,
 						i8    = i * 8;
-	
+
 					colorArray [i8]     = color .x;
 					colorArray [i8 + 1] = color .y;
 					colorArray [i8 + 2] = color .z;
@@ -2525,7 +2554,7 @@ function (Fields,
 					colorArray [i8 + 6] = color .z;
 					colorArray [i8 + 7] = color .w;
 				}
-	
+
 				gl .bindBuffer (gl .ARRAY_BUFFER, this .colorBuffer);
 				gl .bufferData (gl .ARRAY_BUFFER, this .colorArray, gl .STATIC_DRAW);
 			}
@@ -2565,7 +2594,7 @@ function (Fields,
 				vertexArray [i8]     = x - normal .x;
 				vertexArray [i8 + 1] = y - normal .y;
 				vertexArray [i8 + 2] = z - normal .z;
-											  
+
 				vertexArray [i8 + 4] = x + normal .x;
 				vertexArray [i8 + 5] = y + normal .y;
 				vertexArray [i8 + 6] = z + normal .z;
@@ -2598,9 +2627,9 @@ function (Fields,
 					vertexArray      = this .vertexArray,
 					sx1_2            = this .particleSize_ .x / 2,
 					sy1_2            = this .particleSize_ .y / 2;
-	
+
 				// Sort particles
-	
+
 //				if (this .sortParticles) // always false
 //				{
 //					for (var i = 0; i < numParticles; ++ i)
@@ -2608,167 +2637,167 @@ function (Fields,
 //						var particle = particles [i];
 //						particle .distance = modelViewMatrix .getDepth (particle .position);
 //					}
-//					
+//
 //					// Expensisive function!!!
 //					this .particleSorter .sort (0, numParticles);
 //				}
-	
+
 				// Colors
-	
+
 				if (! modelViewMatrix) // if called from animateParticles
 				{
-					if (this .colorMaterial)
+					if (this .geometryContext .colorMaterial)
 					{
 						for (var i = 0; i < maxParticles; ++ i)
 						{
 							var
 								color = particles [i] .color,
 								i24   = i * 24;
-		
+
 							// p4 ------ p3
 							// |       / |
 							// |     /   |
 							// |   /     |
 							// | /       |
 							// p1 ------ p2
-		
+
 							// p1, p2, p3; p1, p3, p4
 							colorArray [i24]     = colorArray [i24 + 4] = colorArray [i24 + 8]  = colorArray [i24 + 12] = colorArray [i24 + 16] = colorArray [i24 + 20] = color .x;
 							colorArray [i24 + 1] = colorArray [i24 + 5] = colorArray [i24 + 9]  = colorArray [i24 + 13] = colorArray [i24 + 17] = colorArray [i24 + 21] = color .y;
 							colorArray [i24 + 2] = colorArray [i24 + 6] = colorArray [i24 + 10] = colorArray [i24 + 14] = colorArray [i24 + 18] = colorArray [i24 + 22] = color .z;
 							colorArray [i24 + 3] = colorArray [i24 + 7] = colorArray [i24 + 11] = colorArray [i24 + 15] = colorArray [i24 + 19] = colorArray [i24 + 23] = color .w;
 						}
-			
+
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .colorBuffer);
 						gl .bufferData (gl .ARRAY_BUFFER, this .colorArray, gl .STATIC_DRAW);
 					}
-		
+
 					if (this .texCoordAnim && this .texCoordArray .length)
 					{
 						var
 							texCoordKeys = this .texCoordKeys,
 							texCoordRamp = this .texCoordRamp;
-		
+
 						var
 							length = texCoordKeys .length,
 							index0 = 0;
-				
+
 						for (var i = 0; i < maxParticles; ++ i)
 						{
 							// Determine index0.
-				
+
 							var
 								particle = particles [i],
 								fraction = particle .elapsedTime / particle .lifetime;
-			
+
 							if (length == 1 || fraction <= texCoordKeys [0])
 							{
 								index0 = 0;
 							}
-							else if (fraction >= texCoordKeys [length - 1])
+							else if (fraction >= texCoordKeys .at (-1))
 							{
 								index0 = length - 2;
 							}
 							else
 							{
 								var index = Algorithm .upperBound (texCoordKeys, 0, length, fraction, Algorithm .less);
-		
+
 								if (index < length)
 									index0 = index - 1;
 								else
 									index0 = 0;
 							}
-		
+
 							// Set texCoord.
-				
+
 							index0 *= this .texCoordCount;
-		
+
 							var
 								texCoord1 = texCoordRamp [index0],
 								texCoord2 = texCoordRamp [index0 + 1],
 								texCoord3 = texCoordRamp [index0 + 2],
 								texCoord4 = texCoordRamp [index0 + 3],
 								i24 = i * 24;
-		
+
 							// p4 ------ p3
 							// |       / |
 							// |     /   |
 							// |   /     |
 							// | /       |
 							// p1 ------ p2
-		
+
 							// p1
 							texCoordArray [i24]     = texCoordArray [i24 + 12] = texCoord1 .x;
 							texCoordArray [i24 + 1] = texCoordArray [i24 + 13] = texCoord1 .y;
 							texCoordArray [i24 + 2] = texCoordArray [i24 + 14] = texCoord1 .z;
 							texCoordArray [i24 + 3] = texCoordArray [i24 + 15] = texCoord1 .w;
-		
+
 							// p2
 							texCoordArray [i24 + 4] = texCoord2 .x;
 							texCoordArray [i24 + 5] = texCoord2 .y;
 							texCoordArray [i24 + 6] = texCoord2 .z;
 							texCoordArray [i24 + 7] = texCoord2 .w;
-		
+
 							// p3
 							texCoordArray [i24 + 8]  = texCoordArray [i24 + 16] = texCoord3 .x;
 							texCoordArray [i24 + 9]  = texCoordArray [i24 + 17] = texCoord3 .y;
 							texCoordArray [i24 + 10] = texCoordArray [i24 + 18] = texCoord3 .z;
 							texCoordArray [i24 + 11] = texCoordArray [i24 + 19] = texCoord3 .w;
-		
+
 							// p4
 							texCoordArray [i24 + 20] = texCoord4 .x;
 							texCoordArray [i24 + 21] = texCoord4 .y;
 							texCoordArray [i24 + 22] = texCoord4 .z;
 							texCoordArray [i24 + 23] = texCoord4 .w;
 						}
-			
+
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .texCoordBuffers [0]);
 						gl .bufferData (gl .ARRAY_BUFFER, this .texCoordArray, gl .STATIC_DRAW);
 					}
 				}
 
 				// Vertices
-	
+
 				if (this .geometryType === SPRITE)
 				{
 					if (modelViewMatrix) // if called from depth or draw
 					{
 						// Normals
-		
+
 						var rotation = this .getScreenAlignedRotation (modelViewMatrix);
-		
+
 						normal
 							.set (rotation [0], rotation [1], rotation [2])
 							.cross (vector .set (rotation [3], rotation [4], rotation [5]))
 							.normalize ();
-		
+
 						var
 							nx = normal .x,
 							ny = normal .y,
 							nz = normal .z;
-		
+
 						for (var i = 0, length = 6 * 3 * maxParticles; i < length; i += 3)
 						{
 							normalArray [i]     = nx;
 							normalArray [i + 1] = ny;
 							normalArray [i + 2] = nz;
 						}
-		
+
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .normalBuffer);
 						gl .bufferData (gl .ARRAY_BUFFER, this .normalArray, gl .STATIC_DRAW);
-		
+
 						// Vertices
-		
+
 						s1 .set (-sx1_2, -sy1_2, 0);
 						s2 .set ( sx1_2, -sy1_2, 0);
 						s3 .set ( sx1_2,  sy1_2, 0);
 						s4 .set (-sx1_2,  sy1_2, 0);
-		
+
 						rotation .multVecMatrix (s1);
 						rotation .multVecMatrix (s2);
 						rotation .multVecMatrix (s3);
 						rotation .multVecMatrix (s4);
-		
+
 						for (var i = 0; i < numParticles; ++ i)
 						{
 							var
@@ -2780,7 +2809,7 @@ function (Fields,
 								i6          = i * 6,
 								i18         = i * 18,
 								i24         = i * 24;
-			
+
 							// p4 ------ p3
 							// |       / |
 							// |     /   |
@@ -2800,23 +2829,23 @@ function (Fields,
 							vertexArray [i24]     = vertexArray [i24 + 12] = x + s1 .x;
 							vertexArray [i24 + 1] = vertexArray [i24 + 13] = y + s1 .y;
 							vertexArray [i24 + 2] = vertexArray [i24 + 14] = z + s1 .z;
-			
+
 							// p2
 							vertexArray [i24 + 4] = x + s2 .x;
 							vertexArray [i24 + 5] = y + s2 .y;
 							vertexArray [i24 + 6] = z + s2 .z;
-			
+
 							// p3
 							vertexArray [i24 + 8]  = vertexArray [i24 + 16] = x + s3 .x;
 							vertexArray [i24 + 9]  = vertexArray [i24 + 17] = y + s3 .y;
 							vertexArray [i24 + 10] = vertexArray [i24 + 18] = z + s3 .z;
-			
+
 							// p4
 							vertexArray [i24 + 20] = x + s4 .x;
 							vertexArray [i24 + 21] = y + s4 .y;
 							vertexArray [i24 + 22] = z + s4 .z;
 						}
-	
+
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .positionBuffer);
 						gl .bufferData (gl .ARRAY_BUFFER, this .positionArray, gl .STATIC_DRAW);
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .elapsedTimeBuffer);
@@ -2842,7 +2871,7 @@ function (Fields,
 								i6          = i * 6,
 								i18         = i * 18,
 								i24         = i * 24;
-			
+
 							// p4 ------ p3
 							// |       / |
 							// |     /   |
@@ -2856,28 +2885,28 @@ function (Fields,
 
 							elapsedTimeArray [i6] = elapsedTimeArray [i6 + 1] = elapsedTimeArray [i6 + 2] = elapsedTimeArray [i6 + 3] = elapsedTimeArray [i6 + 4] = elapsedTimeArray [i6 + 5] = elapsedTime;
 							lifeArray [i6]        = lifeArray [i6 + 1]        = lifeArray [i6 + 2]        = lifeArray [i6 + 3]        = lifeArray [i6 + 4]        = lifeArray [i6 + 5]        = particles [i] .life;
-			
+
 							// p1
 							vertexArray [i24]     = vertexArray [i24 + 12] = x - sx1_2;
 							vertexArray [i24 + 1] = vertexArray [i24 + 13] = y - sy1_2;
 							vertexArray [i24 + 2] = vertexArray [i24 + 14] = z;
-			
+
 							// p2
 							vertexArray [i24 + 4] = x + sx1_2;
 							vertexArray [i24 + 5] = y - sy1_2;
 							vertexArray [i24 + 6] = z;
-			
+
 							// p3
 							vertexArray [i24 + 8]  = vertexArray [i24 + 16] = x + sx1_2;
 							vertexArray [i24 + 9]  = vertexArray [i24 + 17] = y + sy1_2;
 							vertexArray [i24 + 10] = vertexArray [i24 + 18] = z;
-			
+
 							// p4
 							vertexArray [i24 + 20] = x - sx1_2;
 							vertexArray [i24 + 21] = y + sy1_2;
 							vertexArray [i24 + 22] = z;
 						}
-			
+
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .positionBuffer);
 						gl .bufferData (gl .ARRAY_BUFFER, this .positionArray, gl .STATIC_DRAW);
 						gl .bindBuffer (gl .ARRAY_BUFFER, this .elapsedTimeBuffer);
@@ -2905,14 +2934,20 @@ function (Fields,
 				{
 					break;
 				}
+				case TraverseType .PICKING:
+				{
+					break;
+				}
 				case TraverseType .COLLISION:
 				{
 					// TODO: to be implemented.
 					break;
 				}
-				case TraverseType .DEPTH:
+				case TraverseType .SHADOW:
 				{
-					renderObject .addDepthShape (this);
+					if (this .castShadow_ .getValue ())
+						renderObject .addDepthShape (this);
+
 					break;
 				}
 				case TraverseType .DISPLAY:
@@ -2950,20 +2985,23 @@ function (Fields,
 				if (this .numParticles <= 0)
 					return;
 
-				// Setup vertex attributes.
+				if (shaderNode .getValid ())
+				{
+					// Setup vertex attributes.
 
-				shaderNode .enableFloatAttrib (gl, "x3d_ParticleId",          this .idBuffer,          1);
-				shaderNode .enableFloatAttrib (gl, "x3d_ParticlePosition",    this .positionBuffer,    3);
-				shaderNode .enableFloatAttrib (gl, "x3d_ParticleElapsedTime", this .elapsedTimeBuffer, 1);
-				shaderNode .enableFloatAttrib (gl, "x3d_ParticleLife",        this .lifeBuffer,        1);
-				shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
+					shaderNode .enableFloatAttrib (gl, "x3d_ParticleId",          this .idBuffer,          1);
+					shaderNode .enableFloatAttrib (gl, "x3d_ParticlePosition",    this .positionBuffer,    3);
+					shaderNode .enableFloatAttrib (gl, "x3d_ParticleElapsedTime", this .elapsedTimeBuffer, 1);
+					shaderNode .enableFloatAttrib (gl, "x3d_ParticleLife",        this .lifeBuffer,        1);
+					shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
 
-				gl .drawArrays (this .primitiveMode, 0, this .numParticles * this .vertexCount);
+					gl .drawArrays (this .primitiveMode, 0, this .numParticles * this .vertexCount);
 
-				shaderNode .disableFloatAttrib (gl, "x3d_ParticleId");
-				shaderNode .disableFloatAttrib (gl, "x3d_ParticlePosition");
-				shaderNode .disableFloatAttrib (gl, "x3d_ParticleElapsedTime");
-				shaderNode .disableFloatAttrib (gl, "x3d_ParticleLife");
+					shaderNode .disableFloatAttrib (gl, "x3d_ParticleId");
+					shaderNode .disableFloatAttrib (gl, "x3d_ParticlePosition");
+					shaderNode .disableFloatAttrib (gl, "x3d_ParticleElapsedTime");
+					shaderNode .disableFloatAttrib (gl, "x3d_ParticleLife");
+				}
 			}
 		},
 		display: function (gl, context)
@@ -2973,10 +3011,6 @@ function (Fields,
 				if (this .numParticles <= 0)
 					return;
 
-				// Traverse appearance before everything.
-
-				this .getAppearance () .enable (gl, context);
-
 				// Update geometry if SPRITE.
 
 				this .updateGeometry (context .modelViewMatrix);
@@ -2985,92 +3019,83 @@ function (Fields,
 
 				if (this .geometryType === GEOMETRY)
 				{
-					var geometryNode = this .getGeometry ();
+					const geometryNode = this .getGeometry ();
 
 					if (geometryNode)
 						geometryNode .displayParticles (gl, context, this .particles, this .numParticles);
 				}
 				else
 				{
-					var
-						browser    = context .renderer .getBrowser (),
-						shaderNode = context .shaderNode;
-	
-					if (shaderNode === browser .getDefaultShader ())
-						shaderNode = this .shaderNode;
-		
+					const
+						appearanceNode = this .getAppearance (),
+						shaderNode     = appearanceNode .shaderNode || this .shaderNode || appearanceNode .materialNode .getShader (context .browser, context .shadow);
+
 					// Setup shader.
-	
-					context .geometryType  = this .shaderGeometryType;
-					context .colorMaterial = this .colorMaterial;
 
-					shaderNode .enable (gl);
-					shaderNode .setLocalUniforms (gl, context);
-		
-					// Setup vertex attributes.
+					if (shaderNode .getValid ())
+					{
+						context .geometryContext = this .geometryContext;
 
-					shaderNode .enableFloatAttrib (gl, "x3d_ParticleId",          this .idBuffer,          1);
-					shaderNode .enableFloatAttrib (gl, "x3d_ParticlePosition",    this .positionBuffer,    3);
-					shaderNode .enableFloatAttrib (gl, "x3d_ParticleElapsedTime", this .elapsedTimeBuffer, 1);
-					shaderNode .enableFloatAttrib (gl, "x3d_ParticleLife",        this .lifeBuffer,        1);
+						const blendModeNode = appearanceNode .blendModeNode;
 
-					if (this .colorMaterial)
-						shaderNode .enableColorAttribute (gl, this .colorBuffer);
-	
-					if (this .texCoordArray .length)
-						shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
-	
-					if (this .normalArray .length)
-						shaderNode .enableNormalAttribute (gl, this .normalBuffer);
-	
-					shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
-	
-					var testWireframe = false;
-	
-					switch (this .geometryType)
-					{
-						case POINT:
-						case LINE:
-							break;
-						case TRIANGLE:
-						case QUAD:
-						case SPRITE:
-							testWireframe = true;
-							break;
-						case GEOMETRY:
-							break;
-					}
-	
-					if (shaderNode .wireframe && testWireframe)
-					{
-						// Wireframes are always solid so only one drawing call is needed.
-		
-						for (var i = 0, length = this .numParticles * this .vertexCount; i < length; i += 3)
-							gl .drawArrays (shaderNode .primitiveMode, i, 3);
-					}
-					else
-					{
-						var positiveScale = Matrix4 .prototype .determinant3 .call (context .modelViewMatrix) > 0;
-			
-						gl .frontFace (positiveScale ? gl .CCW : gl .CW);
-						gl .enable (gl .CULL_FACE);
-						gl .cullFace (gl .BACK);
+						if (blendModeNode)
+							blendModeNode .enable (gl);
 
-						gl .drawArrays (this .primitiveMode, 0, this .numParticles * this .vertexCount);
-					}
-		
-					shaderNode .disableFloatAttrib (gl, "x3d_ParticleId");
-					shaderNode .disableFloatAttrib (gl, "x3d_ParticlePosition");
-					shaderNode .disableFloatAttrib (gl, "x3d_ParticleElapsedTime");
-					shaderNode .disableFloatAttrib (gl, "x3d_ParticleLife");
+						shaderNode .enable (gl);
+						shaderNode .setLocalUniforms (gl, context);
 
-					shaderNode .disableColorAttribute    (gl);
-					shaderNode .disableTexCoordAttribute (gl);
-					shaderNode .disableNormalAttribute   (gl);
-					shaderNode .disable                  (gl);
-				}
+						// Setup vertex attributes.
+
+						shaderNode .enableFloatAttrib (gl, "x3d_ParticleId",          this .idBuffer,          1);
+						shaderNode .enableFloatAttrib (gl, "x3d_ParticlePosition",    this .positionBuffer,    3);
+						shaderNode .enableFloatAttrib (gl, "x3d_ParticleElapsedTime", this .elapsedTimeBuffer, 1);
+						shaderNode .enableFloatAttrib (gl, "x3d_ParticleLife",        this .lifeBuffer,        1);
+
+						if (this .geometryContext .colorMaterial)
+							shaderNode .enableColorAttribute (gl, this .colorBuffer);
+
+						if (this .texCoordArray .length)
+							shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
+
+						if (this .normalArray .length)
+							shaderNode .enableNormalAttribute (gl, this .normalBuffer);
+
+						shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
+
+						if (shaderNode .wireframe && this .testWireframe)
+						{
+							// Wireframes are always solid so only one drawing call is needed.
+
+							for (var i = 0, length = this .numParticles * this .vertexCount; i < length; i += 3)
+								gl .drawArrays (shaderNode .primitiveMode, i, 3);
+						}
+						else
+						{
+							const positiveScale = Matrix4 .prototype .determinant3 .call (context .modelViewMatrix) > 0;
+
+							gl .frontFace (positiveScale ? gl .CCW : gl .CW);
+							gl .enable (gl .CULL_FACE);
+							gl .cullFace (gl .BACK);
+
+							gl .drawArrays (this .primitiveMode, 0, this .numParticles * this .vertexCount);
+						}
 
-				this .getAppearance () .disable (gl, context);
+						shaderNode .disableFloatAttrib (gl, "x3d_ParticleId");
+						shaderNode .disableFloatAttrib (gl, "x3d_ParticlePosition");
+						shaderNode .disableFloatAttrib (gl, "x3d_ParticleElapsedTime");
+						shaderNode .disableFloatAttrib (gl, "x3d_ParticleLife");
+
+						shaderNode .disableColorAttribute    (gl);
+						shaderNode .disableTexCoordAttribute (gl);
+						shaderNode .disableNormalAttribute   (gl);
+						shaderNode .disable                  (gl);
+
+						if (blendModeNode)
+							blendModeNode .disable (gl);
+
+						context .geometryContext = null;
+					}
+				}
 			}
 			catch (error)
 			{
@@ -3081,20 +3106,20 @@ function (Fields,
 		getScreenAlignedRotation: function (modelViewMatrix)
 		{
 			invModelViewMatrix .assign (modelViewMatrix) .inverse ();
-		
+
 			invModelViewMatrix .multDirMatrix (billboardToScreen .assign (Vector3 .zAxis));
 			invModelViewMatrix .multDirMatrix (viewerYAxis .assign (Vector3 .yAxis));
-		
+
 			x .assign (viewerYAxis) .cross (billboardToScreen);
 			y .assign (billboardToScreen) .cross (x);
 			var z = billboardToScreen;
-		
+
 			// Compose rotation
-		
+
 			x .normalize ();
 			y .normalize ();
 			z .normalize ();
-		
+
 			return this .rotation .set (x .x, x .y, x .z,
 			                            y .x, y .y, y .z,
 			                            z .x, z .y, z .z);
@@ -3104,8 +3129,6 @@ function (Fields,
 	return ParticleSystem;
 });
 
-
-
 /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
  *******************************************************************************
  *
@@ -3176,10 +3199,6 @@ function (Fields,
 {
 "use strict";
 
-	var
-		vertex1 = new Vector3 (0, 0, 0),
-		vertex2 = new Vector3 (0, 0, 0);
-
 	function PolylineEmitter (executionContext)
 	{
 		X3DParticleEmitterNode .call (this, executionContext);
@@ -3229,7 +3248,7 @@ function (Fields,
 
 			this .coordIndex_ .addFieldInterest (this .polylineNode .coordIndex_);
 			this .coord_      .addFieldInterest (this .polylineNode .coord_);
-		
+
 			this .polylineNode .coordIndex_ = this .coordIndex_;
 			this .polylineNode .coord_      = this .coord_;
 
@@ -3249,34 +3268,41 @@ function (Fields,
 			else
 				delete this .getRandomVelocity;
 		},
-		set_polyline: function ()
+		set_polyline: (function ()
 		{
-			var vertices = this .vertices = this .polylineNode .getVertices () .getValue ();
+			var
+				vertex1 = new Vector3 (0, 0, 0),
+				vertex2 = new Vector3 (0, 0, 0);
 
-			if (vertices .length)
+			return function ()
 			{
-				delete this .getRandomPosition;
+				var vertices = this .vertices = this .polylineNode .getVertices () .getValue ();
 
-				var
-					lengthSoFar      = 0,
-					lengthSoFarArray = this .lengthSoFarArray;
-		
-				lengthSoFarArray .length = 1;
-
-				for (var i = 0, length = vertices .length; i < length; i += 8)
+				if (vertices .length)
 				{
-					vertex1 .set (vertices [i],     vertices [i + 1], vertices [i + 2]);
-					vertex2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
+					delete this .getRandomPosition;
+
+					var
+						lengthSoFar      = 0,
+						lengthSoFarArray = this .lengthSoFarArray;
+
+					lengthSoFarArray .length = 1;
 
-					lengthSoFar += vertex2 .subtract (vertex1) .abs ();
-					lengthSoFarArray .push (lengthSoFar);
+					for (var i = 0, length = vertices .length; i < length; i += 8)
+					{
+						vertex1 .set (vertices [i],     vertices [i + 1], vertices [i + 2]);
+						vertex2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
+
+						lengthSoFar += vertex2 .subtract (vertex1) .abs ();
+						lengthSoFarArray .push (lengthSoFar);
+					}
 				}
-			}
-			else
-			{
-				this .getRandomPosition = getPosition;
-			}
-		},
+				else
+				{
+					this .getRandomPosition = getPosition;
+				}
+			};
+		})(),
 		getRandomPosition: function (position)
 		{
 			// Determine index0 and weight.
@@ -3284,7 +3310,7 @@ function (Fields,
 			var
 				lengthSoFarArray = this .lengthSoFarArray,
 				length           = lengthSoFarArray .length,
-				fraction         = Math .random () * lengthSoFarArray [length - 1],
+				fraction         = Math .random () * lengthSoFarArray .at (-1),
 				index0           = 0,
 				index1           = 0,
 				weight           = 0;
@@ -3294,7 +3320,7 @@ function (Fields,
 				index0 = 0;
 				weight = 0;
 			}
-			else if (fraction >= lengthSoFarArray [length - 1])
+			else if (fraction >= lengthSoFarArray .at (-1))
 			{
 				index0 = length - 2;
 				weight = 1;
@@ -3307,11 +3333,11 @@ function (Fields,
 				{
 					index1 = index;
 					index0 = index - 1;
-			
+
 					var
 						key0 = lengthSoFarArray [index0],
 						key1 = lengthSoFarArray [index1];
-			
+
 					weight = Algorithm .clamp ((fraction - key0) / (key1 - key0), 0, 1);
 				}
 				else
@@ -3326,14 +3352,18 @@ function (Fields,
 			index0 *= 8;
 			index1  = index0 + 4;
 
-			var vertices = this .vertices;
+			var
+				vertices = this .vertices,
+				x1       = vertices [index0],
+				y1       = vertices [index0 + 1],
+				z1       = vertices [index0 + 2],
+				x2       = vertices [index1],
+				y2       = vertices [index1 + 1],
+				z2       = vertices [index1 + 2];
 
-			vertex1 .set (vertices [index0], vertices [index0 + 1], vertices [index0 + 2]);
-			vertex2 .set (vertices [index1], vertices [index1 + 1], vertices [index1 + 2]);
-	
-			position .x = vertex1 .x + weight * (vertex2 .x - vertex1 .x);
-			position .y = vertex1 .y + weight * (vertex2 .y - vertex1 .y);
-			position .z = vertex1 .z + weight * (vertex2 .z - vertex1 .z);
+			position .x = x1 + weight * (x2 - x1);
+			position .y = y1 + weight * (y2 - y1);
+			position .z = z1 + weight * (z2 - z1);
 
 			return position;
 		},
@@ -3359,8 +3389,6 @@ function (Fields,
 	return PolylineEmitter;
 });
 
-
-
 /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
  *******************************************************************************
  *
@@ -3424,7 +3452,7 @@ define ('x_ite/Components/ParticleSystems/SurfaceEmitter',[
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DParticleEmitterNode, 
+          X3DParticleEmitterNode,
           X3DConstants,
           X3DCast,
           Triangle3,
@@ -3433,12 +3461,6 @@ function (Fields,
 {
 "use strict";
 
-	var
-		vertex1  = new Vector3 (0, 0, 0),
-		vertex2  = new Vector3 (0, 0, 0),
-		vertex3  = new Vector3 (0, 0, 0),
-		direction = new Vector3 (0, 0, 0);
-
 	function SurfaceEmitter (executionContext)
 	{
 		X3DParticleEmitterNode .call (this, executionContext);
@@ -3451,6 +3473,7 @@ function (Fields,
 
 		this .surfaceNode    = null;
 		this .areaSoFarArray = [ 0 ];
+		this .direction      = new Vector3 (0, 0, 0);
 	}
 
 	SurfaceEmitter .prototype = Object .assign (Object .create (X3DParticleEmitterNode .prototype),
@@ -3496,41 +3519,47 @@ function (Fields,
 
 			this .set_geometry__ ();
 		},
-		set_geometry__: function ()
+		set_geometry__: (function ()
 		{
-			if (this .surfaceNode)
-			{		
-				delete this .getRandomPosition;
-				delete this .getRandomVelocity;
+			var
+				vertex1  = new Vector3 (0, 0, 0),
+				vertex2  = new Vector3 (0, 0, 0),
+				vertex3  = new Vector3 (0, 0, 0);
 
-				var
-					areaSoFar      = 0,
-					areaSoFarArray = this .areaSoFarArray,
-					vertices       = this .surfaceNode .getVertices () .getValue ();
-		
-				this .normals  = this .surfaceNode .getNormals () .getValue ();
-				this .vertices = vertices;
+			return function ()
+			{
+				if (this .surfaceNode)
+				{
+					delete this .getRandomPosition;
+					delete this .getRandomVelocity;
 
-				areaSoFarArray .length = 1;
+					var
+						areaSoFar      = 0,
+						areaSoFarArray = this .areaSoFarArray,
+						vertices       = this .surfaceNode .getVertices () .getValue ();
 
-				for (var i = 0, length = vertices .length; i < length; i += 12)
-				{
-					vertex1 .set (vertices [i],     vertices [i + 1], vertices [i + 2]);
-					vertex2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
-					vertex3 .set (vertices [i + 8], vertices [i + 9], vertices [i + 10]);
+					this .normals  = this .surfaceNode .getNormals () .getValue ();
+					this .vertices = vertices;
 
-					areaSoFar += Triangle3 .area (vertex1, vertex2, vertex3);
-					areaSoFarArray .push (areaSoFar);
-				}
-			}
-			else
-			{
-				this .getRandomPosition = getPosition;
-				this .getRandomVelocity = this .getSphericalRandomVelocity;
+					areaSoFarArray .length = 1;
 
-				direction .set (0, 0, 0);
-			}
-		},
+					for (var i = 0, length = vertices .length; i < length; i += 12)
+					{
+						vertex1 .set (vertices [i],     vertices [i + 1], vertices [i + 2]);
+						vertex2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
+						vertex3 .set (vertices [i + 8], vertices [i + 9], vertices [i + 10]);
+
+						areaSoFar += Triangle3 .area (vertex1, vertex2, vertex3);
+						areaSoFarArray .push (areaSoFar);
+					}
+				}
+				else
+				{
+					this .getRandomPosition = getPosition;
+					this .getRandomVelocity = this .getSphericalRandomVelocity;
+				}
+			};
+		})(),
 		getRandomPosition: function (position)
 		{
 			// Determine index0.
@@ -3538,14 +3567,14 @@ function (Fields,
 			var
 				areaSoFarArray = this .areaSoFarArray,
 				length         = areaSoFarArray .length,
-				fraction       = Math .random () * areaSoFarArray [length - 1],
+				fraction       = Math .random () * areaSoFarArray .at (-1),
 				index0         = 0;
 
 			if (length == 1 || fraction <= areaSoFarArray [0])
 			{
 				index0 = 0;
 			}
-			else if (fraction >= areaSoFarArray [length - 1])
+			else if (fraction >= areaSoFarArray .at (-1))
 			{
 				index0 = length - 2;
 			}
@@ -3568,28 +3597,29 @@ function (Fields,
 			var
 				u = Math .random (),
 				v = Math .random ();
-		
+
 			if (u + v > 1)
 			{
 				u = 1 - u;
 				v = 1 - v;
 			}
 
+			var t = 1 - u - v;
+
 			// Interpolate and set position.
 
 			var
 				i        = index0 * 12,
 				vertices = this .vertices;
 
-			var t = 1 - u - v;
-
 			position .x = u * vertices [i]     + v * vertices [i + 4] + t * vertices [i + 8];
 			position .y = u * vertices [i + 1] + v * vertices [i + 5] + t * vertices [i + 9];
 			position .z = u * vertices [i + 2] + v * vertices [i + 6] + t * vertices [i + 10];
 
 			var
-				i       = index0 * 9,
-				normals = this .normals;
+				i         = index0 * 9,
+				normals   = this .normals,
+				direction = this .direction;
 
 			direction .x = u * normals [i]     + v * normals [i + 3] + t * normals [i + 6];
 			direction .y = u * normals [i + 1] + v * normals [i + 4] + t * normals [i + 7];
@@ -3599,7 +3629,9 @@ function (Fields,
 		},
 		getRandomVelocity: function (velocity)
 		{
-			var speed = this .getRandomSpeed ();
+			var
+				speed     = this .getRandomSpeed (),
+				direction = this .direction;
 
 			velocity .x = direction .x * speed;
 			velocity .y = direction .y * speed;
@@ -3617,8 +3649,6 @@ function (Fields,
 	return SurfaceEmitter;
 });
 
-
-
 /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
  *******************************************************************************
  *
@@ -3701,21 +3731,6 @@ function (Fields,
 {
 "use strict";
 
-	var
-		vertex1  = new Vector3 (0, 0, 0),
-		vertex2  = new Vector3 (0, 0, 0),
-		vertex3  = new Vector3 (0, 0, 0),
-		point    = new Vector3 (0, 0, 0),
-		normal   = new Vector3 (0, 0, 0),
-		rotation = new Rotation4 (0, 0, 1, 0),
-		line     = new Line3 (Vector3 .Zero, Vector3 .zAxis),
-		plane    = new Plane3 (Vector3 .Zero, Vector3 .zAxis);
-
-	function PlaneCompare (a, b)
-	{
-		return plane .getDistanceToPoint (a) < plane .getDistanceToPoint (b);
-	}
-
 	function VolumeEmitter (executionContext)
 	{
 		X3DParticleEmitterNode .call (this, executionContext);
@@ -3729,8 +3744,6 @@ function (Fields,
 		this .direction      = new Vector3 (0, 0, 0);
 		this .volumeNode     = new IndexedFaceSet (executionContext);
 		this .areaSoFarArray = [ 0 ];
-		this .intersections  = [ ];
-		this .sorter         = new QuickSort (this .intersections, PlaneCompare);
 	}
 
 	VolumeEmitter .prototype = Object .assign (Object .create (X3DParticleEmitterNode .prototype),
@@ -3767,7 +3780,7 @@ function (Fields,
 
 			this .coordIndex_ .addFieldInterest (this .volumeNode .coordIndex_);
 			this .coord_      .addFieldInterest (this .volumeNode .coord_);
-	
+
 			this .volumeNode .creaseAngle_ = Math .PI;
 			this .volumeNode .convex_      = false;
 			this .volumeNode .coordIndex_  = this .coordIndex_;
@@ -3789,140 +3802,163 @@ function (Fields,
 			else
 				delete this .getRandomVelocity;
 		},
-		set_geometry__: function ()
+		set_geometry__: (function ()
 		{
 			var
-				areaSoFar      = 0,
-				areaSoFarArray = this .areaSoFarArray,
-				normals        = this .volumeNode .getNormals () .getValue (),
-				vertices       = this .volumeNode .getVertices () .getValue ();
-
-			this .normals  = normals;
-			this .vertices = vertices;
+				vertex1 = new Vector3 (0, 0, 0),
+				vertex2 = new Vector3 (0, 0, 0),
+				vertex3 = new Vector3 (0, 0, 0);
 
-			areaSoFarArray .length = 1;
-
-			for (var i = 0, length = vertices .length; i < length; i += 12)
+			return function ()
 			{
-				vertex1 .set (vertices [i],     vertices [i + 1], vertices [i + 2]);
-				vertex2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
-				vertex3 .set (vertices [i + 8], vertices [i + 9], vertices [i + 10]);
+				var
+					areaSoFar      = 0,
+					areaSoFarArray = this .areaSoFarArray,
+					normals        = this .volumeNode .getNormals () .getValue (),
+					vertices       = this .volumeNode .getVertices () .getValue ();
 
-				areaSoFar += Triangle3 .area (vertex1, vertex2, vertex3);
-				areaSoFarArray .push (areaSoFar);
-			}
+				this .normals  = normals;
+				this .vertices = vertices;
 
-			this .bvh = new BVH (vertices, normals);
-		},
-		getRandomPosition: function (position)
-		{
-			// Get random point on surface
+				areaSoFarArray .length = 1;
 
-			// Determine index0.
+				for (var i = 0, length = vertices .length; i < length; i += 12)
+				{
+					vertex1 .set (vertices [i],     vertices [i + 1], vertices [i + 2]);
+					vertex2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
+					vertex3 .set (vertices [i + 8], vertices [i + 9], vertices [i + 10]);
 
-			var
-				areaSoFarArray = this .areaSoFarArray,
-				length         = areaSoFarArray .length,
-				fraction       = Math .random () * areaSoFarArray [length - 1],
-				index0         = 0;
+					areaSoFar += Triangle3 .area (vertex1, vertex2, vertex3);
+					areaSoFarArray .push (areaSoFar);
+				}
 
-			if (length == 1 || fraction <= areaSoFarArray [0])
-			{
-				index0 = 0;
-			}
-			else if (fraction >= areaSoFarArray [length - 1])
+				this .bvh = new BVH (vertices, normals);
+			};
+		})(),
+		getRandomPosition: (function ()
+		{
+			var
+				point         = new Vector3 (0, 0, 0),
+				normal        = new Vector3 (0, 0, 0),
+				rotation      = new Rotation4 (0, 0, 1, 0),
+				line          = new Line3 (Vector3 .Zero, Vector3 .zAxis),
+				plane         = new Plane3 (Vector3 .Zero, Vector3 .zAxis),
+				intersections = [ ],
+				sorter        = new QuickSort (intersections, PlaneCompare);
+
+			function PlaneCompare (a, b)
 			{
-				index0 = length - 2;
+				return plane .getDistanceToPoint (a) < plane .getDistanceToPoint (b);
 			}
-			else
+
+			return function (position)
 			{
-				var index = Algorithm .upperBound (areaSoFarArray, 0, length, fraction, Algorithm .less);
+				// Get random point on surface
 
-				if (index < length)
+				// Determine index0.
+
+				var
+					areaSoFarArray = this .areaSoFarArray,
+					length         = areaSoFarArray .length,
+					fraction       = Math .random () * areaSoFarArray .at (-1),
+					index0         = 0;
+
+				if (length == 1 || fraction <= areaSoFarArray [0])
 				{
-					index0 = index - 1;
+					index0 = 0;
+				}
+				else if (fraction >= areaSoFarArray .at (-1))
+				{
+					index0 = length - 2;
 				}
 				else
 				{
-					index0 = 0;
+					var index = Algorithm .upperBound (areaSoFarArray, 0, length, fraction, Algorithm .less);
+
+					if (index < length)
+					{
+						index0 = index - 1;
+					}
+					else
+					{
+						index0 = 0;
+					}
 				}
-			}
 
-			// Random barycentric coordinates.
+				// Random barycentric coordinates.
 
-			var
-				u = Math .random (),
-				v = Math .random ();
-		
-			if (u + v > 1)
-			{
-				u = 1 - u;
-				v = 1 - v;
-			}
+				var
+					u = Math .random (),
+					v = Math .random ();
 
-			var t = 1 - u - v;
+				if (u + v > 1)
+				{
+					u = 1 - u;
+					v = 1 - v;
+				}
 
-			// Interpolate and determine random point on surface and normal.
+				var t = 1 - u - v;
 
-			var
-				i        = index0 * 12,
-				vertices = this .vertices;
+				// Interpolate and determine random point on surface and normal.
 
-			point .x = u * vertices [i]     + v * vertices [i + 4] + t * vertices [i + 8];
-			point .y = u * vertices [i + 1] + v * vertices [i + 5] + t * vertices [i + 9];
-			point .z = u * vertices [i + 2] + v * vertices [i + 6] + t * vertices [i + 10];
+				var
+					i        = index0 * 12,
+					vertices = this .vertices;
 
-			var
-				i       = index0 * 9,
-				normals = this .normals;
+				point .x = u * vertices [i]     + v * vertices [i + 4] + t * vertices [i + 8];
+				point .y = u * vertices [i + 1] + v * vertices [i + 5] + t * vertices [i + 9];
+				point .z = u * vertices [i + 2] + v * vertices [i + 6] + t * vertices [i + 10];
 
-			normal .x = u * normals [i]     + v * normals [i + 3] + t * normals [i + 6];
-			normal .y = u * normals [i + 1] + v * normals [i + 4] + t * normals [i + 7];
-			normal .z = u * normals [i + 2] + v * normals [i + 5] + t * normals [i + 8];
+				var
+					i       = index0 * 9,
+					normals = this .normals;
 
-			rotation .setFromToVec (Vector3 .zAxis, normal);
-			rotation .multVecRot (this .getRandomSurfaceNormal (normal));
+				normal .x = u * normals [i]     + v * normals [i + 3] + t * normals [i + 6];
+				normal .y = u * normals [i + 1] + v * normals [i + 4] + t * normals [i + 7];
+				normal .z = u * normals [i + 2] + v * normals [i + 5] + t * normals [i + 8];
 
-			// Setup random line throu volume for intersection text
-			// and a plane corresponding to the line for intersection sorting.
+				rotation .setFromToVec (Vector3 .zAxis, normal);
+				rotation .multVecRot (this .getRandomSurfaceNormal (normal));
 
-			line  .set (point, normal);
-			plane .set (point, normal);
-	
-			// Find random point in volume.
+				// Setup random line throu volume for intersection text
+				// and a plane corresponding to the line for intersection sorting.
 
-			var
-				intersections    = this .intersections,
-				numIntersections = this .bvh .intersectsLine (line, intersections);
+				line  .set (point, normal);
+				plane .set (point, normal);
 
-			numIntersections -= numIntersections % 2; // We need an even count of intersections.
+				// Find random point in volume.
 
-			if (numIntersections)
-			{
-				// Sort intersections along line with a little help from the plane.
+				var numIntersections = this .bvh .intersectsLine (line, intersections);
 
-				this .sorter .sort (0, numIntersections);
+				numIntersections -= numIntersections % 2; // We need an even count of intersections.
 
-				// Select random intersection pair.
+				if (numIntersections)
+				{
+					// Sort intersections along line with a little help from the plane.
 
-				var
-					index  = Math .round (this .getRandomValue (0, numIntersections / 2 - 1)) * 2,
-					point0 = intersections [index],
-					point1 = intersections [index + 1],
-					t      = Math .random ();
-	
-				// lerp
-				position .x = point0 .x + (point1 .x - point0 .x) * t;
-				position .y = point0 .y + (point1 .y - point0 .y) * t;
-				position .z = point0 .z + (point1 .z - point0 .z) * t;
-	
-				return position;
-			}
+					sorter .sort (0, numIntersections);
 
-			// Discard point.
+					// Select random intersection pair.
 
-			return position .set (Number .POSITIVE_INFINITY, Number .POSITIVE_INFINITY, Number .POSITIVE_INFINITY);
-		},
+					var
+						index  = Math .round (this .getRandomValue (0, numIntersections / 2 - 1)) * 2,
+						point0 = intersections [index],
+						point1 = intersections [index + 1],
+						t      = Math .random ();
+
+					// lerp
+					position .x = point0 .x + (point1 .x - point0 .x) * t;
+					position .y = point0 .y + (point1 .y - point0 .y) * t;
+					position .z = point0 .z + (point1 .z - point0 .z) * t;
+
+					return position;
+				}
+
+				// Discard point.
+
+				return position .set (Number .POSITIVE_INFINITY, Number .POSITIVE_INFINITY, Number .POSITIVE_INFINITY);
+			};
+		})(),
 		getRandomVelocity: function (velocity)
 		{
 			var
@@ -3940,8 +3976,6 @@ function (Fields,
 	return VolumeEmitter;
 });
 
-
-
 /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
  *******************************************************************************
  *
@@ -4010,8 +4044,6 @@ function (Fields,
 {
 "use strict";
 
-	var force = new Vector3 (0, 0, 0);
-
 	function WindPhysicsModel (executionContext)
 	{
 		X3DParticlePhysicsModelNode .call (this, executionContext);
@@ -4052,25 +4084,30 @@ function (Fields,
 		
 			return emitterNode .getRandomValue (Math .max (0, speed - variation), speed + variation);
 		},
-		addForce: function (i, emitterNode, forces, turbulences)
+		addForce: (function ()
 		{
-			var surfaceArea = emitterNode .surfaceArea_ .getValue ()
+			var force = new Vector3 (0, 0, 0);
 
-			if (this .enabled_ .getValue ())
+			return function (i, emitterNode, forces, turbulences)
 			{
-				var
-					randomSpeed = this .getRandomSpeed (emitterNode),
-					pressure    = Math .pow (10, 2 * Math .log (randomSpeed)) * 0.64615;
-		
-				if (this .direction_ .getValue () .equals (Vector3 .Zero))
-					emitterNode .getRandomNormal (force);
-				else
-					force .assign (this .direction_ .getValue ()) .normalize ();
-
-				forces [i] .assign (force .multiply (surfaceArea * pressure));
-				turbulences [i] = Math .PI * Algorithm .clamp (this .turbulence_ .getValue (), 0, 1);
-			}
-		},
+				var surfaceArea = emitterNode .surfaceArea_ .getValue ()
+	
+				if (this .enabled_ .getValue ())
+				{
+					var
+						randomSpeed = this .getRandomSpeed (emitterNode),
+						pressure    = Math .pow (10, 2 * Math .log (randomSpeed)) * 0.64615;
+			
+					if (this .direction_ .getValue () .equals (Vector3 .Zero))
+						emitterNode .getRandomNormal (force);
+					else
+						force .assign (this .direction_ .getValue ()) .normalize ();
+	
+					forces [i] .assign (force .multiply (surfaceArea * pressure));
+					turbulences [i] = Math .PI * Algorithm .clamp (this .turbulence_ .getValue (), 0, 1);
+				}
+			};
+		})(),
 	});
 
 	return WindPhysicsModel;
@@ -4126,7 +4163,7 @@ function (Fields,
  ******************************************************************************/
 
 
-define ([
+define (require .getComponentUrl ("particle-systems"), [
 	"x_ite/Components",
 	"x_ite/Browser/ParticleSystems/X3DParticleSystemsContext",
 	"x_ite/Components/ParticleSystems/BoundedPhysicsModel",
@@ -4179,10 +4216,11 @@ function (Components,
 			X3DParticleEmitterNode:      X3DParticleEmitterNode,
 			X3DParticlePhysicsModelNode: X3DParticlePhysicsModelNode,
 		},
-		browser: X3DParticleSystemsContext .prototype,
+		browser: X3DParticleSystemsContext,
 	});
 });
 
 
 
-}());
+})
+(typeof module === "object" ? module : undefined, typeof require === "function" ? require : undefined);