x_ite 4.0.5 → 4.7.5

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

@@ -48,22 +48,22 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Navigation/X3DViewpointNode",
+	"x_ite/Components/Interpolation/ScalarInterpolator",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Geometry/Camera",
 	"standard/Math/Numbers/Vector2",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Matrix4",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DViewpointNode, 
+          X3DViewpointNode,
+          ScalarInterpolator,
           X3DConstants,
           Camera,
           Vector2,
@@ -72,20 +72,27 @@ function ($,
 {
 "use strict";
 
-	var
-		screenScale  = new Vector3 (0, 0, 0),
-		viewportSize = new Vector2 (0, 0);
-
 	function OrthoViewpoint (executionContext)
 	{
 		X3DViewpointNode .call (this, executionContext);
 
 		this .addType (X3DConstants .OrthoViewpoint);
 
-		this .projectionMatrix = new Matrix4 ();
+		this .addChildObjects ("fieldOfViewOffset", new Fields .MFFloat (0, 0, 0, 0));
+
+		this .position_         .setUnit ("length");
+		this .centerOfRotation_ .setUnit ("length");
+		this .fieldOfView_      .setUnit ("length");
+
+		this .projectionMatrix               = new Matrix4 ();
+		this .fieldOfViewOffsetInterpolator0 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
+		this .fieldOfViewOffsetInterpolator1 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
+		this .fieldOfViewOffsetInterpolator2 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
+		this .fieldOfViewOffsetInterpolator3 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
+		this .fieldOfViewScaleInterpolator   = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
 	}
 
-	OrthoViewpoint .prototype = $.extend (Object .create (X3DViewpointNode .prototype),
+	OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototype),
 	{
 		constructor: OrthoViewpoint,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -117,25 +124,99 @@ function ($,
 		{
 			X3DViewpointNode .prototype .initialize .call (this);
 
-			this .fieldOfView_      .addInterest ("set_fieldOfView___", this);
-			this .fieldOfViewScale_ .addInterest ("set_fieldOfView___", this);
+			this .fieldOfView_       .addInterest ("set_fieldOfView__", this);
+			this .fieldOfViewOffset_ .addInterest ("set_fieldOfView__", this);
+			this .fieldOfViewScale_  .addInterest ("set_fieldOfView__", this);
+
+			this .fieldOfViewOffsetInterpolator0 .key_ = new Fields .MFFloat (0, 1);
+			this .fieldOfViewOffsetInterpolator1 .key_ = new Fields .MFFloat (0, 1);
+			this .fieldOfViewOffsetInterpolator2 .key_ = new Fields .MFFloat (0, 1);
+			this .fieldOfViewOffsetInterpolator3 .key_ = new Fields .MFFloat (0, 1);
+			this .fieldOfViewScaleInterpolator   .key_ = new Fields .MFFloat (0, 1);
+
+			this .fieldOfViewOffsetInterpolator0 .setup ();
+			this .fieldOfViewOffsetInterpolator1 .setup ();
+			this .fieldOfViewOffsetInterpolator2 .setup ();
+			this .fieldOfViewOffsetInterpolator3 .setup ();
+			this .fieldOfViewScaleInterpolator   .setup ();
+
+			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewOffsetInterpolator0 .set_fraction_);
+			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewOffsetInterpolator1 .set_fraction_);
+			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewOffsetInterpolator2 .set_fraction_);
+			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewOffsetInterpolator3 .set_fraction_);
+			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewScaleInterpolator   .set_fraction_);
 
-			this .set_fieldOfView___ ();
+			this .fieldOfViewOffsetInterpolator0 .value_changed_ .addInterest ("set_fieldOfViewOffset__", this);
+			this .fieldOfViewOffsetInterpolator1 .value_changed_ .addInterest ("set_fieldOfViewOffset__", this);
+			this .fieldOfViewOffsetInterpolator2 .value_changed_ .addInterest ("set_fieldOfViewOffset__", this);
+			this .fieldOfViewOffsetInterpolator3 .value_changed_ .addInterest ("set_fieldOfViewOffset__", this);
+
+			this .fieldOfViewScaleInterpolator .value_changed_ .addFieldInterest (this .fieldOfViewScale_);
+
+			this .set_fieldOfView__ ();
 		},
-		set_fieldOfView___: function ()
+		set_fieldOfView__: function ()
 		{
 			var
 				length           = this .fieldOfView_ .length,
 				fieldOfViewScale = this .fieldOfViewScale_ .getValue ();
 
-			this .minimumX = (length > 0 ? this .fieldOfView_ [0] : -1) * fieldOfViewScale;
-			this .minimumY = (length > 1 ? this .fieldOfView_ [1] : -1) * fieldOfViewScale;
-			this .maximumX = (length > 2 ? this .fieldOfView_ [2] :  1) * fieldOfViewScale;
-			this .maximumY = (length > 3 ? this .fieldOfView_ [3] :  1) * fieldOfViewScale;
+			this .minimumX = ((length > 0 ? this .fieldOfView_ [0] : -1) + this .fieldOfViewOffset_ [0]) * fieldOfViewScale;
+			this .minimumY = ((length > 1 ? this .fieldOfView_ [1] : -1) + this .fieldOfViewOffset_ [1]) * fieldOfViewScale;
+			this .maximumX = ((length > 2 ? this .fieldOfView_ [2] :  1) + this .fieldOfViewOffset_ [2]) * fieldOfViewScale;
+			this .maximumY = ((length > 3 ? this .fieldOfView_ [3] :  1) + this .fieldOfViewOffset_ [3]) * fieldOfViewScale;
 
 			this .sizeX = this .maximumX - this .minimumX;
 			this .sizeY = this .maximumY - this .minimumY;
 		},
+		set_fieldOfViewOffset__: function ()
+		{
+			this .fieldOfViewOffset_ [0] = this .fieldOfViewOffsetInterpolator0 .value_changed_ .getValue ();
+			this .fieldOfViewOffset_ [1] = this .fieldOfViewOffsetInterpolator1 .value_changed_ .getValue ();
+			this .fieldOfViewOffset_ [2] = this .fieldOfViewOffsetInterpolator2 .value_changed_ .getValue ();
+			this .fieldOfViewOffset_ [3] = this .fieldOfViewOffsetInterpolator3 .value_changed_ .getValue ();
+		},
+		setInterpolators: function (fromViewpointNode, toViewpointNode)
+		{
+			if (fromViewpointNode .getType () .indexOf (X3DConstants .OrthoViewpoint) >= 0)
+			{
+				const
+					toLength   = toViewpointNode   .fieldOfView_ .length,
+					fromLength = fromViewpointNode .fieldOfView_ .length;
+
+				const
+					offset0 = (fromLength > 0 ? fromViewpointNode .fieldOfView_ [0] : -1) - (toLength > 0 ? toViewpointNode .fieldOfView_ [0] : -1),
+					offset1 = (fromLength > 1 ? fromViewpointNode .fieldOfView_ [1] : -1) - (toLength > 1 ? toViewpointNode .fieldOfView_ [1] : -1),
+					offset2 = (fromLength > 2 ? fromViewpointNode .fieldOfView_ [2] :  1) - (toLength > 2 ? toViewpointNode .fieldOfView_ [2] :  1),
+					offset3 = (fromLength > 3 ? fromViewpointNode .fieldOfView_ [3] :  1) - (toLength > 3 ? toViewpointNode .fieldOfView_ [3] :  1);
+
+				this .fieldOfViewOffsetInterpolator0 .keyValue_ = new Fields .MFFloat (offset0, toViewpointNode .fieldOfViewOffset_ [0]);
+				this .fieldOfViewOffsetInterpolator1 .keyValue_ = new Fields .MFFloat (offset1, toViewpointNode .fieldOfViewOffset_ [1]);
+				this .fieldOfViewOffsetInterpolator2 .keyValue_ = new Fields .MFFloat (offset2, toViewpointNode .fieldOfViewOffset_ [2]);
+				this .fieldOfViewOffsetInterpolator3 .keyValue_ = new Fields .MFFloat (offset3, toViewpointNode .fieldOfViewOffset_ [3]);
+
+				this .fieldOfViewScaleInterpolator .keyValue_ = new Fields .MFFloat (fromViewpointNode .fieldOfViewScale_ .getValue (), toViewpointNode .fieldOfViewScale_ .getValue ());
+
+				this .fieldOfViewOffset_ [0] = offset0;
+				this .fieldOfViewOffset_ [1] = offset1;
+				this .fieldOfViewOffset_ [2] = offset2;
+				this .fieldOfViewOffset_ [3] = offset3;
+
+				this .fieldOfViewScale_ = fromViewpointNode .fieldOfViewScale_ .getValue ();
+			}
+			else
+			{
+				this .fieldOfViewOffsetInterpolator0 .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewOffset_ [0], toViewpointNode .fieldOfViewOffset_ [0]);
+				this .fieldOfViewOffsetInterpolator1 .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewOffset_ [1], toViewpointNode .fieldOfViewOffset_ [1]);
+				this .fieldOfViewOffsetInterpolator2 .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewOffset_ [2], toViewpointNode .fieldOfViewOffset_ [2]);
+				this .fieldOfViewOffsetInterpolator3 .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewOffset_ [3], toViewpointNode .fieldOfViewOffset_ [3]);
+
+				this .fieldOfViewScaleInterpolator .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewScale_ .getValue (), toViewpointNode .fieldOfViewScale_ .getValue ());
+
+				this .fieldOfViewOffset_ = toViewpointNode .fieldOfViewOffset_ .getValue ();
+				this .fieldOfViewScale_  = toViewpointNode .fieldOfViewScale_  .getValue ();
+			}
+		},
 		getMinimumX: function ()
 		{
 			return this .minimumX;
@@ -160,40 +241,54 @@ function ($,
 		{
 			return this .sizeY;
 		},
-		getScreenScale: function (dummy, viewport)
+		getMaxFarValue: function ()
 		{
-			var
-				width  = viewport [2],
-				height = viewport [3],
-				sizeX  = this .sizeX,
-				sizeY  = this .sizeY,
-				aspect = width / height;
+			return 1e5;
+		},
+		getScreenScale: (function ()
+		{
+			var screenScale = new Vector3 (0, 0, 0);
 
-			if (aspect > sizeX / sizeY)
+			return function (point, viewport)
 			{
-				var s = sizeY / height;
+				var
+					width  = viewport [2],
+					height = viewport [3],
+					sizeX  = this .sizeX,
+					sizeY  = this .sizeY,
+					aspect = width / height;
 
-				return screenScale .set (s, s, s);
-			}
+				if (aspect > sizeX / sizeY)
+				{
+					var s = sizeY / height;
 
-			var s = sizeX / width;
+					return screenScale .set (s, s, s);
+				}
 
-			return screenScale .set (s, s, s);
-		},
-		getViewportSize: function (viewport)
+				var s = sizeX / width;
+
+				return screenScale .set (s, s, s);
+			};
+		})(),
+		getViewportSize: (function ()
 		{
-			var
-				width  = viewport [2],
-				height = viewport [3],
-				sizeX  = this .sizeX,
-				sizeY  = this .sizeY,
-				aspect = width / height;
+			var viewportSize = new Vector2 (0, 0);
 
-			if (aspect > sizeX / sizeY)
-				return viewportSize .set (sizeY * aspect, sizeY);
+			return function (viewport, nearValue)
+			{
+				var
+					width  = viewport [2],
+					height = viewport [3],
+					sizeX  = this .sizeX,
+					sizeY  = this .sizeY,
+					aspect = width / height;
 
-			return viewportSize .set (sizeX, sizeX / aspect);
-		},
+				if (aspect > sizeX / sizeY)
+					return viewportSize .set (sizeY * aspect, sizeY);
+
+				return viewportSize .set (sizeX, sizeX / aspect);
+			};
+		})(),
 		getLookAtDistance: function (bbox)
 		{
 			return bbox .size .abs () / 2 + 10;
@@ -226,5 +321,3 @@ function ($,
 
 	return OrthoViewpoint;
 });
-
-

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

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -56,38 +55,38 @@ define ([
 	"x_ite/Components/Interpolation/ScalarInterpolator",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Geometry/Camera",
+	"standard/Math/Numbers/Vector2",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Matrix4",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DViewpointNode,
           ScalarInterpolator,
           X3DConstants,
           Camera,
+          Vector2,
           Vector3,
           Matrix4)
 {
 "use strict";
 
-	var
-		zAxis       = new Vector3 (0, 0, 1),
-		screenScale = new Vector3 (0, 0, 0),
-		normalized  = new Vector3 (0, 0, 0);
-
 	function Viewpoint (executionContext)
 	{
 		X3DViewpointNode .call (this, executionContext);
 
 		this .addType (X3DConstants .Viewpoint);
 
+		this .position_         .setUnit ("length");
+		this .centerOfRotation_ .setUnit ("length");
+		this .fieldOfView_      .setUnit ("angle");
+
 		this .projectionMatrix        = new Matrix4 ();
 		this .fieldOfViewInterpolator = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
 	}
 
-	Viewpoint .prototype = $.extend (Object .create (X3DViewpointNode .prototype),
+	Viewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototype),
 	{
 		constructor: Viewpoint,
 		fieldDefinitions: new FieldDefinitionArray ([
@@ -119,25 +118,27 @@ function ($,
 		{
 			X3DViewpointNode .prototype .initialize .call (this);
 
-			this .fieldOfViewInterpolator .key_ = [ 0, 1 ];
+			this .fieldOfViewInterpolator .key_ = new Fields .MFFloat (0, 1);
 			this .fieldOfViewInterpolator .setup ();
 
 			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 .Viewpoint) < 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 ();
 			}
 		},
 		getFieldOfView: function ()
@@ -146,24 +147,47 @@ function ($,
 
 			return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
 		},
-		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.
+
+				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);
+			};
+		})(),
+		getViewportSize: (function ()
+		{
+			var viewportSize = new Vector2 (0, 0);
 
-			size *= Math .abs (normalized .assign (point) .normalize () .dot (zAxis));
+			return function (viewport, nearValue)
+			{
+				// Returns viewport size in meters.
 
-			if (width > height)
-				size /= height;
-			else
-				size /= width;
+				var
+					width  = viewport [2],
+					height = viewport [3],
+					size   = nearValue * Math .tan (this .getFieldOfView () / 2) * 2,
+					aspect = width / height;
 
-			return screenScale .set (size, size, size);
-		},
+				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);
@@ -176,5 +200,3 @@ function ($,
 
 	return Viewpoint;
 });
-
-

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

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -58,8 +57,7 @@ define ([
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Vector3",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DChildNode,
@@ -75,19 +73,22 @@ function ($,
 		X3DChildNode .call (this, executionContext);
 
 		this .addType (X3DConstants .ViewpointGroup);
-	   
+
+		this .size_   .setUnit ("length");
+		this .center_ .setUnit ("length");
+
 		this .proximitySensor  = new ProximitySensor (executionContext);
 		this .cameraObjects    = [ ];
 		this .viewpointGroups  = [ ];
 	}
 
-	ViewpointGroup .prototype = $.extend (Object .create (X3DChildNode .prototype),
+	ViewpointGroup .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 	{
 		constructor: ViewpointGroup,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",          new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "displayed",         new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "description",       new Fields .SFString ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "displayed",         new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "retainUserOffsets", new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "size",              new Fields .SFVec3f ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "center",            new Fields .SFVec3f ()),
@@ -138,14 +139,21 @@ function ($,
 
 			if (displayed && proxy)
 			{
-				this .proximitySensor .isCameraObject_ .addFieldInterest (this .isCameraObject_);
-				this .setCameraObject (this .proximitySensor .getCameraObject ());
+				this .proximitySensor .isCameraObject_   .addFieldInterest (this .isCameraObject_);
+				this .proximitySensor .isPickableObject_ .addFieldInterest (this .isPickableObject_);
+
+				this .setCameraObject   (this .proximitySensor .getCameraObject ());
+				this .setPickableObject (this .proximitySensor .getPickableObject ());
+
 				this .traverse = traverseWithProximitySensor;
 			}
 			else
 			{
-				this .proximitySensor .isCameraObject_ .removeFieldInterest (this .isCameraObject_);
-				this .setCameraObject (displayed);
+				this .proximitySensor .isCameraObject_    .removeFieldInterest (this .isCameraObject_);
+				this .proximitySensor .isPickableObject_ .removeFieldInterest (this .isPickableObject_);
+
+				this .setCameraObject   (displayed);
+				this .setPickableObject (false);
 
 				if (displayed)
 					this .traverse = traverse;