x_ite 4.0.5 → 4.7.5

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

@@ -48,47 +48,52 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/EnvironmentalSensor/X3DEnvironmentalSensorNode",
+	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
-	"x_ite/Bits/X3DCast",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Rotation4",
-	"standard/Math/Geometry/Box3",
+	"standard/Math/Numbers/Matrix4",
+	"standard/Utility/ObjectCache",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DEnvironmentalSensorNode, 
+          X3DEnvironmentalSensorNode,
+          TraverseType,
           X3DConstants,
-          X3DCast,
           Vector3,
           Rotation4,
-          Box3)
+          Matrix4,
+          ObjectCache)
 {
 "use strict";
 
-	var
-		targetBox   = new Box3 (),
-		position    = new Vector3 (0, 0, 0),
-		orientation = new Rotation4 (0, 0, 1, 0),
-		infinity    = new Vector3 (-1, -1, -1);
-	
+	const
+		ModelMatrixCache  = ObjectCache (Matrix4),
+		TargetMatrixCache = ObjectCache (Matrix4);
+
 	function TransformSensor (executionContext)
 	{
 		X3DEnvironmentalSensorNode .call (this, executionContext);
 
 		this .addType (X3DConstants .TransformSensor);
 
-		this .bbox             = new Box3 ();
+		this .position_changed_ .setUnit ("length");
+
+		this .setZeroTest (true);
+
+		this .min              = new Vector3 ();
+		this .max              = new Vector3 ();
 		this .targetObjectNode = null;
+		this .modelMatrices    = [ ];
+		this .targetMatrices   = [ ];
 	}
 
-	TransformSensor .prototype = $.extend (Object .create (X3DEnvironmentalSensorNode .prototype),
+	TransformSensor .prototype = Object .assign (Object .create (X3DEnvironmentalSensorNode .prototype),
 	{
 		constructor: TransformSensor,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -118,16 +123,16 @@ function ($,
 		initialize: function ()
 		{
 			X3DEnvironmentalSensorNode .prototype .initialize .call (this);
-		
+
 			this .isLive () .addInterest ("set_enabled__", this);
 
-			this .enabled_      .addInterest ("set_enabled__", this);
-			this .size_         .addInterest ("set_enabled__", this);
-			this .size_         .addInterest ("set_bbox__", this);
-			this .center_       .addInterest ("set_bbox__", this);
+			this .enabled_      .addInterest ("set_enabled__",      this);
+			this .size_         .addInterest ("set_enabled__",      this);
+			this .size_         .addInterest ("set_extents__",      this);
+			this .center_       .addInterest ("set_extents__",      this);
 			this .targetObject_ .addInterest ("set_targetObject__", this);
 
-			this .set_bbox__ ();
+			this .set_extents__ ();
 			this .set_targetObject__ ();
 		},
 		set_live__: function ()
@@ -136,12 +141,18 @@ function ($,
 		{
 			if (this .isLive () .getValue () && this .targetObjectNode && this .enabled_ .getValue () && ! this .size_. getValue () .equals (Vector3 .Zero))
 			{
-				this .getBrowser () .sensors () .addInterest ("update", this);
+				this .setPickableObject (true);
+				this .getBrowser () .addTransformSensor (this);
+				this .targetObjectNode .addTransformSensor (this);
 			}
 			else
 			{
-				this .getBrowser () .sensors () .removeInterest ("update", this);
-					
+				this .setPickableObject (false);
+				this .getBrowser () .removeTransformSensor (this);
+
+				if (this .targetObjectNode)
+					this .targetObjectNode .removeTransformSensor (this);
+
 				if (this .isActive_ .getValue ())
 				{
 					this .isActive_ = false;
@@ -149,53 +160,162 @@ function ($,
 				}
 			}
 		},
-		set_bbox__: function ()
+		set_extents__: function ()
 		{
-			this .bbox .set (this .size_ .getValue (), this .center_ .getValue ());
+			const
+				s  = this .size_ .getValue (),
+				c  = this .center_ .getValue (),
+				sx = s .x / 2,
+				sy = s .y / 2,
+				sz = s .z / 2,
+				cx = c .x,
+				cy = c .y,
+				cz = c .z;
+
+			this .min .set (cx - sx, cy - sy, cz - sz);
+			this .max .set (cx + sx, cy + sy, cz + sz);
 		},
 		set_targetObject__: function ()
 		{
-			this .targetObjectNode = X3DCast (X3DConstants .X3DBoundedObject, this .targetObject_);
-		
+			this .targetObjectNode = null;
+
+			try
+			{
+				const
+					node = this .targetObject_ .getValue () .getInnerNode (),
+					type = node .getType ();
+
+				for (let t = type .length - 1; t >= 0; -- t)
+				{
+					switch (type [t])
+					{
+						case X3DConstants .X3DGroupingNode:
+						case X3DConstants .X3DShapeNode:
+						{
+							this .targetObjectNode = node;
+							break;
+						}
+						default:
+							continue;
+					}
+
+					break;
+				}
+			}
+			catch (error)
+			{ }
+
 			this .set_enabled__ ();
 		},
-		update: function ()
+		traverse: function (type, renderObject)
 		{
-			this .targetObjectNode .getBBox (targetBox);
-		
-			if (this .size_. getValue () .equals (infinity) || this .bbox .intersectsBox (targetBox))
+			// TransformSensor nodes are sorted out and only traversed during PICKING, except if is child of a LOD or Switch node.
+
+			if (type !== TraverseType .PICKING)
+				return;
+
+			if (this .getPickableObject ())
+				this .modelMatrices .push (ModelMatrixCache .pop () .assign (renderObject .getModelViewMatrix () .get ()));
+		},
+		collect: function (targetMatrix)
+		{
+			this .targetMatrices .push (TargetMatrixCache .pop () .assign (targetMatrix));
+		},
+		process: (function ()
+		{
+			const
+				position    = new Vector3 (0, 0, 0),
+				orientation = new Rotation4 (0, 0, 1, 0);
+
+			return function ()
 			{
-				targetBox .getMatrix () .get (position, orientation);
-		
-				if (this .isActive_ .getValue ())
+				const
+					modelMatrices  = this .modelMatrices,
+					targetMatrices = this .targetMatrices,
+					matrix         = this .intersects ();
+
+				if (matrix)
 				{
-					if (! this .position_changed_ .getValue () .equals (position))
-						this .position_changed_ = position;
-	
-					if (! this .orientation_changed_ .getValue () .equals (orientation))
+					matrix .get (position, orientation);
+
+					if (this .isActive_ .getValue ())
+					{
+						if (! this .position_changed_ .getValue () .equals (position))
+							this .position_changed_ = position;
+
+						if (! this .orientation_changed_ .getValue () .equals (orientation))
+							this .orientation_changed_ = orientation;
+					}
+					else
+					{
+						this .isActive_            = true;
+						this .enterTime_           = this .getBrowser () .getCurrentTime ();
+						this .position_changed_    = position;
 						this .orientation_changed_ = orientation;
+					}
 				}
 				else
 				{
-					this .isActive_  = true;
-					this .enterTime_ = this .getBrowser () .getCurrentTime ();
-
-					this .position_changed_         = position;
-					this .orientation_changed_      = orientation;
+					if (this .isActive_ .getValue ())
+					{
+						this .isActive_ = false;
+						this .exitTime_ = this .getBrowser () .getCurrentTime ();
+					}
 				}
-			}
-			else
+
+				for (const modelMatrix of modelMatrices)
+					ModelMatrixCache .push (modelMatrix);
+
+				for (const targetMatrix of targetMatrices)
+					TargetMatrixCache .push (targetMatrix);
+
+				modelMatrices  .length = 0;
+				targetMatrices .length = 0;
+			};
+		})(),
+		intersects: (function ()
+		{
+			const infinity = new Vector3 (-1, -1, -1);
+
+			return function ()
 			{
-				if (this .isActive_ .getValue ())
+				const
+					modelMatrices  = this .modelMatrices,
+					targetMatrices = this .targetMatrices,
+					always         = this .size_ .getValue () .equals (infinity);
+
+				for (const modelMatrix of modelMatrices)
 				{
-					this .isActive_ = false;
-					this .exitTime_ = this .getBrowser () .getCurrentTime ();
+					const invModelMatrix = modelMatrix .inverse ();
+
+					for (const targetMatrix of targetMatrices)
+					{
+						const matrix = targetMatrix .multRight (invModelMatrix);
+
+						if (always || this .containsPoint (matrix .origin))
+						{
+							return matrix;
+						}
+					}
 				}
-			}
+
+				return null;
+			};
+		})(),
+		containsPoint: function (point)
+		{
+			const
+				min = this .min,
+				max = this .max;
+
+			return min .x <= point .x &&
+			       max .x >= point .x &&
+			       min .y <= point .y &&
+			       max .y >= point .y &&
+			       min .z <= point .z &&
+			       max .z >= point .z;
 		},
 	});
 
 	return TransformSensor;
 });
-
-

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

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -56,30 +55,31 @@ define ([
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Vector3",
+	"standard/Math/Geometry/Box3",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           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;
 	}
 
-	VisibilitySensor .prototype = $.extend (Object .create (X3DEnvironmentalSensorNode .prototype),
+	VisibilitySensor .prototype = Object .assign (Object .create (X3DEnvironmentalSensorNode .prototype),
 	{
 		constructor: VisibilitySensor,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -91,8 +91,6 @@ function ($,
 			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";
@@ -140,36 +138,40 @@ function ($,
 					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

@@ -48,15 +48,13 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Components/Core/X3DSensorNode",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Vector3",
 ],
-function ($,
-          Fields,
-          X3DSensorNode, 
+function (Fields,
+          X3DSensorNode,
           X3DConstants,
           Vector3)
 {
@@ -70,10 +68,14 @@ function ($,
 
 		this .addChildObjects ("traversed", new Fields .SFBool (true));
 
+		this .size_   .setUnit ("length");
+		this .center_ .setUnit ("length");
+
+		this .zeroTest         = false;
 		this .currentTraversed = true;
 	}
 
-	X3DEnvironmentalSensorNode .prototype = $.extend (Object .create (X3DSensorNode .prototype),
+	X3DEnvironmentalSensorNode .prototype = Object .assign (Object .create (X3DSensorNode .prototype),
 	{
 		constructor: X3DEnvironmentalSensorNode,
 		initialize: function ()
@@ -90,14 +92,14 @@ function ($,
 		},
 		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 () .sensors () .addInterest ("update", this);
+				this .getBrowser () .sensorEvents () .addInterest ("update", this);
 			}
 			else
 			{
-				this .getBrowser () .sensors () .removeInterest ("update", this);
-				
+				this .getBrowser () .sensorEvents () .removeInterest ("update", this);
+
 				if (this .isActive_ .getValue ())
 				{
 					this .isActive_ = false;
@@ -105,6 +107,14 @@ function ($,
 				}
 			}
 		},
+		setZeroTest: function (value)
+		{
+			this .zeroTest = value;
+		},
+		getZeroTest: function ()
+		{
+			return this .zeroTest;
+		},
 		setTraversed: function (value)
 		{
 		   if (value)
@@ -129,5 +139,3 @@ function ($,
 
 	return X3DEnvironmentalSensorNode;
 });
-
-

package/src/x_ite/Components/EnvironmentalSensor.js

@@ -0,0 +1,81 @@
+/*******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011.
+ *
+ * All rights reserved. Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * The copyright notice above does not evidence any actual of intended
+ * publication of such source code, and is an unpublished work by create3000.
+ * This material contains CONFIDENTIAL INFORMATION that is the property of
+ * create3000.
+ *
+ * No permission is granted to copy, distribute, or create derivative works from
+ * the contents of this software, in whole or in part, without the prior written
+ * permission of create3000.
+ *
+ * NON-MILITARY USE ONLY
+ *
+ * All create3000 software are effectively free software with a non-military use
+ * restriction. It is free. Well commented source is provided. You may reuse the
+ * source in any way you please with the exception anything that uses it must be
+ * marked to indicate is contains 'non-military use only' components.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2015, 2016 Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * This file is part of the X_ITE Project.
+ *
+ * X_ITE is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License version 3 only, as published by the
+ * Free Software Foundation.
+ *
+ * X_ITE is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License version 3 for more
+ * details (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version 3
+ * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+
+define ([
+	"x_ite/Configuration/SupportedNodes",
+	"x_ite/Components/EnvironmentalSensor/ProximitySensor",
+	"x_ite/Components/EnvironmentalSensor/TransformSensor",
+	"x_ite/Components/EnvironmentalSensor/VisibilitySensor",
+	"x_ite/Components/EnvironmentalSensor/X3DEnvironmentalSensorNode",
+],
+function (SupportedNodes,
+          ProximitySensor,
+          TransformSensor,
+          VisibilitySensor,
+          X3DEnvironmentalSensorNode)
+{
+"use strict";
+
+	const Types =
+	{
+		ProximitySensor:  ProximitySensor,
+		TransformSensor:  TransformSensor,
+		VisibilitySensor: VisibilitySensor,
+	};
+
+	const AbstractTypes =
+	{
+		X3DEnvironmentalSensorNode: X3DEnvironmentalSensorNode,
+	};
+
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
+
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+});

package/src/x_ite/Components/EventUtilities/BooleanFilter.js

@@ -48,15 +48,13 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Core/X3DChildNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DChildNode, 
@@ -71,7 +69,7 @@ function ($,
 		this .addType (X3DConstants .BooleanFilter);
 	}
 
-	BooleanFilter .prototype = $.extend (Object .create (X3DChildNode .prototype),
+	BooleanFilter .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 	{
 		constructor: BooleanFilter,
 		fieldDefinitions: new FieldDefinitionArray ([

package/src/x_ite/Components/EventUtilities/BooleanSequencer.js

@@ -48,15 +48,13 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/EventUtilities/X3DSequencerNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DSequencerNode, 
@@ -71,7 +69,7 @@ function ($,
 		this .addType (X3DConstants .BooleanSequencer);
 	}
 
-	BooleanSequencer .prototype = $.extend (Object .create (X3DSequencerNode .prototype),
+	BooleanSequencer .prototype = Object .assign (Object .create (X3DSequencerNode .prototype),
 	{
 		constructor: BooleanSequencer,
 		fieldDefinitions: new FieldDefinitionArray ([

package/src/x_ite/Components/EventUtilities/BooleanToggle.js

@@ -48,15 +48,13 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Core/X3DChildNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DChildNode, 
@@ -71,7 +69,7 @@ function ($,
 		this .addType (X3DConstants .BooleanToggle);
 	}
 
-	BooleanToggle .prototype = $.extend (Object .create (X3DChildNode .prototype),
+	BooleanToggle .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 	{
 		constructor: BooleanToggle,
 		fieldDefinitions: new FieldDefinitionArray ([

package/src/x_ite/Components/EventUtilities/BooleanTrigger.js

@@ -48,15 +48,13 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/EventUtilities/X3DTriggerNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DTriggerNode, 
@@ -71,7 +69,7 @@ function ($,
 		this .addType (X3DConstants .BooleanTrigger);
 	}
 
-	BooleanTrigger .prototype = $.extend (Object .create (X3DTriggerNode .prototype),
+	BooleanTrigger .prototype = Object .assign (Object .create (X3DTriggerNode .prototype),
 	{
 		constructor: BooleanTrigger,
 		fieldDefinitions: new FieldDefinitionArray ([