x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/Geospatial/GeoViewpoint.js

@@ -66,7 +66,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DViewpointNode, 
+          X3DViewpointNode,
           X3DGeospatialObject,
           ScalarInterpolator,
           NavigationInfo,
@@ -156,9 +156,9 @@ function (Fields,
 			this .positionOffset_ .addInterest ("set_position__", this);
 			this .navType_        .addFieldInterest (this .navigationInfoNode .type_);
 			this .headlight_      .addFieldInterest (this .navigationInfoNode .headlight_);
-		
+
 			this .navigationInfoNode .setup ();
-		
+
 			this .set_position__ ();
 
 			// Setup interpolators
@@ -169,19 +169,21 @@ function (Fields,
 			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewInterpolator .set_fraction_);
 			this .fieldOfViewInterpolator .value_changed_ .addFieldInterest (this .fieldOfViewScale_);
 		},
-		setInterpolators: function (fromViewpoint)
+		setInterpolators: function (fromViewpointNode, toViewpointNode)
 		{
-			if (fromViewpoint .getType () .indexOf (X3DConstants .GeoViewpoint) < 0)
+			if (fromViewpointNode .getType () .indexOf (X3DConstants .Viewpoint) >= 0)
 			{
-				this .fieldOfViewInterpolator .keyValue_ = [ this .fieldOfViewScale_ .getValue (), this .fieldOfViewScale_ .getValue () ];
+				const scale = fromViewpointNode .getFieldOfView () / toViewpointNode .getFieldOfView ();
+
+				this .fieldOfViewInterpolator .keyValue_ = new Fields .MFFloat (scale, toViewpointNode .fieldOfViewScale_ .getValue ());
+
+				this .fieldOfViewScale_ = scale;
 			}
 			else
 			{
-				var scale = fromViewpoint .getFieldOfView () / this .fieldOfView_ .getValue ();
-	
-				this .fieldOfViewInterpolator .keyValue_ = [ scale, this .fieldOfViewScale_ .getValue () ];
-	
-				this .fieldOfViewScale_ = scale;
+				this .fieldOfViewInterpolator .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewScale_ .getValue (), toViewpointNode .fieldOfViewScale_ .getValue ());
+
+				this .fieldOfViewScale_ = toViewpointNode .fieldOfViewScale_ .getValue ();
 			}
 		},
 		setPosition: (function ()
@@ -197,7 +199,7 @@ function (Fields,
 		{
 			var position = new Vector3 (0, 0, 0);
 
-			return function () 
+			return function ()
 			{
 				return this .getCoord (this .position_ .getValue (), position);
 			};
@@ -209,7 +211,7 @@ function (Fields,
 			return function ()
 			{
 				this .getCoord (this .position_ .getValue (), position);
-	
+
 				this .elevation = this .getGeoElevation (position .add (this .positionOffset_ .getValue ()));
 			};
 		})(),
@@ -222,11 +224,11 @@ function (Fields,
 			return function (value)
 			{
 				///  Returns the resulting orientation for this viewpoint.
-	
+
 				var rotationMatrix = this .getLocationMatrix (this .position_ .getValue (), locationMatrix) .submatrix;
-	
+
 				geoOrientation .setMatrix (rotationMatrix);
-	
+
 				this .orientation_ .setValue (geoOrientation .inverse () .multLeft (value));
 			};
 		})(),
@@ -239,11 +241,11 @@ function (Fields,
 			return function ()
 			{
 				///  Returns the resulting orientation for this viewpoint.
-	
+
 				var rotationMatrix = this .getLocationMatrix (this .position_ .getValue (), locationMatrix) .submatrix;
-	
+
 				orientation .setMatrix (rotationMatrix);
-			
+
 				return orientation .multLeft (this .orientation_ .getValue ());
 			};
 		})(),
@@ -290,17 +292,17 @@ function (Fields,
 			return function (point, viewport)
 			{
 			   // Returns the screen scale in meter/pixel for on pixel.
-	
+
 				var
 					width  = viewport [2],
 					height = viewport [3],
 					size   = Math .abs (point .z) * Math .tan (this .getFieldOfView () / 2) * 2;
-	
+
 				if (width > height)
 					size /= height;
 				else
 					size /= width;
-	
+
 				return screenScale .set (size, size, size);
 			};
 		})(),
@@ -315,10 +317,10 @@ function (Fields,
 					height = viewport [3],
 					size   = nearValue * Math .tan (this .getFieldOfView () / 2) * 2,
 					aspect = width / height;
-			
+
 				if (aspect > 1)
 					return viewportSize .set (size * aspect, size);
-	
+
 				return viewportSize .set (size, size / aspect);
 			};
 		})(),
@@ -330,7 +332,7 @@ function (Fields,
 		{
 			if (limit || this .getBrowser () .getRenderingProperty ("LogarithmicDepthBuffer"))
 				return Camera .perspective (this .getFieldOfView (), nearValue, farValue, viewport [2], viewport [3], this .projectionMatrix);
-				
+
 			// Linear interpolate nearValue and farValue
 
 			var
@@ -343,5 +345,3 @@ function (Fields,
 
 	return GeoViewpoint;
 });
-
-

package/src/x_ite/Components/Grouping/Group.js

@@ -57,7 +57,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DGroupingNode, 
+          X3DGroupingNode,
           X3DConstants)
 {
 "use strict";
@@ -74,6 +74,8 @@ function (Fields,
 		constructor: Group,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",       new Fields .SFNode ()),
+			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 ()),
@@ -96,5 +98,3 @@ function (Fields,
 
 	return Group;
 });
-
-

package/src/x_ite/Components/Grouping/StaticGroup.js

@@ -62,8 +62,8 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChildNode, 
-          X3DBoundedObject, 
+          X3DChildNode,
+          X3DBoundedObject,
           Group,
           X3DConstants,
           TraverseType,
@@ -87,6 +87,7 @@ function (Fields,
 		this .opaqueShapes      = null;
 		this .transparentShapes = null;
 		this .bbox              = new Box3 ();
+		this .shadowBBox        = new Box3 ();
 	}
 
 	StaticGroup .prototype = Object .assign (Object .create (X3DChildNode .prototype),
@@ -94,10 +95,12 @@ function (Fields,
 	{
 		constructor: StaticGroup,
 		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",   new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",   new Fields .SFVec3f (-1, -1, -1)),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter", new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "children",   new Fields .MFNode ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",    new Fields .SFNode ()),
+			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 .initializeOnly, "children",    new Fields .MFNode ()),
 		]),
 		getTypeName: function ()
 		{
@@ -127,18 +130,23 @@ function (Fields,
 			this .group .setup ();
 
 			// Connect after Group setup.
-			this .group .isCameraObject_ .addFieldInterest (this .isCameraObject_);
-			this .group .children_       .addInterest ("set_children__", this);
+			this .group .isCameraObject_   .addFieldInterest (this .isCameraObject_);
+			this .group .isPickableObject_ .addFieldInterest (this .isPickableObject_);
+			this .group .children_         .addInterest ("set_children__", this);
+
+			this .setCameraObject   (this .group .getCameraObject ());
+			this .setPickableObject (this .group .getPickableObject ());
 
 			this .set_children__ ();
 		},
-		getBBox: function (bbox)
+		getBBox: function (bbox, shadow)
 		{
-			return bbox .assign (this .bbox);
+			return bbox .assign (shadow ? this .shadowBBox : this .bbox);
 		},
 		set_children__: function ()
 		{
 			this .group .getBBox (this .bbox);
+			this .group .getBBox (this .shadowBBox, true);
 
 			this .collisionShapes   = null;
 			this .depthShapes       = null;
@@ -147,7 +155,7 @@ function (Fields,
 		},
 		traverse: (function ()
 		{
-			var viewVolume = new ViewVolume ();
+			const viewVolume = new ViewVolume ();
 
 			viewVolume .intersectsSphere = function () { return true; };
 
@@ -157,7 +165,7 @@ function (Fields,
 				{
 					case TraverseType .CAMERA:
 					{
-						break;
+						return;
 					}
 					case TraverseType .POINTER:
 					case TraverseType .COLLISION:
@@ -166,91 +174,83 @@ function (Fields,
 						{
 							//console .log ("Rebuilding StaticGroup collisionShapes");
 
-							var
+							const
 								viewVolumes         = renderObject .getViewVolumes (),
 								viewport            = renderObject .getViewport (),
 								projectionMatrix    = renderObject .getProjectionMatrix (),
 								modelViewMatrix     = renderObject .getModelViewMatrix (),
 								firstCollisionShape = renderObject .getNumCollisionShapes ();
-				
+
 							viewVolumes .push (viewVolume .set (projectionMatrix, viewport, viewport));
-	
+
 							modelViewMatrix .push ();
 							modelViewMatrix .identity ();
-	
+
 							this .group .traverse (type, renderObject);
-	
+
 							modelViewMatrix .pop ();
 							viewVolumes     .pop ();
 
-							var lastCollisionShape = renderObject .getNumCollisionShapes ();
+							const lastCollisionShape = renderObject .getNumCollisionShapes ();
 
 							this .collisionShapes = renderObject .getCollisionShapes () .splice (firstCollisionShape, lastCollisionShape - firstCollisionShape);
 
 							renderObject .setNumCollisionShapes (firstCollisionShape);
 						}
 
-						var
-							collisionShapes = this .collisionShapes,
-							modelViewMatrix = renderObject .getModelViewMatrix ();
+						const modelViewMatrix = renderObject .getModelViewMatrix ();
 
-						for (var i = 0, length = collisionShapes .length; i < length; ++ i)
+						for (const collisionShape of this .collisionShapes)
 						{
-							var collisionShape = collisionShapes [i];
-
 							modelViewMatrix .push ();
 							modelViewMatrix .multLeft (collisionShape .modelViewMatrix);
 							collisionShape .shapeNode .traverse (type, renderObject);
 							modelViewMatrix .pop ();
 						}
 
-						break;
+						return;
 					}
-					case TraverseType .DEPTH:
+					case TraverseType .SHADOW:
 					{
 						if (! this .depthShapes)
 						{
 							//console .log ("Rebuilding StaticGroup depthShapes");
 
-							var
+							const
 								viewVolumes      = renderObject .getViewVolumes (),
 								viewport         = renderObject .getViewport (),
 								projectionMatrix = renderObject .getProjectionMatrix (),
 								modelViewMatrix  = renderObject .getModelViewMatrix (),
 								firstDepthShape  = renderObject .getNumDepthShapes ();
-				
+
 							viewVolumes .push (viewVolume .set (projectionMatrix, viewport, viewport));
-	
+
 							modelViewMatrix .push ();
 							modelViewMatrix .identity ();
-	
+
 							this .group .traverse (type, renderObject);
-	
+
 							modelViewMatrix .pop ();
 							viewVolumes     .pop ();
 
-							var lastDepthShape = renderObject .getNumDepthShapes ();
+							const lastDepthShape = renderObject .getNumDepthShapes ();
 
 							this .depthShapes = renderObject .getDepthShapes () .splice (firstDepthShape, lastDepthShape - firstDepthShape);
 
 							renderObject .setNumDepthShapes (firstDepthShape);
 						}
 
-						var
-							depthShapes     = this .depthShapes,
-							modelViewMatrix = renderObject .getModelViewMatrix ();
+						const modelViewMatrix = renderObject .getModelViewMatrix ();
 
-						for (var i = 0, length = depthShapes .length; i < length; ++ i)
+						for (const depthShape of this .depthShapes)
 						{
-							var depthShape = depthShapes [i];
-
 							modelViewMatrix .push ();
 							modelViewMatrix .multLeft (depthShape .modelViewMatrix);
 							depthShape .shapeNode .traverse (type, renderObject);
 							modelViewMatrix .pop ();
 						}
 
-						break;
+						return;
 					}
 					case TraverseType .DISPLAY:
 					{
@@ -258,25 +258,25 @@ function (Fields,
 						{
 							//console .log ("Rebuilding StaticGroup opaqueShapes and transparentShapes");
 
-							var
+							const
 								viewVolumes           = renderObject .getViewVolumes (),
 								viewport              = renderObject .getViewport (),
 								projectionMatrix      = renderObject .getProjectionMatrix (),
 								modelViewMatrix       = renderObject .getModelViewMatrix (),
 								firstOpaqueShape      = renderObject .getNumOpaqueShapes (),
 								firstTransparentShape = renderObject .getNumTransparentShapes ();
-				
+
 							viewVolumes .push (viewVolume .set (projectionMatrix, viewport, viewport));
-	
+
 							modelViewMatrix .push ();
 							modelViewMatrix .identity ();
-	
+
 							this .group .traverse (type, renderObject);
-	
+
 							modelViewMatrix .pop ();
 							viewVolumes     .pop ();
 
-							var
+							const
 								lastOpaqueShape      = renderObject .getNumOpaqueShapes (),
 								lastTransparentShape = renderObject .getNumTransparentShapes ();
 
@@ -287,32 +287,25 @@ function (Fields,
 							renderObject .setNumTransparentShapes (firstTransparentShape);
 						}
 
-						var
-							opaqueShapes      = this .opaqueShapes,
-							transparentShapes = this .transparentShapes,
-							modelViewMatrix   = renderObject .getModelViewMatrix ();
+						const modelViewMatrix = renderObject .getModelViewMatrix ();
 
-						for (var i = 0, length = opaqueShapes .length; i < length; ++ i)
+						for (const opaqueShape of this .opaqueShapes)
 						{
-							var opaqueShape = opaqueShapes [i];
-
 							modelViewMatrix .push ();
 							modelViewMatrix .multLeft (opaqueShape .modelViewMatrix);
 							opaqueShape .shapeNode .traverse (type, renderObject);
 							modelViewMatrix .pop ();
 						}
 
-						for (var i = 0, length = transparentShapes .length; i < length; ++ i)
+						for (const transparentShape of this .transparentShapes)
 						{
-							var transparentShape = transparentShapes [i];
-
 							modelViewMatrix .push ();
 							modelViewMatrix .multLeft (transparentShape .modelViewMatrix);
 							transparentShape .shapeNode .traverse (type, renderObject);
 							modelViewMatrix .pop ();
 						}
 
-						break;
+						return;
 					}
 				}
 			};

package/src/x_ite/Components/Grouping/Switch.js

@@ -52,13 +52,15 @@ define ([
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Grouping/X3DGroupingNode",
+	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DCast",
 	"x_ite/Bits/X3DConstants",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DGroupingNode, 
+          X3DGroupingNode,
+          TraverseType,
           X3DCast,
           X3DConstants)
 {
@@ -70,8 +72,12 @@ function (Fields,
 
 		this .addType (X3DConstants .Switch);
 
-		if (executionContext .getSpecificationVersion () == "2.0")
+		if (executionContext .getSpecificationVersion () === "2.0")
 			this .addAlias ("choice", this .children_);
+
+		this .childNode     = null;
+		this .visibleNode   = null;
+		this .boundedObject = null;
 	}
 
 	Switch .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
@@ -80,6 +86,8 @@ function (Fields,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",       new Fields .SFNode ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "whichChoice",    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 ()),
@@ -101,46 +109,188 @@ function (Fields,
 		initialize: function ()
 		{
 			X3DGroupingNode .prototype .initialize .call (this);
-			
-			this .whichChoice_ .addInterest ("set_whichChoice__", this);
-			
-			this .set_whichChoice__ ();
+
+			this .whichChoice_ .addInterest ("set_child__", this);
+			this .children_    .addInterest ("set_child__", this);
+
+			this .set_child__ ();
 		},
-		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 ());
 		},
-		set_whichChoice__: function ()
+		clear: function () { },
+		add: function () { },
+		remove: function () { },
+		set_child__: function ()
 		{
-			this .set_cameraObjects__ ();
+			if (this .childNode)
+			{
+				this .childNode .isCameraObject_   .removeInterest ("set_cameraObject__",     this);
+				this .childNode .isPickableObject_ .removeInterest ("set_transformSensors__", this);
+			}
+
+			if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+			{
+				this .childNode .visible_     .removeInterest ("set_visible__",     this);
+				this .childNode .bboxDisplay_ .removeInterest ("set_bboxDisplay__", this);
+			}
+
+			const whichChoice = this .whichChoice_ .getValue ();
+
+			if (whichChoice >= 0 && whichChoice < this .children_ .length)
+			{
+				this .childNode = X3DCast (X3DConstants .X3DChildNode, this .children_ [whichChoice]);
+
+				if (this .childNode)
+				{
+					this .childNode .isCameraObject_   .addInterest ("set_cameraObject__",     this);
+					this .childNode .isPickableObject_ .addInterest ("set_transformSensors__", this);
+
+					if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+					{
+						this .childNode .visible_     .addInterest ("set_visible__",     this);
+						this .childNode .bboxDisplay_ .addInterest ("set_bboxDisplay__", this);
+					}
+
+					delete this .traverse;
+				}
+			}
+			else
+			{
+				this .childNode = null;
+
+				this .traverse = Function .prototype;
+			}
+
+			this .set_transformSensors__ ();
+			this .set_visible__ ();
+			this .set_bboxDisplay__ ();
 		},
-		set_cameraObjects__: function ()
+		set_cameraObject__: function ()
 		{
-			this .child = this .getChild (this .whichChoice_ .getValue ());
-
-			if (this .child && this .child .getCameraObject)
-				this .setCameraObject (this .child .getCameraObject ());
+			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 ()));
+		},
+		set_visible__: function ()
+		{
+			if (X3DCast (X3DConstants .X3DBoundedObject, this .childNode))
+			{
+				this .visibleNode = this .childNode .visible_ .getValue () ? this .childNode : null;
+			}
+			else
+			{
+				this .visibleNode = this .childNode;
+			}
+
+			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)
 		{
-			if (this .child)
-				this .child .traverse (type, renderObject);
+			switch (type)
+			{
+				case TraverseType .POINTER:
+				case TraverseType .CAMERA:
+				case TraverseType .SHADOW:
+				{
+					const visibleNode = this .visibleNode;
+
+					if (visibleNode)
+						visibleNode .traverse (type, renderObject);
+
+					return;
+				}
+				case TraverseType .PICKING:
+				{
+					if (this .getTransformSensors () .size)
+					{
+						const modelMatrix = renderObject .getModelViewMatrix () .get ();
+
+						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:
+				{
+					const visibleNode = this .visibleNode;
+
+					if (visibleNode)
+						visibleNode .traverse (type, renderObject);
+
+					const boundedObject = this .boundedObject;
+
+					if (boundedObject)
+						boundedObject .displayBBox (type, renderObject);
+
+					return;
+				}
+			}
 		},
 	});
 
 	return Switch;
 });
-
-