x_ite 4.0.5 → 4.7.5

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

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -57,12 +56,11 @@ define ([
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Matrix4",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DTransformMatrix3DNode, 
-          X3DGeospatialObject, 
+          X3DTransformMatrix3DNode,
+          X3DGeospatialObject,
           X3DConstants,
           Matrix4)
 {
@@ -78,9 +76,11 @@ function ($,
 		X3DGeospatialObject      .call (this, executionContext);
 
 		this .addType (X3DConstants .GeoTransform);
+
+		this .translation_ .setUnit ("length");
 	}
 
-	GeoTransform .prototype = $.extend (Object .create (X3DTransformMatrix3DNode .prototype),
+	GeoTransform .prototype = Object .assign (Object .create (X3DTransformMatrix3DNode .prototype),
 		X3DGeospatialObject .prototype,
 	{
 		constructor: GeoTransform,
@@ -93,6 +93,8 @@ function ($,
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "geoOrigin",        new Fields .SFNode ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "geoSystem",        new Fields .MFString ("GD", "WE")),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "geoCenter",        new Fields .SFVec3d ()),
+			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 ()),
@@ -115,9 +117,9 @@ function ($,
 		{
 			X3DTransformMatrix3DNode .prototype .initialize .call (this);
 			X3DGeospatialObject      .prototype .initialize .call (this);
-		
+
 			this .addInterest ("eventsProcessed", this);
-		
+
 			this .eventsProcessed ();
 		},
 		eventsProcessed: function ()
@@ -127,14 +129,14 @@ function ($,
 				this .setHidden (this .scale_ .x === 0 ||
 				                 this .scale_ .y === 0 ||
 				                 this .scale_ .z === 0);
-	
+
 				this .getLocationMatrix (this .geoCenter_ .getValue (), locationMatrix);
-	
+
 				matrix .set (this .translation_      .getValue (),
 				             this .rotation_         .getValue (),
 				             this .scale_            .getValue (),
 				             this .scaleOrientation_ .getValue ());
-	
+
 				this .setMatrix (matrix .multRight (locationMatrix) .multLeft (locationMatrix .inverse ()));
 			}
 			catch (error)
@@ -147,5 +149,3 @@ function ($,
 
 	return GeoTransform;
 });
-
-

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

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -58,21 +57,22 @@ define ([
 	"x_ite/Components/Navigation/NavigationInfo",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Geometry/Camera",
+	"standard/Math/Numbers/Vector2",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Rotation4",
 	"standard/Math/Numbers/Matrix4",
 	"standard/Math/Algorithm",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DViewpointNode, 
+          X3DViewpointNode,
           X3DGeospatialObject,
           ScalarInterpolator,
           NavigationInfo,
           X3DConstants,
           Camera,
+          Vector2,
           Vector3,
           Rotation4,
           Matrix4,
@@ -80,19 +80,6 @@ function ($,
 {
 "use strict";
 
-	var
-		zAxis               = new Vector3 (0, 0, 1),
-		screenScale         = new Vector3 (0, 0, 0),
-		normalized          = new Vector3 (0, 0, 0),
-		upVector            = new Vector3 (0, 0, 0),
-		locationMatrix      = new Matrix4 (),
-		position            = new Vector3 (0, 0, 0),
-		orientation         = new Rotation4 (0, 0, 1, 0),
-		centerOfRotation    = new Vector3 (0, 0, 0),
-		geoPosition         = new Vector3 (0, 0, 0),
-		geoOrientation      = new Rotation4 (0, 0, 1, 0),
-		geoCenterOfRotation = new Vector3 (0, 0, 0);
-
 	function traverse (type, renderObject)
 	{
 		X3DViewpointNode .prototype .traverse .call (this, type, renderObject);
@@ -107,10 +94,12 @@ function ($,
 
 		this .addType (X3DConstants .GeoViewpoint);
 
+		this .centerOfRotation_ .setUnit ("length");
+		this .fieldOfView_      .setUnit ("angle");
+
 		this .navigationInfoNode      = new NavigationInfo (executionContext);
 		this .fieldOfViewInterpolator = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
 		this .projectionMatrix        = new Matrix4 ();
-		this .position                = new Vector3 ();
 		this .elevation               = 0;
 
 		switch (executionContext .specificationVersion)
@@ -124,7 +113,7 @@ function ($,
 		}
 	}
 
-	GeoViewpoint .prototype = $.extend (Object .create (X3DViewpointNode .prototype),
+	GeoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototype),
 		X3DGeospatialObject .prototype,
 	{
 		constructor: GeoViewpoint,
@@ -167,9 +156,9 @@ function ($,
 			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
@@ -180,104 +169,170 @@ function ($,
 			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 (value)
+		setPosition: (function ()
 		{
-			this .position_ .setValue (this .getGeoCoord (value, geoPosition));
-		},
-		getPosition: function () 
+			var geoPosition = new Vector3 (0, 0, 0);
+
+			return function (value)
+			{
+				this .position_ .setValue (this .getGeoCoord (value, geoPosition));
+			};
+		})(),
+		getPosition: (function ()
 		{
-			return this .getCoord (this .position_ .getValue (), position);
-		},
-		set_position__: function ()
+			var position = new Vector3 (0, 0, 0);
+
+			return function ()
+			{
+				return this .getCoord (this .position_ .getValue (), position);
+			};
+		})(),
+		set_position__: (function ()
 		{
-			this .getCoord (this .position_ .getValue (), this .position);
+			var position = new Vector3 (0, 0, 0);
 
-			this .elevation = this .getGeoElevation (position .assign (this .position) .add (this .positionOffset_ .getValue ()));
-		},
-		setOrientation: function (value)
+			return function ()
+			{
+				this .getCoord (this .position_ .getValue (), position);
+
+				this .elevation = this .getGeoElevation (position .add (this .positionOffset_ .getValue ()));
+			};
+		})(),
+		setOrientation: (function ()
 		{
-			///  Returns the resulting orientation for this viewpoint.
+			var
+				locationMatrix = new Matrix4 (),
+				geoOrientation = new Rotation4 (0, 0, 1, 0);
 
-			var rotationMatrix = this .getLocationMatrix (this .position_ .getValue (), locationMatrix) .submatrix;
+			return function (value)
+			{
+				///  Returns the resulting orientation for this viewpoint.
 
-			geoOrientation .setMatrix (rotationMatrix);
+				var rotationMatrix = this .getLocationMatrix (this .position_ .getValue (), locationMatrix) .submatrix;
 
-			this .orientation_ .setValue (geoOrientation .inverse () .multLeft (value));
-		},
-		getOrientation: function ()
+				geoOrientation .setMatrix (rotationMatrix);
+
+				this .orientation_ .setValue (geoOrientation .inverse () .multLeft (value));
+			};
+		})(),
+		getOrientation: (function ()
 		{
-			///  Returns the resulting orientation for this viewpoint.
+			var
+				locationMatrix = new Matrix4 (),
+				orientation    = new Rotation4 (0, 0, 1, 0);
 
-			var rotationMatrix = this .getLocationMatrix (this .position_ .getValue (), locationMatrix) .submatrix;
+			return function ()
+			{
+				///  Returns the resulting orientation for this viewpoint.
 
-			orientation .setMatrix (rotationMatrix);
-		
-			return orientation .multLeft (this .orientation_ .getValue ());
-		},
-		getCenterOfRotation: function ()
+				var rotationMatrix = this .getLocationMatrix (this .position_ .getValue (), locationMatrix) .submatrix;
+
+				orientation .setMatrix (rotationMatrix);
+
+				return orientation .multLeft (this .orientation_ .getValue ());
+			};
+		})(),
+		getCenterOfRotation: (function ()
 		{
-			return this .getCoord (this .centerOfRotation_ .getValue (), centerOfRotation);
-		},
+			var centerOfRotation = new Vector3 (0, 0, 0);
+
+			return function ()
+			{
+				return this .getCoord (this .centerOfRotation_ .getValue (), centerOfRotation);
+			};
+		})(),
 		getFieldOfView: function ()
 		{
 			var fov = this .fieldOfView_ * this .fieldOfViewScale_;
 
 			return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
 		},
-		getUpVector: function ()
+		getMaxFarValue: function ()
 		{
-			return this .getGeoUpVector .call (this, position .assign (this .position) .add (this .positionOffset_ .getValue ()), upVector);
+			return this .getBrowser () .getRenderingProperty ("LogarithmicDepthBuffer") ? 1e10 : 1e9;
 		},
+		getUpVector: (function ()
+		{
+			var
+				position = new Vector3 (0, 0, 0),
+				upVector = new Vector3 (0, 0, 0);
+
+			return function ()
+			{
+				this .getCoord (this .position_ .getValue (), position);
+
+				return this .getGeoUpVector .call (this, position .add (this .positionOffset_ .getValue ()), upVector);
+			};
+		})(),
 		getSpeedFactor: function ()
 		{
 			return (Math .max (this .elevation, 0.0) + 10) / 10 * this .speedFactor_ .getValue ();
 		},
-		getMaxZFar: function ()
-		{
-			return 1e9;
-		},
-		getScreenScale: function (point, viewport)
+		getScreenScale: (function ()
 		{
-		   // Returns the screen scale in meter/pixel for on pixel.
+			var screenScale = new Vector3 (0, 0, 0);
 
-			var
-				width  = viewport [2],
-				height = viewport [3],
-				size   = Math .tan (this .getFieldOfView () / 2) * 2 * point .abs (); // Assume we are on sphere.
+			return function (point, viewport)
+			{
+			   // Returns the screen scale in meter/pixel for on pixel.
 
-			size *= Math .abs (normalized .assign (point) .normalize () .dot (zAxis));
+				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;
+				if (width > height)
+					size /= height;
+				else
+					size /= width;
 
-			return screenScale .set (size, size, size);
-		},
+				return screenScale .set (size, size, size);
+			};
+		})(),
+		getViewportSize: (function ()
+		{
+			var viewportSize = new Vector2 (0, 0);
+
+			return function (viewport, nearValue)
+			{
+				var
+					width  = viewport [2],
+					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);
+			};
+		})(),
 		getLookAtDistance: function (bbox)
 		{
 			return (bbox .size .abs () / 2) / Math .tan (this .getFieldOfView () / 2);
 		},
 		getProjectionMatrixWithLimits: function (nearValue, farValue, viewport, limit)
 		{
-			if (limit)
+			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
@@ -290,5 +345,3 @@ function ($,
 
 	return GeoViewpoint;
 });
-
-

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

@@ -48,15 +48,13 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/Browser/Geospatial/Geospatial",
 	"x_ite/Bits/X3DCast",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Matrix4",
 ],
-function ($,
-          X3DConstants,
+function (X3DConstants,
           Geospatial,
           X3DCast,
           Vector3,
@@ -104,18 +102,18 @@ function ($,
 		{
 			if (this .geoOriginNode)
 			{
-				this .geoOriginNode .removeInterest ("set_origin__", this);
+				this .geoOriginNode .removeInterest ("set_origin__",    this);
 				this .geoOriginNode .removeInterest ("set_rotateYUp__", this);
-				this .geoOriginNode .removeInterest ("addNodeEvent", this);
+				this .geoOriginNode .removeInterest ("addNodeEvent",    this);
 			}
-		
+
 			this .geoOriginNode = X3DCast (X3DConstants .GeoOrigin, this .geoOrigin_);
-		
+
 			if (this .geoOriginNode)
 			{
-				this .geoOriginNode .addInterest ("set_origin__", this);
+				this .geoOriginNode .addInterest ("set_origin__",    this);
 				this .geoOriginNode .addInterest ("set_rotateYUp__", this);
-				this .geoOriginNode .addInterest ("addNodeEvent", this);
+				this .geoOriginNode .addInterest ("addNodeEvent",    this);
 			}
 		
 			this .set_origin__ ();

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

@@ -48,18 +48,16 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Grouping/X3DGroupingNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DGroupingNode, 
+          X3DGroupingNode,
           X3DConstants)
 {
 "use strict";
@@ -71,11 +69,13 @@ function ($,
 		this .addType (X3DConstants .Group);
 	}
 
-	Group .prototype = $.extend (Object .create (X3DGroupingNode .prototype),
+	Group .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
 	{
 		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 ()),
@@ -98,5 +98,3 @@ function ($,
 
 	return Group;
 });
-
-