x_ite 4.0.5 → 4.7.5

package/src/x_ite/Components/ParticleSystems/VolumeEmitter.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -64,8 +63,7 @@ define ([
 	"standard/Math/Utility/BVH",
 	"standard/Math/Algorithms/QuickSort",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DParticleEmitterNode,
@@ -82,36 +80,22 @@ function ($,
 {
 "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);
 
 		this .addType (X3DConstants .VolumeEmitter);
 
-		this .direction           = new Vector3 (0, 0, 0);
-		this .volumeNode          = new IndexedFaceSet (executionContext);
-		this .areaSoFarArray      = [ 0 ];
-		this .intersections       = [ ];
-		this .intersectionNormals = [ ];
-		this .sorter              = new QuickSort (this .intersections, PlaneCompare);
+		this .speed_       .setUnit ("speed");
+		this .mass_        .setUnit ("mass");
+		this .surfaceArea_ .setUnit ("area");
+
+		this .direction      = new Vector3 (0, 0, 0);
+		this .volumeNode     = new IndexedFaceSet (executionContext);
+		this .areaSoFarArray = [ 0 ];
 	}
 
-	VolumeEmitter .prototype = $.extend (Object .create (X3DParticleEmitterNode .prototype),
+	VolumeEmitter .prototype = Object .assign (Object .create (X3DParticleEmitterNode .prototype),
 	{
 		constructor: VolumeEmitter,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -145,16 +129,17 @@ function ($,
 
 			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_;
 			this .volumeNode .coord_       = this .coord_;
 
-			this .volumeNode .addInterest ("set_geometry__", this);
+			this .volumeNode .rebuild_ .addInterest ("set_geometry__", this);
 			this .volumeNode .setPrivate (true);
 			this .volumeNode .setup ();
 
+			this .set_direction__ ();
 			this .set_geometry__ ();
 		},
 		set_direction__: function ()
@@ -166,136 +151,163 @@ function ($,
 			else
 				delete this .getRandomVelocity;
 		},
-		set_geometry__: function ()
+		set_geometry__: (function ()
 		{
 			var
-				areaSoFar      = 0,
-				areaSoFarArray = this .areaSoFarArray,
-				vertices       = this .volumeNode .getVertices (),
-				normals        = this .volumeNode .getNormals ();
-	
-			areaSoFarArray .length = 1;
-
-			for (var i = 0, length = vertices .length; i < length; i += 12)
+				vertex1 = new Vector3 (0, 0, 0),
+				vertex2 = new Vector3 (0, 0, 0),
+				vertex3 = new Vector3 (0, 0, 0);
+
+			return function ()
 			{
-				vertex1 .set (vertices [i + 0], 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 = 0;
+				}
+				else if (fraction >= areaSoFarArray .at (-1))
 				{
-					index0 = index - 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 .volumeNode .getVertices ();
+				// Interpolate and determine random point on surface and normal.
 
-			point .x = u * vertices [i + 0] + 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 .volumeNode .getNormals ();
+				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 + 0] + 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, this .intersectionNormals);
+				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 ();
-	
-				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
@@ -312,5 +324,3 @@ function ($,
 
 	return VolumeEmitter;
 });
-
-

package/src/x_ite/Components/ParticleSystems/WindPhysicsModel.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -57,8 +56,7 @@ define ([
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Algorithm",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DParticlePhysicsModelNode, 
@@ -68,16 +66,16 @@ function ($,
 {
 "use strict";
 
-	var force = new Vector3 (0, 0, 0);
-
 	function WindPhysicsModel (executionContext)
 	{
 		X3DParticlePhysicsModelNode .call (this, executionContext);
 
 		this .addType (X3DConstants .WindPhysicsModel);
+
+		this .speed_ .setUnit ("speed");
 	}
 
-	WindPhysicsModel .prototype = $.extend (Object .create (X3DParticlePhysicsModelNode .prototype),
+	WindPhysicsModel .prototype = Object .assign (Object .create (X3DParticlePhysicsModelNode .prototype),
 	{
 		constructor: WindPhysicsModel,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -108,25 +106,30 @@ function ($,
 		
 			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;

package/src/x_ite/Components/ParticleSystems/X3DParticleEmitterNode.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Components/Core/X3DNode",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Vector3",
@@ -58,8 +57,7 @@ define ([
 	"standard/Math/Algorithm",
 	"standard/Math/Algorithms/QuickSort",
 ],
-function ($,
-          X3DNode, 
+function (X3DNode,
           X3DConstants,
           Vector3,
           Rotation4,
@@ -92,13 +90,17 @@ function ($,
 
 		this .addType (X3DConstants .X3DParticleEmitterNode);
 
+		this .speed_       .setUnit ("speed");
+		this .mass_        .setUnit ("mass");
+		this .surfaceArea_ .setUnit ("area");
+
 		this .rotations           = [ ];
 		this .intersections       = [ ];
 		this .intersectionNormals = [ ];
 		this .sorter              = new QuickSort (this .intersections, PlaneCompare);
 	}
 
-	X3DParticleEmitterNode .prototype = $.extend (Object .create (X3DNode .prototype),
+	X3DParticleEmitterNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 	{
 		constructor: X3DParticleEmitterNode,
 		initialize: function ()
@@ -139,7 +141,7 @@ function ($,
 				v   = particleLifetime * lifetimeVariation,
 				min = Math .max (0, particleLifetime - v),
 				max = particleLifetime + v;
-		
+
 			return Math .random () * (max - min) + min;
 		},
 		getRandomSpeed: function ()
@@ -149,7 +151,7 @@ function ($,
 				v     = speed * this .variation,
 				min   = Math .max (0, speed - v),
 				max   = speed + v;
-		
+
 			return Math .random () * (max - min) + min;
 		},
 		getSphericalRandomVelocity: function (velocity)
@@ -167,7 +169,7 @@ function ($,
 				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);
@@ -179,7 +181,7 @@ function ($,
 				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);
@@ -188,7 +190,7 @@ function ($,
 		{
 			rotation .setFromToVec (Vector3 .zAxis, direction);
 
-			return rotation .multVecRot (this .getRandomNormalAngle (angle, normal));
+			return rotation .multVecRot (this .getRandomNormalWithAngle (angle, normal));
 		},
 		getRandomSurfaceNormal: function (normal)
 		{
@@ -197,7 +199,7 @@ function ($,
 				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);
@@ -229,7 +231,7 @@ function ($,
 				var
 					particle    = particles [i],
 					elapsedTime = particle .elapsedTime + deltaTime;
-		
+
 				if (elapsedTime > particle .lifetime)
 				{
 					// Create new particle or hide particle.
@@ -239,7 +241,8 @@ function ($,
 
 					if (createParticles)
 					{
-						this .getRandomPosition (particle .position)
+						++ particle .life;
+						this .getRandomPosition (particle .position);
 						this .getRandomVelocity (particle .velocity);
 					}
 					else
@@ -267,7 +270,7 @@ function ($,
 						position .x += velocity .x * deltaTime;
 						position .y += velocity .y * deltaTime;
 						position .z += velocity .z * deltaTime;
-			
+
 						this .bounce (boundedVolume, fromPosition, position, velocity);
 					}
 					else
@@ -276,14 +279,14 @@ function ($,
 						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)
@@ -291,7 +294,7 @@ function ($,
 			normal .assign (velocity) .normalize ();
 
 			line .set (fromPosition, normal);
-		
+
 			var
 				intersections       = this .intersections,
 				intersectionNormals = this .intersectionNormals,
@@ -303,11 +306,11 @@ function ($,
 					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
@@ -315,7 +318,7 @@ function ($,
 						intersectionNormal = intersectionNormals [intersection .index];
 
 					plane .set (intersection, intersectionNormal);
-		
+
 					if (plane .getDistanceToPoint (fromPosition) * plane .getDistanceToPoint (toPosition) < 0)
 					{
 						var dot2 = 2 * intersectionNormal .dot (velocity);
@@ -342,7 +345,7 @@ function ($,
 				index0 = 0,
 				index1 = 0,
 				weight = 0;
-		
+
 			for (var i = 0; i < numParticles; ++ i)
 			{
 				// Determine index0, index1 and weight.
@@ -367,16 +370,16 @@ function ($,
 				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
@@ -386,13 +389,13 @@ function ($,
 						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);
@@ -404,5 +407,3 @@ function ($,
 
 	return X3DParticleEmitterNode;
 });
-
-

package/src/x_ite/Components/ParticleSystems/X3DParticlePhysicsModelNode.js

@@ -48,12 +48,10 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Components/Core/X3DNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          X3DNode, 
+function (X3DNode, 
           X3DConstants)
 {
 "use strict";
@@ -65,7 +63,7 @@ function ($,
 		this .addType (X3DConstants .X3DParticlePhysicsModelNode);
 	}
 
-	X3DParticlePhysicsModelNode .prototype = $.extend (Object .create (X3DNode .prototype),
+	X3DParticlePhysicsModelNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 	{
 		constructor: X3DParticlePhysicsModelNode,
 		addForce: function ()