x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/EnvironmentalSensor/VisibilitySensor.js

@@ -55,6 +55,7 @@ define ([
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Vector3",
+	"standard/Math/Geometry/Box3",
 ],
 function (Fields,
           X3DFieldDefinition,
@@ -62,18 +63,19 @@ function (Fields,
           X3DEnvironmentalSensorNode,
           TraverseType,
           X3DConstants,
-          Vector3)
+          Vector3,
+          Box3)
 {
 "use strict";
 
-	var infinity = new Vector3 (-1, -1, -1);
-	
 	function VisibilitySensor (executionContext)
 	{
 		X3DEnvironmentalSensorNode .call (this, executionContext);
 
 		this .addType (X3DConstants .VisibilitySensor);
 
+		this .setZeroTest (false);
+
 		this .visible = false;
 	}
 
@@ -89,8 +91,6 @@ function (Fields,
 			new X3DFieldDefinition (X3DConstants .outputOnly,  "exitTime",  new Fields .SFTime ()),
 			new X3DFieldDefinition (X3DConstants .outputOnly,  "isActive",  new Fields .SFBool ()),
 		]),
-		size: new Vector3 (0, 0, 0),
-		center: new Vector3 (0, 0, 0),
 		getTypeName: function ()
 		{
 			return "VisibilitySensor";
@@ -138,36 +138,40 @@ function (Fields,
 					this .exitTime_ = this .getBrowser () .getCurrentTime ();
 				}
 			}
-				
+
 			this .setTraversed (false);
 		},
-		traverse: function (type, renderObject)
+		traverse: (function ()
 		{
-			if (type !== TraverseType .DISPLAY)
-				return;
+			const
+				bbox     = new Box3 (),
+				infinity = new Vector3 (-1, -1, -1);
 
-			this .setTraversed (true);
+			return function (type, renderObject)
+			{
+				if (type !== TraverseType .DISPLAY)
+					return;
 
-			if (this .visible)
-				return;
+				this .setTraversed (true);
 
-			if (this .size_ .getValue () .equals (infinity))
-				this .visible = true;
+				if (this .visible)
+					return;
 
-			else
-			{
-				var
-					viewVolume      = renderObject .getViewVolume (),
-					modelViewMatrix = renderObject .getModelViewMatrix () .get (),
-					size            = modelViewMatrix .multDirMatrix (this .size   .assign (this .size_   .getValue ())),
-					center          = modelViewMatrix .multVecMatrix (this .center .assign (this .center_ .getValue ()));
+				if (this .size_ .getValue () .equals (infinity))
+				{
+					this .visible = true;
+				}
+				else
+				{
+					bbox
+						.set (this .size_ .getValue (), this .center_ .getValue ())
+						.multRight (renderObject .getModelViewMatrix () .get ());
 
-				this .visible = viewVolume .intersectsSphere (size .abs () / 2, center);
-			}
-		},
+					this .visible = renderObject .getViewVolume () .intersectsBox (bbox);
+				}
+			};
+		})(),
 	});
-		
+
 	return VisibilitySensor;
 });
-
-

package/src/x_ite/Components/EnvironmentalSensor/X3DEnvironmentalSensorNode.js

@@ -54,7 +54,7 @@ define ([
 	"standard/Math/Numbers/Vector3",
 ],
 function (Fields,
-          X3DSensorNode, 
+          X3DSensorNode,
           X3DConstants,
           Vector3)
 {
@@ -71,6 +71,7 @@ function (Fields,
 		this .size_   .setUnit ("length");
 		this .center_ .setUnit ("length");
 
+		this .zeroTest         = false;
 		this .currentTraversed = true;
 	}
 
@@ -91,14 +92,14 @@ function (Fields,
 		},
 		set_live__: function ()
 		{
-			if (this .isLive () .getValue () && this .traversed_ .getValue () && this .enabled_ .getValue () && ! this .size_. getValue () .equals (Vector3 .Zero))
+			if (this .traversed_ .getValue () && this .isLive () .getValue () && this .enabled_ .getValue () && ! (this .zeroTest && this .size_. getValue () .equals (Vector3 .Zero)))
 			{
 				this .getBrowser () .sensorEvents () .addInterest ("update", this);
 			}
 			else
 			{
 				this .getBrowser () .sensorEvents () .removeInterest ("update", this);
-				
+
 				if (this .isActive_ .getValue ())
 				{
 					this .isActive_ = false;
@@ -106,6 +107,14 @@ function (Fields,
 				}
 			}
 		},
+		setZeroTest: function (value)
+		{
+			this .zeroTest = value;
+		},
+		getZeroTest: function ()
+		{
+			return this .zeroTest;
+		},
 		setTraversed: function (value)
 		{
 		   if (value)
@@ -130,5 +139,3 @@ function (Fields,
 
 	return X3DEnvironmentalSensorNode;
 });
-
-

package/src/x_ite/Components/EnvironmentalSensor.js

@@ -61,24 +61,21 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		ProximitySensor:  ProximitySensor,
 		TransformSensor:  TransformSensor,
 		VisibilitySensor: VisibilitySensor,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
 		X3DEnvironmentalSensorNode: X3DEnvironmentalSensorNode,
 	};
-	
-	for (var typeName in Types)
-		SupportedNodes .addType (typeName, Types [typeName]); 
 
-	for (var typeName in AbstractTypes)
-		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]); 
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
 
-	return Types;
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
 });
-

package/src/x_ite/Components/Followers/ColorChaser.js

@@ -59,7 +59,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DConstants,
           Color3,
           Vector3)
@@ -144,5 +144,3 @@ function (Fields,
 
 	return ColorChaser;
 });
-
-

package/src/x_ite/Components/Followers/ColorDamper.js

@@ -59,7 +59,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DDamperNode, 
+          X3DDamperNode,
           X3DConstants,
           Color3,
           Vector3)
@@ -142,5 +142,3 @@ function (Fields,
 
 	return ColorDamper;
 });
-
-

package/src/x_ite/Components/Followers/CoordinateChaser.js

@@ -59,7 +59,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DArrayChaserTemplate,
           X3DConstants,
           Vector3)
@@ -106,13 +106,7 @@ function (Fields,
 		{
 			return new Vector3 (0, 0, 0);
 		},
-		getArray: function ()
-		{
-			return new Fields .MFVec3f ();
-		},
 	});
 
 	return CoordinateChaser;
 });
-
-

package/src/x_ite/Components/Followers/CoordinateDamper.js

@@ -108,13 +108,7 @@ function (Fields,
 		{
 			return new Vector3 (0, 0, 0);
 		},
-		getArray: function ()
-		{
-			return new Fields .MFVec3f ();
-		},
 	});
 
 	return CoordinateDamper;
 });
-
-

package/src/x_ite/Components/Followers/OrientationChaser.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DConstants,
           Rotation4)
 {
@@ -73,6 +73,12 @@ function (Fields,
 		X3DChaserNode .call (this, executionContext);
 
 		this .addType (X3DConstants .OrientationChaser);
+
+		this .set_value_          .setUnit ("angle");
+		this .set_destination_    .setUnit ("angle");
+		this .initialValue_       .setUnit ("angle");
+		this .initialDestination_ .setUnit ("angle");
+		this .value_changed_      .setUnit ("angle");
 	}
 
 	OrientationChaser .prototype = Object .assign (Object .create (X3DChaserNode .prototype),
@@ -124,5 +130,3 @@ function (Fields,
 
 	return OrientationChaser;
 });
-
-

package/src/x_ite/Components/Followers/OrientationDamper.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DDamperNode, 
+          X3DDamperNode,
           X3DConstants,
           Rotation4)
 {
@@ -73,6 +73,12 @@ function (Fields,
 		X3DDamperNode .call (this, executionContext);
 
 		this .addType (X3DConstants .OrientationDamper);
+
+		this .set_value_          .setUnit ("angle");
+		this .set_destination_    .setUnit ("angle");
+		this .initialValue_       .setUnit ("angle");
+		this .initialDestination_ .setUnit ("angle");
+		this .value_changed_      .setUnit ("angle");
 	}
 
 	OrientationDamper .prototype = Object .assign (Object .create (X3DDamperNode .prototype),
@@ -120,5 +126,3 @@ function (Fields,
 
 	return OrientationDamper;
 });
-
-

package/src/x_ite/Components/Followers/PositionChaser.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DConstants,
           Vector3)
 {
@@ -104,5 +104,3 @@ function (Fields,
 
 	return PositionChaser;
 });
-
-

package/src/x_ite/Components/Followers/PositionChaser2D.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DConstants,
           Vector2)
 {
@@ -104,5 +104,3 @@ function (Fields,
 
 	return PositionChaser2D;
 });
-
-

package/src/x_ite/Components/Followers/PositionDamper.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DDamperNode, 
+          X3DDamperNode,
           X3DConstants,
           Vector3)
 {
@@ -106,5 +106,3 @@ function (Fields,
 
 	return PositionDamper;
 });
-
-

package/src/x_ite/Components/Followers/PositionDamper2D.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DDamperNode, 
+          X3DDamperNode,
           X3DConstants,
           Vector2)
 {
@@ -106,5 +106,3 @@ function (Fields,
 
 	return PositionDamper2D;
 });
-
-

package/src/x_ite/Components/Followers/ScalarChaser.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DConstants,
           Algorithm)
 {
@@ -132,5 +132,3 @@ function (Fields,
 
 	return ScalarChaser;
 });
-
-

package/src/x_ite/Components/Followers/ScalarDamper.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DDamperNode, 
+          X3DDamperNode,
           X3DConstants,
           Algorithm)
 {
@@ -122,5 +122,3 @@ function (Fields,
 
 	return ScalarDamper;
 });
-
-

package/src/x_ite/Components/Followers/TexCoordChaser2D.js

@@ -59,7 +59,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChaserNode, 
+          X3DChaserNode,
           X3DArrayChaserTemplate,
           X3DConstants,
           Vector2)
@@ -106,13 +106,7 @@ function (Fields,
 		{
 			return new Vector2 (0, 0);
 		},
-		getArray: function ()
-		{
-			return new Fields .MFVec2f ();
-		},
 	});
 
 	return TexCoordChaser2D;
 });
-
-

package/src/x_ite/Components/Followers/TexCoordDamper2D.js

@@ -59,7 +59,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DDamperNode, 
+          X3DDamperNode,
           X3DArrayFollowerTemplate,
           X3DConstants,
           Vector2)
@@ -108,13 +108,7 @@ function (Fields,
 		{
 			return new Vector2 (0, 0, 0);
 		},
-		getArray: function ()
-		{
-			return new Fields .MFVec2f ();
-		},
 	});
 
 	return TexCoordDamper2D;
 });
-
-

package/src/x_ite/Components/Followers/X3DChaserNode.js

@@ -51,7 +51,7 @@ define ([
 	"x_ite/Components/Followers/X3DFollowerNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function (X3DFollowerNode, 
+function (X3DFollowerNode,
           X3DConstants)
 {
 "use strict";
@@ -68,7 +68,7 @@ function (X3DFollowerNode,
 		this .stepTime      = 0;
 
 		// Auxillary variables
-		this .deltaOut = this .getArray ();
+		this .deltaOut = this .getVector ();
 	}
 
 	X3DChaserNode .prototype = Object .assign (Object .create (X3DFollowerNode .prototype),
@@ -77,7 +77,7 @@ function (X3DFollowerNode,
 		initialize: function ()
 		{
 			X3DFollowerNode .prototype .initialize .call (this);
-		
+
 			this .set_value_       .addInterest ("set_value__",       this);
 			this .set_destination_ .addInterest ("set_destination__", this);
 			this .duration_        .addInterest ("set_duration__",    this);
@@ -92,7 +92,7 @@ function (X3DFollowerNode,
 
 			this .bufferEndTime = this .getBrowser () .getCurrentTime ();
 			this .previousValue = this .duplicate (initialValue);
-	
+
 			buffer [0] = this .duplicate (initialDestination);
 
 			for (var i = 1; i < numBuffers; ++ i)
@@ -132,10 +132,10 @@ function (X3DFollowerNode,
 				return 0;
 
 			var duration = this .duration_ .getValue ();
-		
+
 			if (t >= duration)
 				return 1;
-	
+
 			return 0.5 - 0.5 * Math .cos ((t / duration) * Math .PI);
 		},
 		set_value__: function ()
@@ -176,23 +176,27 @@ function (X3DFollowerNode,
 					buffer     = this .getBuffer (),
 					numBuffers = buffer .length,
 					fraction   = this .updateBuffer ();
-			
+
 				this .output = this .interpolate (this .previousValue,
 				                                  buffer [numBuffers - 1],
 				                                  this .stepResponse ((numBuffers - 1 + fraction) * this .stepTime));
-	
+
 				for (var i = numBuffers - 2; i >= 0; -- i)
 				{
 					this .step (buffer [i], buffer [i + 1], this .stepResponse ((i + fraction) * this .stepTime));
 				}
-	
+
 				this .setValue (this .output);
-		
+
 				if (this .equals (this .output, this .destination, this .getTolerance ()))
 					this .set_active (false);
 			}
 			catch (error)
-			{ }
+			{
+				// Catch error from Rotation4.slerp.
+
+				//console .log (error);
+			}
 		},
 		updateBuffer: function ()
 		{
@@ -200,22 +204,22 @@ function (X3DFollowerNode,
 				buffer     = this .getBuffer (),
 				numBuffers = buffer .length,
 				fraction   = (this .getBrowser () .getCurrentTime () - this .bufferEndTime) / this .stepTime;
-		
+
 			if (fraction >= 1)
 			{
 				var seconds = Math .floor (fraction);
 
 				fraction -= seconds;
-		
+
 				if (seconds < numBuffers)
 				{
 					this .setPreviousValue (buffer [numBuffers - seconds]);
-		
+
 					for (var i = numBuffers - 1; i >= seconds; -- i)
 					{
 						this .assign (buffer, i, buffer [i - seconds])
 					}
-		
+
 					for (var i = 0; i < seconds; ++ i)
 					{
 						try
@@ -235,7 +239,7 @@ function (X3DFollowerNode,
 					for (var i = 0; i < numBuffers; ++ i)
 						this .assign (buffer, i, this .destination);
 				}
-		
+
 				this .bufferEndTime += seconds * this .stepTime;
 			}
 
@@ -245,5 +249,3 @@ function (X3DFollowerNode,
 
 	return X3DChaserNode;
 });
-
-

package/src/x_ite/Components/Followers/X3DDamperNode.js

@@ -52,7 +52,7 @@ define ([
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Algorithm",
 ],
-function (X3DFollowerNode, 
+function (X3DFollowerNode,
           X3DConstants,
           Algorithm)
 {
@@ -71,7 +71,7 @@ function (X3DFollowerNode,
 		initialize: function ()
 		{
 			X3DFollowerNode .prototype .initialize .call (this);
-		
+
 			this .order_           .addInterest ("set_order__", this);
 			this .set_value_       .addInterest ("set_value__", this);
 			this .set_destination_ .addInterest ("set_destination__", this);
@@ -82,10 +82,10 @@ function (X3DFollowerNode,
 				initialDestination = this .getInitialDestination ();
 
 			buffer [0] = this .duplicate (initialDestination);
-		
+
 			for (var i = 1, length = this .getOrder () + 1; i < length; ++ i)
 				buffer [i] = this .duplicate (initialValue);
-	
+
 			if (this .equals (initialDestination, initialValue, this .getTolerance ()))
 				this .setValue (initialDestination);
 
@@ -152,7 +152,7 @@ function (X3DFollowerNode,
 				this .assign (buffer, i, value);
 
 			this .setValue (value);
-		
+
 			this .set_active (true);
 		},
 		set_destination__: function ()
@@ -176,5 +176,3 @@ function (X3DFollowerNode,
 
 	return X3DDamperNode;
 });
-
-

package/src/x_ite/Components/Followers/X3DFollowerNode.js

@@ -51,7 +51,7 @@ define ([
 	"x_ite/Components/Core/X3DChildNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function (X3DChildNode, 
+function (X3DChildNode,
           X3DConstants)
 {
 "use strict";
@@ -78,10 +78,6 @@ function (X3DChildNode,
 
 			this .isLive () .addInterest ("set_live__", this);
 		},
-		duplicate: function (value)
-		{
-			return value .copy ();
-		},
 		getBuffer: function ()
 		{
 			return this .buffer;
@@ -110,6 +106,10 @@ function (X3DChildNode,
 		{
 			this .destination .assign (value);
 		},
+		duplicate: function (value)
+		{
+			return value .copy ();
+		},
 		assign: function (buffer, i, value)
 		{
 			buffer [i] .assign (value);
@@ -145,5 +145,3 @@ function (X3DChildNode,
 
 	return X3DFollowerNode;
 });
-
-

package/src/x_ite/Components/Followers.js

@@ -87,7 +87,7 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		ColorChaser:       ColorChaser,
 		ColorDamper:       ColorDamper,
@@ -105,19 +105,16 @@ function (SupportedNodes,
 		TexCoordDamper2D:  TexCoordDamper2D,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
 		X3DChaserNode: X3DChaserNode,
 		X3DDamperNode: X3DDamperNode,
 		X3DFollowerNode: X3DFollowerNode,
 	};
-	
-	for (var typeName in Types)
-		SupportedNodes .addType (typeName, Types [typeName]); 
 
-	for (var typeName in AbstractTypes)
-		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]); 
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
 
-	return Types;
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
 });
-