x_ite 8.0.0 → 8.3.0

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -51,11 +51,15 @@ import TimeSensor              from "../Time/TimeSensor.js";
 import EaseInEaseOut           from "../Interpolation/EaseInEaseOut.js";
 import PositionInterpolator    from "../Interpolation/PositionInterpolator.js";
 import OrientationInterpolator from "../Interpolation/OrientationInterpolator.js";
+import ScalarInterpolator      from "../Interpolation/ScalarInterpolator.js";
+import X3DCast                 from "../../Base/X3DCast.js";
 import TraverseType            from "../../Rendering/TraverseType.js";
 import X3DConstants            from "../../Base/X3DConstants.js";
 import Vector3                 from "../../../standard/Math/Numbers/Vector3.js";
 import Rotation4               from "../../../standard/Math/Numbers/Rotation4.js";
+import Matrix3                 from "../../../standard/Math/Numbers/Matrix3.js";
 import Matrix4                 from "../../../standard/Math/Numbers/Matrix4.js";
+import Box3                    from "../../../standard/Math/Geometry/Box3.js";
 
 function X3DViewpointNode (executionContext)
 {
@@ -85,6 +89,7 @@ function X3DViewpointNode (executionContext)
    this .orientationInterpolator      = new OrientationInterpolator (browser .getPrivateScene ());
    this .scaleInterpolator            = new PositionInterpolator    (browser .getPrivateScene ());
    this .scaleOrientationInterpolator = new OrientationInterpolator (browser .getPrivateScene ());
+   this .fieldOfViewScaleInterpolator = new ScalarInterpolator      (browser .getPrivateScene ());
 }
 
 X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .prototype),
@@ -105,11 +110,13 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this .orientationInterpolator      ._key = new Fields .MFFloat (0, 1);
       this .scaleInterpolator            ._key = new Fields .MFFloat (0, 1);
       this .scaleOrientationInterpolator ._key = new Fields .MFFloat (0, 1);
+      this .fieldOfViewScaleInterpolator ._key = new Fields .MFFloat (0, 1);
 
       this .positionInterpolator         .setup ();
       this .orientationInterpolator      .setup ();
       this .scaleInterpolator            .setup ();
       this .scaleOrientationInterpolator .setup ();
+      this .fieldOfViewScaleInterpolator .setup ();
 
       this .timeSensor ._isActive         .addFieldInterest (this ._transitionActive);
       this .timeSensor ._fraction_changed .addFieldInterest (this .easeInEaseOut ._set_fraction);
@@ -118,17 +125,71 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .orientationInterpolator      ._set_fraction);
       this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .scaleInterpolator            ._set_fraction);
       this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .scaleOrientationInterpolator ._set_fraction);
+      this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewScaleInterpolator      ._set_fraction);
 
       this .positionInterpolator         ._value_changed .addFieldInterest (this ._positionOffset);
       this .orientationInterpolator      ._value_changed .addFieldInterest (this ._orientationOffset);
       this .scaleInterpolator            ._value_changed .addFieldInterest (this ._scaleOffset);
       this .scaleOrientationInterpolator ._value_changed .addFieldInterest (this ._scaleOrientationOffset);
+      this .fieldOfViewScaleInterpolator ._value_changed .addFieldInterest (this ._fieldOfViewScale);
 
-      this ._isBound .addInterest ("set_bound__", this);
+      this ._nearDistance   .addInterest ("set_nearDistance__",   this);
+      this ._farDistance    .addInterest ("set_farDistance__",    this);
+      this ._viewAll        .addInterest ("set_viewAll__",        this);
+      this ._navigationInfo .addInterest ("set_navigationInfo__", this);
+      this ._isBound        .addInterest ("set_bound__",          this);
+
+      this .set_nearDistance__ ();
+      this .set_farDistance__ ();
+      this .set_navigationInfo__ ();
+   },
+   set_nearDistance__: function ()
+   {
+      const nearDistance = this ._nearDistance .getValue ();
+
+      this .nearDistance = nearDistance >= 0 ? nearDistance : undefined;
+   },
+   set_farDistance__: function ()
+   {
+      const farDistance = this ._farDistance .getValue ();
+
+      this .farDistance = farDistance >= 0 ? farDistance : undefined;
+   },
+   set_viewAll__: function ()
+   {
+      if (! this ._viewAll .getValue ())
+         return;
+
+      if (! this ._isBound .getValue ())
+         return;
+
+      this ._set_bind = true;
+   },
+   set_navigationInfo__: function ()
+   {
+      if (this .navigationInfoNode)
+         this ._isBound .removeFieldInterest (this .navigationInfoNode ._set_bind);
+
+      this .navigationInfoNode = X3DCast (X3DConstants .NavigationInfo, this ._navigationInfo);
+
+      if (this .navigationInfoNode)
+         this ._isBound .addFieldInterest (this .navigationInfoNode ._set_bind);
+   },
+   set_bound__: function ()
+   {
+      const browser = this .getBrowser ();
+
+      if (this ._isBound .getValue ())
+         browser .getNotification () ._string = this ._description;
+      else
+         this .timeSensor ._stopTime = browser .getCurrentTime ();
    },
-   getEaseInEaseOut: function ()
+   set_active__: function (navigationInfoNode, active)
    {
-      return this .easeInEaseOut;
+      if (this ._isBound .getValue () && ! active .getValue () && this .timeSensor ._fraction_changed .getValue () === 1)
+      {
+         navigationInfoNode ._transitionComplete = true;
+      }
    },
    setInterpolators: function () { },
    getPosition: function ()
@@ -159,9 +220,9 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    {
       const navigationInfo = renderObject .getNavigationInfo ();
 
-      return this .getProjectionMatrixWithLimits (navigationInfo .getNearValue (),
-                                                  navigationInfo .getFarValue (this),
-                                                  renderObject .getLayer () .getViewport () .getRectangle (this .getBrowser ()));
+      return this .getProjectionMatrixWithLimits (this .nearDistance ?? navigationInfo .getNearValue (),
+                                                  this .farDistance ?? navigationInfo .getFarValue (this),
+                                                  renderObject .getLayer () .getViewport () .getRectangle ());
    },
    getCameraSpaceMatrix: function ()
    {
@@ -182,7 +243,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    getUpVector: function ()
    {
       // Local y-axis,
-      // see http://www.web3d.org/documents/specifications/19775-1/V3.3/index.html#NavigationInfo.
+      // see https://www.web3d.org/documents/specifications/19775-1/V3.3/index.html#NavigationInfo.
       return Vector3 .yAxis;
    },
    getSpeedFactor: function ()
@@ -191,119 +252,120 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    },
    setVRMLTransition: function (value)
    {
-      // VRML behaviour support.
+      // VRML behavior support.
       this .VRMLTransition = value;
    },
    getVRMLTransition: function ()
    {
-      // VRML behaviour support.
+      // VRML behavior support.
       return this .VRMLTransition;
    },
-   transitionStart: (function ()
+   transitionStart: function (layerNode, fromViewpointNode, toViewpointNode)
    {
-      const
-         relativePosition         = new Vector3 (0, 0, 0),
-         relativeOrientation      = new Rotation4 (0, 0, 1, 0),
-         relativeScale            = new Vector3 (0, 0, 0),
-         relativeScaleOrientation = new Rotation4 (0, 0, 1, 0);
+      this .to = toViewpointNode;
 
-      return function (layerNode, fromViewpointNode, toViewpointNode)
+      if (toViewpointNode ._jump .getValue ())
       {
-         this .to = toViewpointNode;
+         const relative = toViewpointNode .getRelativeTransformation (fromViewpointNode);
+
+         if (! toViewpointNode ._retainUserOffsets .getValue ())
+            toViewpointNode .resetUserOffsets ();
+
+         // Copy from toViewpointNode all fields.
 
-         if (toViewpointNode ._jump .getValue ())
+         if (this !== toViewpointNode)
          {
-            if (! toViewpointNode ._retainUserOffsets .getValue ())
-               toViewpointNode .resetUserOffsets ();
+            for (const field of toViewpointNode .getFields ())
+               this .getField (field .getName ()) .assign (field);
 
-            // Copy from toViewpointNode all fields.
+            this .initialize ();
+         }
 
-            if (this !== toViewpointNode)
-            {
-               for (const field of toViewpointNode .getFields ())
-                  this .getField (field .getName ()) .assign (field);
-            }
+         if (this ._viewAll .getValue ())
+            toViewpointNode .viewAll (layerNode .getBBox (new Box3 ()));
 
-            // Respect NavigationInfo.
+         // Handle NavigationInfo.
 
-            const
-               navigationInfoNode = layerNode .getNavigationInfo (),
-               transitionTime     = navigationInfoNode ._transitionTime .getValue ();
+         const
+            navigationInfoNode = layerNode .getNavigationInfo (),
+            transitionTime     = navigationInfoNode ._transitionTime .getValue ();
 
-            let transitionType = navigationInfoNode .getTransitionType ();
+         let transitionType = navigationInfoNode .getTransitionType ();
 
-            // VRML behavior
+         // VRML behavior
 
-            if (this .getExecutionContext () .getSpecificationVersion () == "2.0")
-            {
-               if (toViewpointNode .getVRMLTransition ())
-                  transitionType = "LINEAR";
-               else
-                  transitionType = "TELEPORT";
-            }
+         if (this .getExecutionContext () .getSpecificationVersion () === "2.0")
+         {
+            if (toViewpointNode .getVRMLTransition ())
+               transitionType = "LINEAR";
+            else
+               transitionType = "TELEPORT";
+         }
 
-            toViewpointNode .setVRMLTransition (false);
+         toViewpointNode .setVRMLTransition (false);
 
-            // End VRML behavior
+         // End VRML behavior
 
-            if (transitionTime <= 0)
-               transitionType = "TELEPORT";
+         if (transitionTime <= 0)
+            transitionType = "TELEPORT";
 
-            switch (transitionType)
+         if (toViewpointNode .constructor !== fromViewpointNode .constructor)
+            transitionType = "TELEPORT";
+
+         switch (transitionType)
+         {
+            case "TELEPORT":
+            {
+               navigationInfoNode ._transitionComplete = true;
+               return;
+            }
+            case "ANIMATE":
+            {
+               this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 1), new Fields .SFVec2f (1, 0));
+               break;
+            }
+            default:
             {
-               case "TELEPORT":
-               {
-                  navigationInfoNode ._transitionComplete = true;
-                  return;
-               }
-               case "ANIMATE":
-               {
-                  this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 1), new Fields .SFVec2f (1, 0));
-                  break;
-               }
-               default:
-               {
-                  // LINEAR
-                  this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 0), new Fields .SFVec2f (0, 0));
-                  break;
-               }
+               // LINEAR
+               this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 0), new Fields .SFVec2f (0, 0));
+               break;
             }
+         }
 
-            this .timeSensor ._cycleInterval = transitionTime;
-            this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
-            this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
+         layerNode .getNavigationInfo () ._transitionStart = true;
 
-            this .timeSensor ._isActive .addInterest ("set_active__", this, navigationInfoNode);
+         this .timeSensor ._cycleInterval = transitionTime;
+         this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
+         this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
 
-            toViewpointNode .getRelativeTransformation (fromViewpointNode, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
+         this .timeSensor ._isActive .addInterest ("set_active__", this, navigationInfoNode);
 
-            this .positionInterpolator         ._keyValue = new Fields .MFVec3f    (relativePosition,         toViewpointNode ._positionOffset);
-            this .orientationInterpolator      ._keyValue = new Fields .MFRotation (relativeOrientation,      toViewpointNode ._orientationOffset);
-            this .scaleInterpolator            ._keyValue = new Fields .MFVec3f    (relativeScale,            toViewpointNode ._scaleOffset);
-            this .scaleOrientationInterpolator ._keyValue = new Fields .MFRotation (relativeScaleOrientation, toViewpointNode ._scaleOrientationOffset);
+         this .positionInterpolator         ._keyValue = new Fields .MFVec3f    (relative .position,         toViewpointNode ._positionOffset);
+         this .orientationInterpolator      ._keyValue = new Fields .MFRotation (relative .orientation,      toViewpointNode ._orientationOffset);
+         this .scaleInterpolator            ._keyValue = new Fields .MFVec3f    (relative .scale,            toViewpointNode ._scaleOffset);
+         this .scaleOrientationInterpolator ._keyValue = new Fields .MFRotation (relative .scaleOrientation, toViewpointNode ._scaleOrientationOffset);
 
-            this ._positionOffset         = relativePosition;
-            this ._orientationOffset      = relativeOrientation;
-            this ._scaleOffset            = relativeScale;
-            this ._scaleOrientationOffset = relativeScaleOrientation;
+         this ._positionOffset         = relative .position;
+         this ._orientationOffset      = relative .orientation;
+         this ._scaleOffset            = relative .scale;
+         this ._scaleOrientationOffset = relative .scaleOrientation;
 
-            this .setInterpolators (fromViewpointNode, toViewpointNode);
+         this .setInterpolators (fromViewpointNode, toViewpointNode, relative);
 
-            this ._transitionActive = true;
-         }
-         else
-         {
-            toViewpointNode .getRelativeTransformation (fromViewpointNode, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
+         this ._transitionActive = true;
+      }
+      else
+      {
+         const relative = toViewpointNode .getRelativeTransformation (fromViewpointNode);
 
-            toViewpointNode ._positionOffset         = relativePosition;
-            toViewpointNode ._orientationOffset      = relativeOrientation;
-            toViewpointNode ._scaleOffset            = relativeScale;
-            toViewpointNode ._scaleOrientationOffset = relativeScaleOrientation;
+         toViewpointNode ._positionOffset         = relative .position;
+         toViewpointNode ._orientationOffset      = relative .orientation;
+         toViewpointNode ._scaleOffset            = relative .scale;
+         toViewpointNode ._scaleOrientationOffset = relative .scaleOrientation;
 
-            toViewpointNode .setInterpolators (fromViewpointNode, toViewpointNode);
-         }
-      };
-   })(),
+         this .setInterpolators (fromViewpointNode, toViewpointNode, relative);
+      }
+   },
    transitionStop: function ()
    {
       this .timeSensor ._stopTime = this .getBrowser () .getCurrentTime ();
@@ -318,15 +380,54 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this ._centerOfRotationOffset = Vector3   .Zero;
       this ._fieldOfViewScale       = 1;
    },
-   getRelativeTransformation: function (fromViewpointNode, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation)
+   getRelativeTransformation: (function ()
    {
-      const differenceMatrix = this .modelMatrix .copy () .multRight (fromViewpointNode .getViewMatrix ()) .inverse ();
+      const
+         position         = new Vector3 (0, 0, 0),
+         orientation      = new Rotation4 (0, 0, 1, 0),
+         scale            = new Vector3 (0, 0, 0),
+         scaleOrientation = new Rotation4 (0, 0, 1, 0);
 
-      differenceMatrix .get (relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
+      return function (fromViewpointNode)
+      {
+         const differenceMatrix = this .modelMatrix .copy () .multRight (fromViewpointNode .getViewMatrix ()) .inverse ();
 
-      relativePosition .subtract (this .getPosition ());
-      relativeOrientation .assign (this .getOrientation () .copy () .inverse () .multRight (relativeOrientation));
-   },
+         differenceMatrix .get (position, orientation, scale, scaleOrientation);
+
+         position .subtract (this .getPosition ());
+         orientation .multLeft (this .getOrientation () .copy () .inverse ());
+
+         return {
+            position: position,
+            orientation: orientation,
+            scale: scale,
+            scaleOrientation: scaleOrientation,
+         };
+      };
+   })(),
+   getLookAtRotation: (function ()
+   {
+      const
+         x = new Vector3 (0, 0, 0),
+         y = new Vector3 (0, 0, 0),
+         z = new Vector3 (0, 0, 0),
+         m = new Matrix3 (),
+         r = new Rotation4 ();
+
+      return function (fromPoint, toPoint)
+      {
+         const up = this .getUpVector (true);
+
+         z .assign (fromPoint) .subtract (toPoint) .normalize ();
+         x .assign (up) .cross (z) .normalize ();
+         y .assign (z) .cross (x) .normalize ();
+
+         m .set (x.x, x.y, x.z, y.x, y.y, y.z, z.x, z.y, z.z);
+         r .setMatrix (m);
+
+         return r;
+      };
+   })(),
    lookAtPoint: function (layerNode, point, factor, straighten)
    {
       this .getCameraSpaceMatrix () .multVecMatrix (point);
@@ -373,13 +474,15 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
 
       this .positionInterpolator         ._keyValue = new Fields .MFVec3f (this ._positionOffset, translation);
       this .orientationInterpolator      ._keyValue = new Fields .MFRotation (this ._orientationOffset, rotation);
-      this .scaleInterpolator            ._keyValue = new Fields .MFVec3f (this ._scaleOffset, this ._scaleOffset);
+      this .scaleInterpolator            ._keyValue = new Fields .MFVec3f (this ._scaleOffset, Vector3 .One);
       this .scaleOrientationInterpolator ._keyValue = new Fields .MFRotation (this ._scaleOrientationOffset, this ._scaleOrientationOffset);
 
-      this .setInterpolators (this, this);
+      const relative = this .getRelativeTransformation (this);
 
+      this ._fieldOfViewScale       = 1;
       this ._centerOfRotationOffset = Vector3 .subtract (point, this .getCenterOfRotation ());
-      this ._set_bind               = true;
+
+      this .setInterpolators (this, this, relative);
    },
    straighten: function (layerNode, horizon)
    {
@@ -400,9 +503,11 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this .scaleInterpolator            ._keyValue = new Fields .MFVec3f (this ._scaleOffset, this ._scaleOffset);
       this .scaleOrientationInterpolator ._keyValue = new Fields .MFRotation (this ._scaleOrientationOffset, this ._scaleOrientationOffset);
 
-      this .setInterpolators (this, this);
+      const relative = this .getRelativeTransformation (this);
 
-      this ._set_bind = true;
+      this ._fieldOfViewScale = 1;
+
+      this .setInterpolators (this, this, relative);
    },
    straightenHorizon: (function ()
    {
@@ -430,25 +535,28 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
          return orientation .multRight (rotation);
       };
    })(),
-   set_active__: function (navigationInfoNode, active)
+   viewAll: function (bbox)
    {
-      if (this ._isBound .getValue () && ! active .getValue () && this .timeSensor ._fraction_changed .getValue () === 1)
-      {
-         navigationInfoNode ._transitionComplete = true;
-      }
-   },
-   set_bound__: function ()
-   {
-      if (this ._isBound .getValue ())
-         this .getBrowser () .getNotification () ._string = this ._description;
-      else
-         this .timeSensor ._stopTime = this .getBrowser () .getCurrentTime ();
+      const
+         center          = bbox .center,
+         direction       = this .getUserPosition () .copy () .subtract (center),
+         distance        = this .getLookAtDistance (bbox),
+         userPosition    = center .copy () .add (direction .normalize () .multiply (distance)),
+         userOrientation = this .getLookAtRotation (userPosition, center);
+
+      this ._positionOffset         = userPosition .subtract (this .getPosition ());
+      this ._orientationOffset      = this .getOrientation () .copy () .inverse () .multRight (userOrientation);
+      this ._centerOfRotationOffset = center .subtract (this .getCenterOfRotation ());
+      this ._fieldOfViewScale       = 1;
    },
    traverse: function (type, renderObject)
    {
       if (type !== TraverseType .CAMERA)
          return;
 
+      if (this .navigationInfoNode)
+         this .navigationInfoNode .traverse (type, renderObject);
+
       renderObject .getLayer () .getViewpoints () .push (this);
 
       this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());

package/src/x_ite/Components/Navigation.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/Networking/Anchor.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.