x_ite 4.0.5 → 4.7.5

package/src/x_ite/Components/Navigation/LOD.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -59,8 +58,7 @@ define ([
 	"standard/Math/Numbers/Matrix4",
 	"standard/Math/Algorithm",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DGroupingNode,
@@ -72,24 +70,26 @@ function ($,
 {
 "use strict";
 
-	var
-		FRAMES         = 180, // Number of frames after wich a level change takes in affect.
-		FRAME_RATE_MIN = 20,  // Lowest level of detail.
-		FRAME_RATE_MAX = 55;  // Highest level of detail.
-	
 	function LOD (executionContext)
 	{
 		X3DGroupingNode .call (this, executionContext);
 
 		this .addType (X3DConstants .LOD);
 
-		this .addAlias ("level", this .children_); // VRML2
+		if (executionContext .getSpecificationVersion () == "2.0")
+			this .addAlias ("level", this .children_); // VRML2
+
+		this .center_ .setUnit ("length");
+		this .range_  .setUnit ("length");
 
 		this .frameRate        = 60;
 		this .keepCurrentLevel = false;
+		this .childNode        = null;
+		this .visibleNode      = null;
+		this .boundedObject    = null;
 	}
 
-	LOD .prototype = $.extend (Object .create (X3DGroupingNode .prototype),
+	LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
 	{
 		constructor: LOD,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -98,13 +98,14 @@ function ($,
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "center",           new Fields .SFVec3f ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "range",            new Fields .MFFloat ()),
 			new X3DFieldDefinition (X3DConstants .outputOnly,     "level_changed",    new Fields .SFInt32 (-1)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",          new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay",      new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",         new Fields .SFVec3f (-1, -1, -1)),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",       new Fields .SFVec3f ()),
 			new X3DFieldDefinition (X3DConstants .inputOnly,      "addChildren",      new Fields .MFNode ()),
 			new X3DFieldDefinition (X3DConstants .inputOnly,      "removeChildren",   new Fields .MFNode ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "children",         new Fields .MFNode ()),
 		]),
-		modelViewMatrix: new Matrix4 (),
 		getTypeName: function ()
 		{
 			return "LOD";
@@ -121,97 +122,251 @@ function ($,
 		{
 			X3DGroupingNode .prototype .initialize .call (this);
 
-			this .child = this .getChild (this .level_changed_ .getValue ());
-			this .set_cameraObjects__ ();
-		},
-		set_cameraObjects__: function ()
-		{
-			if (this .child && this .child .getCameraObject)
-				this .setCameraObject (this .child .getCameraObject ());
-			else
-				this .setCameraObject (false);
+			this .children_ .addInterest ("set_child__", this);
 		},
-		getBBox: function (bbox) 
+		getSubBBox: function (bbox, shadow)
 		{
-			if (this .bboxSize_ .getValue () .equals (this .defaultBBoxSize))
+			if (this .bboxSize_ .getValue () .equals (this .getDefaultBBoxSize ()))
 			{
-				var boundedObject = X3DCast (X3DConstants .X3DBoundedObject, this .child);
+				const boundedObject = X3DCast (X3DConstants .X3DBoundedObject, this .visibleNode);
 
 				if (boundedObject)
-					return boundedObject .getBBox (bbox);
+					return boundedObject .getBBox (bbox, shadow);
 
 				return bbox .set ();
 			}
 
 			return bbox .set (this .bboxSize_ .getValue (), this .bboxCenter_ .getValue ());
 		},
-		getLevel: function (browser, modelViewMatrix)
+		clear: function () { },
+		add: function () { },
+		remove: function () { },
+		set_child__: function ()
 		{
-			if (this .range_ .length === 0)
+			this .set_level__ (Math .min (this .level_changed_ .getValue (), this .children_ .length - 1));
+		},
+		set_level__: function (level)
+		{
+			if (this .childNode)
 			{
-				var size = this .children_ .length;
+				this .childNode .isCameraObject_   .removeInterest ("set_cameraObject__",     this);
+				this .childNode .isPickableObject_ .removeInterest ("set_transformSensors__", this);
+			}
 
-				if (size < 2)
-					return 0;
+			if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+			{
+				this .childNode .visible_     .removeInterest ("set_visible__",     this);
+				this .childNode .bboxDisplay_ .removeInterest ("set_bboxDisplay__", this);
+			}
 
-				this .frameRate = ((FRAMES - 1) * this .frameRate + browser .currentFrameRate) / FRAMES;
+			if (level >= 0 && level < this .children_ .length)
+			{
+				this .childNode = X3DCast (X3DConstants .X3DChildNode, this .children_ [level]);
 
-				if (size === 2)
-					return Number (this .frameRate > FRAME_RATE_MAX);
+				if (this .childNode)
+				{
+					this .childNode .isCameraObject_   .addInterest ("set_cameraObject__",     this);
+					this .childNode .isPickableObject_ .addInterest ("set_transformSensors__", this);
 
-				var
-					n        = size - 1,
-					fraction = Math .max ((this .frameRate - FRAME_RATE_MIN) / (FRAME_RATE_MAX - FRAME_RATE_MIN), 0);
+					if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+					{
+						this .childNode .visible_     .addInterest ("set_visible__",     this);
+						this .childNode .bboxDisplay_ .addInterest ("set_bboxDisplay__", this);
+					}
 
-				return Math .min (Math .ceil (fraction * (n - 1)), n);
+					//delete this .traverse;
+				}
 			}
+			else
+			{
+				this .childNode = null;
 
-			var distance = this .getDistance (modelViewMatrix);
+				//this .traverse = Function .prototype; // Don't do that.
+			}
 
-			return Algorithm .upperBound (this .range_, 0, this .range_ .length, distance, Algorithm .less);
+			this .set_transformSensors__ ();
+			this .set_visible__ ();
+			this .set_bboxDisplay__ ();
+		},
+		set_cameraObject__: function ()
+		{
+			if (this .childNode && this .childNode .getCameraObject ())
+			{
+				if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+				{
+					this .setCameraObject (this .childNode .visible_ .getValue ());
+				}
+				else
+				{
+					this .setCameraObject (true);
+				}
+			}
+			else
+			{
+				this .setCameraObject (false);
+			}
+		},
+		set_transformSensors__: function ()
+		{
+			this .setPickableObject (Boolean (this .getTransformSensors () .size || this .childNode && this .childNode .getPickableObject ()));
 		},
-		getDistance: function (modelViewMatrix)
+		set_visible__: function ()
 		{
-			modelViewMatrix .translate (this .center_ .getValue ());
+			if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+			{
+				this .visibleNode = this .childNode .visible_ .getValue () ? this .childNode : null;
+			}
+			else
+			{
+				this .visibleNode = this .childNode;
+			}
 
-			return modelViewMatrix .origin .abs ();
+			this .set_cameraObject__ ();
+		},
+		set_bboxDisplay__: function ()
+		{
+			if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+			{
+				this .boundedObject = this .childNode .bboxDisplay_ .getValue () ? this .childNode : null;
+			}
+			else
+			{
+				this .boundedObject = null;
+			}
 		},
-		traverse: function (type, renderObject)
+		getLevel: (function ()
 		{
-			if (! this .keepCurrentLevel)
+			const
+				FRAMES         = 180, // Number of frames after wich a level change takes in affect.
+				FRAME_RATE_MIN = 20,  // Lowest level of detail.
+				FRAME_RATE_MAX = 55;  // Highest level of detail.
+
+			return function (browser, modelViewMatrix)
 			{
-				if (type === TraverseType .DISPLAY)
+				if (this .range_ .length === 0)
 				{
-					var
-						level        = this .getLevel (renderObject .getBrowser (), this .modelViewMatrix .assign (renderObject .getModelViewMatrix () .get ())),
-						currentLevel = this .level_changed_ .getValue ();
-	
-					if (this .forceTransitions_ .getValue ())
+					this .frameRate = ((FRAMES - 1) * this .frameRate + browser .currentFrameRate) / FRAMES;
+
+					const size = this .children_ .length;
+
+					switch (size)
 					{
-						if (level > currentLevel)
-							level = currentLevel + 1;
-	
-						else if (level < currentLevel)
-							level = currentLevel - 1;
+						case 0:
+							return -1;
+						case 1:
+							return 0;
+						case 2:
+							return (this .frameRate > FRAME_RATE_MAX) * 1;
+						default:
+						{
+							const fraction = 1 - Algorithm .clamp ((this .frameRate - FRAME_RATE_MIN) / (FRAME_RATE_MAX - FRAME_RATE_MIN), 0, 1);
+
+							return Math .min (Math .floor (fraction * size), size - 1);
+						}
 					}
+				}
+
+				const distance = modelViewMatrix .translate (this .center_ .getValue ()) .origin .abs ();
 
-					if (level !== currentLevel)
+				return Algorithm .upperBound (this .range_, 0, this .range_ .length, distance, Algorithm .less);
+			};
+		})(),
+		traverse: (function ()
+		{
+			const modelViewMatrix = new Matrix4 ();
+
+			return function (type, renderObject)
+			{
+				switch (type)
+				{
+					case TraverseType .POINTER:
+					case TraverseType .CAMERA:
+					case TraverseType .SHADOW:
 					{
-						this .level_changed_ = level;
-				
-						this .child = this .getChild (Math .min (level, this .children_ .length - 1));
+						const visibleNode = this .visibleNode;
+
+						if (visibleNode)
+							visibleNode .traverse (type, renderObject);
 
-						this .set_cameraObjects__ ();
+						return;
 					}
-				}
-			}
+					case TraverseType .PICKING:
+					{
+						if (this .getTransformSensors () .size)
+						{
+							const modelMatrix = renderObject .getModelViewMatrix () .get ();
 
-			if (this .child)
-				this .child .traverse (type, renderObject);
-		},
+							for (const transformSensorNode of this .getTransformSensors ())
+								transformSensorNode .collect (modelMatrix);
+						}
+
+						const childNode = this .childNode;
+
+						if (childNode)
+						{
+							const
+								browser          = renderObject .getBrowser (),
+								pickingHierarchy = browser .getPickingHierarchy ();
+
+							pickingHierarchy .push (this);
+
+							childNode .traverse (type, renderObject);
+
+							pickingHierarchy .pop ();
+						}
+
+						return;
+					}
+					case TraverseType .COLLISION:
+					{
+						const childNode = this .childNode;
+
+						if (childNode)
+							childNode .traverse (type, renderObject);
+
+						return;
+					}
+					case TraverseType .DISPLAY:
+					{
+						if (! this .keepCurrentLevel)
+						{
+							var
+								level        = this .getLevel (renderObject .getBrowser (), modelViewMatrix .assign (renderObject .getModelViewMatrix () .get ())),
+								currentLevel = this .level_changed_ .getValue ();
+
+							if (this .forceTransitions_ .getValue ())
+							{
+								if (level > currentLevel)
+									level = currentLevel + 1;
+
+								else if (level < currentLevel)
+									level = currentLevel - 1;
+							}
+
+							if (level !== currentLevel)
+							{
+								this .level_changed_ = level;
+
+								this .set_level__ (Math .min (level, this .children_ .length - 1));
+							}
+						}
+
+						const visibleNode = this .visibleNode;
+
+						if (visibleNode)
+							visibleNode .traverse (type, renderObject);
+
+						const boundedObject = this .boundedObject;
+
+						if (boundedObject)
+							boundedObject .displayBBox (type, renderObject);
+
+						return;
+					}
+				}
+			};
+		})(),
 	});
 
 	return LOD;
 });
-
-

package/src/x_ite/Components/Navigation/NavigationInfo.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -56,8 +55,7 @@ define ([
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DBindableNode,
@@ -78,12 +76,17 @@ function ($,
 		X3DBindableNode .call (this, executionContext);
 
 		this .addType (X3DConstants .NavigationInfo);
-				
-		this .addChildObjects ("availableViewers", new Fields .MFString (),
+
+		this .addChildObjects ("transitionStart",  new Fields .SFBool (),
+		                       "availableViewers", new Fields .MFString (),
 		                       "viewer",           new Fields .SFString ("EXAMINE"));
+
+		this .avatarSize_      .setUnit ("length");
+		this .speed_           .setUnit ("speed");
+		this .visibilityLimit_ .setUnit ("speed");
 	}
 
-	NavigationInfo .prototype = $.extend (Object .create (X3DBindableNode .prototype),
+	NavigationInfo .prototype = Object .assign (Object .create (X3DBindableNode .prototype),
 	{
 		constructor: NavigationInfo,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -116,24 +119,75 @@ function ($,
 		{
 			X3DBindableNode .prototype .initialize .call (this);
 
-			this .type_      .addInterest ("set_type__", this);
-			this .headlight_ .addInterest ("set_headlight__", this);
+			this .type_               .addInterest ("set_type__",               this);
+			this .headlight_          .addInterest ("set_headlight__",          this);
+			this .transitionStart_    .addInterest ("set_transitionStart__",    this);
+			this .transitionComplete_ .addInterest ("set_transitionComplete__", this);
+			this .isBound_            .addInterest ("set_isBound__",            this);
 
 			this .set_type__ ();
 			this .set_headlight__ ();
 		},
-		set_type__: function ()
+		getViewer: function ()
 		{
-			this .availableViewers_ .length = 0;;
+		   return this .viewer_ .getValue ();
+		},
+		getCollisionRadius: function ()
+		{
+			if (this .avatarSize_ .length > 0)
+			{
+				if (this .avatarSize_ [0] > 0)
+					return this .avatarSize_ [0];
+			}
 
-			var
-				examineViewer = false,
-				walkViewer    = false,
-				flyViewer     = false,
-				planeViewer   = false,
-				noneViewer    = false,
-				lookAt        = false;
+			return 0.25;
+		},
+		getAvatarHeight: function ()
+		{
+			if (this .avatarSize_ .length > 1)
+				return this .avatarSize_ [1];
+
+			return 1.6;
+		},
+		getStepHeight: function ()
+		{
+			if (this .avatarSize_ .length > 2)
+				return this .avatarSize_ [2];
+
+			return 0.75;
+		},
+		getNearValue: function ()
+		{
+			var nearValue = this .getCollisionRadius ();
+
+			if (nearValue === 0)
+				return 1e-5;
+
+			else
+				return nearValue / 2;
+		},
+		getFarValue: function (viewpoint)
+		{
+			return this .visibilityLimit_ .getValue ()
+				    ? this .visibilityLimit_ .getValue ()
+				    : viewpoint .getMaxFarValue ();
+		},
+		getTransitionType: function ()
+		{
+			for (var i = 0, length = this .transitionType_ .length; i < length; ++ i)
+			{
+				var
+					value          = this .transitionType_ [i],
+					transitionType = TransitionType [value];
 
+				if (transitionType)
+					return value;
+			}
+
+			return "LINEAR";
+		},
+		set_type__: function ()
+		{
 			// Determine active viewer.
 
 			this .viewer_ = "EXAMINE";
@@ -141,7 +195,7 @@ function ($,
 			for (var i = 0; i < this .type_ .length; ++ i)
 			{
 			   var string = this .type_ [i];
-			
+
 				switch (string)
 				{
 					case "EXAMINE":
@@ -165,6 +219,14 @@ function ($,
 
 			// Determine available viewers.
 
+			var
+				examineViewer = false,
+				walkViewer    = false,
+				flyViewer     = false,
+				planeViewer   = false,
+				noneViewer    = false,
+				lookAt        = false;
+
 			if (! this .type_ .length)
 			{
 				examineViewer = true;
@@ -200,26 +262,26 @@ function ($,
 						case "NONE":
 							noneViewer = true;
 							continue;
+						case "ANY":
+							examineViewer = true;
+							walkViewer    = true;
+							flyViewer     = true;
+							planeViewer   = true;
+							noneViewer    = true;
+							lookAt        = true;
+							break;
+						default:
+							// Some string defaults to EXAMINE.
+							examineViewer = true;
+							continue;
 					}
 
-					if (string == "ANY")
-					{
-						examineViewer = true;
-						walkViewer    = true;
-						flyViewer     = true;
-						planeViewer   = true;
-						noneViewer    = true;
-						lookAt        = true;
-
-						// Leave for loop.
-						break;
-					}
-
-					// Some string defaults to EXAMINE.
-					examineViewer = true;
+					break;
 				}
 			}
 
+			this .availableViewers_ .length = 0;
+
 			if (examineViewer)
 				this .availableViewers_ .push ("EXAMINE");
 
@@ -245,75 +307,23 @@ function ($,
 			else
 				this .enable = Function .prototype;
 		},
-		bindToLayer: function (layer)
-		{
-			layer .getNavigationInfoStack () .push (this);
-		},
-		unbindFromLayer: function (layer)
-		{
-			layer .getNavigationInfoStack () .pop (this);
-		},
-		removeFromLayer: function (layer)
-		{
-			layer .getNavigationInfoStack () .remove (this);
-		},
-		getViewer: function ()
-		{
-		   return this .viewer_ .getValue ();
-		},
-		getCollisionRadius: function ()
-		{
-			if (this .avatarSize_ .length > 0)
-			{
-				if (this .avatarSize_ [0] > 0)
-					return this .avatarSize_ [0];
-			}
-
-			return 0.25;
-		},
-		getAvatarHeight: function ()
-		{
-			if (this .avatarSize_ .length > 1)
-				return this .avatarSize_ [1];
-
-			return 1.6;
-		},
-		getStepHeight: function ()
-		{
-			if (this .avatarSize_ .length > 2)
-				return this .avatarSize_ [2];
-
-			return 0.75;
-		},
-		getNearValue: function ()
+		set_transitionStart__: function ()
 		{
-			var nearValue = this .getCollisionRadius ();
-
-			if (nearValue === 0)
-				return 1e-5;
-
-			else
-				return nearValue / 2;
+			if (! this .transitionActive_ .getValue ())
+				this .transitionActive_ = true;
 		},
-		getFarValue: function (viewpoint)
+		set_transitionComplete__: function ()
 		{
-			return this .visibilityLimit_ .getValue ()
-				    ? this .visibilityLimit_ .getValue ()
-				    : viewpoint .getMaxZFar ();
+			if (this .transitionActive_ .getValue ())
+				this .transitionActive_ = false;
 		},
-		getTransitionType: function ()
+		set_isBound__: function ()
 		{
-			for (var i = 0, length = this .transitionType_ .length; i < length; ++ i)
-			{
-				var
-					value          = this .transitionType_ [i],
-					transitionType = TransitionType [value];
-
-				if (transitionType)
-					return value;
-			}
+			if (this .isBound_ .getValue ())
+				return;
 
-			return "LINEAR";
+			if (this .transitionActive_ .getValue ())
+				this .transitionActive_ = false;
 		},
 		enable: function (type, renderObject)
 		{
@@ -321,15 +331,16 @@ function ($,
 				return;
 
 			if (this .headlight_ .getValue ())
-				renderObject .getGlobalLights () .push (renderObject .getBrowser () .getHeadlight ());
+				renderObject .getGlobalObjects () .push (renderObject .getBrowser () .getHeadlight ());
 		},
 		traverse: function (type, renderObject)
 		{
+			if (type !== TraverseType .CAMERA)
+				return;
+
 			renderObject .getLayer () .getNavigationInfos () .push (this);
 		}
 	});
 
 	return NavigationInfo;
 });
-
-