x_ite 8.6.11 → 8.6.13

package/src/x_ite/Components/Layout/Layout.js

@@ -56,8 +56,9 @@ import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
 import Rotation4            from "../../../standard/Math/Numbers/Rotation4.js";
 import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
-var
-   i        = 0,
+let i = 0;
+
+const
    LEFT     = i++,
    CENTER   = i++,
    RIGHT    = i++,
@@ -126,6 +127,10 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
    {
       return "layout";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.2", "Infinity"];
+   },
    initialize: function ()
    {
       X3DLayoutNode .prototype .initialize .call (this);
@@ -441,11 +446,11 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
    },
    transform: function (type, renderObject)
    {
-      var parent = this .parent = renderObject .getParentLayout ();
+      const parent = this .parent = renderObject .getParentLayout ();
 
       // Calculate rectangleSize
 
-      var
+      const
          browser             = this .getBrowser (),
          contentScale        = browser .getRenderingProperty ("ContentScale"),
          matrix              = this .matrix,
@@ -488,7 +493,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Calculate translation
 
-      var translation = this .translation .set (0, 0, 0);
+      const translation = this .translation .set (0, 0, 0);
 
       switch (this .getAlignX ())
       {
@@ -524,7 +529,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Calculate offset
 
-      var offset = this .offset .set (0, 0, 0);
+      const offset = this .offset .set (0, 0, 0);
 
       switch (this .getOffsetUnitX ())
       {
@@ -548,13 +553,14 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Calculate scale
 
-      var
+      const
          scale              = this .scale .set (1, 1, 1),
          currentTranslation = this .currentTranslation,
          currentRotation    = this .currentRotation,
          currentScale       = this .currentScale;
 
-      var modelViewMatrix = renderObject .getModelViewMatrix () .get ();
+      const modelViewMatrix = renderObject .getModelViewMatrix () .get ();
+
       modelViewMatrix .get (currentTranslation, currentRotation, currentScale);
 
       switch (this .getScaleModeX ())
@@ -612,10 +618,10 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Transform
 
-      rectangleCenter .assign (translation) .add (offset);
+      rectangleCenter .assign (translation .add (offset));
 
       matrix .set (currentTranslation, currentRotation);
-      matrix .translate (translation .add (offset));
+      matrix .translate (translation);
       matrix .scale (scale);
 
       return matrix;

package/src/x_ite/Components/Layout/LayoutGroup.js

@@ -52,6 +52,7 @@ import X3DGroupingNode      from "../Grouping/X3DGroupingNode.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 Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
 function LayoutGroup (executionContext)
@@ -62,6 +63,7 @@ function LayoutGroup (executionContext)
 
    this .viewportNode    = null;
    this .layoutNode      = null;
+   this .matrix          = new Matrix4 ();
    this .modelViewMatrix = new Matrix4 ();
    this .screenMatrix    = new Matrix4 ();
 }
@@ -93,6 +95,10 @@ LayoutGroup .prototype = Object .assign (Object .create (X3DGroupingNode .protot
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.2", "Infinity"];
+   },
    initialize: function ()
    {
       X3DGroupingNode .prototype .initialize .call (this);
@@ -118,11 +124,13 @@ LayoutGroup .prototype = Object .assign (Object .create (X3DGroupingNode .protot
    getMatrix: function ()
    {
       if (this .layoutNode)
-         this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
-      else
-         this .matrix .identity ();
+         return this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
 
-      return this .matrix;
+      return this .matrix .identity ();
+   },
+   getLayout: function ()
+   {
+      return this .layoutNode;
    },
    traverse: function (type, renderObject)
    {
@@ -139,7 +147,7 @@ LayoutGroup .prototype = Object .assign (Object .create (X3DGroupingNode .protot
 
             if (this .layoutNode)
             {
-               var modelViewMatrix = renderObject .getModelViewMatrix ();
+               const modelViewMatrix = renderObject .getModelViewMatrix ();
 
                this .modelViewMatrix .assign (modelViewMatrix .get ());
                this .screenMatrix .assign (this .layoutNode .transform (type, renderObject));

package/src/x_ite/Components/Layout/LayoutLayer.js

@@ -89,6 +89,10 @@ LayoutLayer .prototype = Object .assign (Object .create (X3DLayerNode .prototype
    {
       return "layers";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.2", "Infinity"];
+   },
    initialize: function ()
    {
       X3DLayerNode .prototype .initialize .call (this);

package/src/x_ite/Components/Layout/ScreenFontStyle.js

@@ -86,6 +86,10 @@ ScreenFontStyle .prototype = Object .assign (Object .create (X3DFontStyleNode .p
    {
       return "fontStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.2", "Infinity"];
+   },
    initialize: function ()
    {
       X3DFontStyleNode .prototype .initialize .call (this);

package/src/x_ite/Components/Layout/ScreenGroup.js

@@ -87,6 +87,10 @@ ScreenGroup .prototype = Object .assign (Object .create (X3DGroupingNode .protot
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.2", "Infinity"];
+   },
    getBBox: function (bbox, shadows)
    {
       return this .getSubBBox (bbox, shadows) .multRight (this .matrix);

package/src/x_ite/Components/Lighting/DirectionalLight.js

@@ -266,6 +266,10 @@ DirectionalLight .prototype = Object .assign (Object .create (X3DLightNode .prot
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    getLights: function ()
    {
       return DirectionalLights;

package/src/x_ite/Components/Lighting/EnvironmentLight.js

@@ -134,6 +134,10 @@ EnvironmentLight .prototype = Object .assign (Object .create (X3DLightNode .prot
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["4.0", "Infinity"];
+   },
    getLights: function ()
    {
       return EnvironmentLights;

package/src/x_ite/Components/Lighting/PointLight.js

@@ -304,6 +304,10 @@ PointLight .prototype = Object .assign (Object .create (X3DLightNode .prototype)
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    getAttenuation: function ()
    {
       return this ._attenuation .getValue ();

package/src/x_ite/Components/Lighting/SpotLight.js

@@ -259,16 +259,10 @@ function SpotLight (executionContext)
 
    this .addType (X3DConstants .SpotLight);
 
-   switch (executionContext .getSpecificationVersion ())
+   if (executionContext .getSpecificationVersion () <= 3.2)
    {
-      case "2.0":
-      case "3.0":
-      case "3.1":
-      case "3.2":
-      {
-         this ._beamWidth   = 1.5708;
-         this ._cutOffAngle = 0.785398;
-      }
+      this ._beamWidth   = 1.5708;
+      this ._cutOffAngle = 0.785398;
    }
 
    this ._location    .setUnit ("length");
@@ -312,6 +306,10 @@ SpotLight .prototype = Object .assign (Object .create (X3DLightNode .prototype),
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    getAttenuation: function ()
    {
       return this ._attenuation .getValue ();

package/src/x_ite/Components/NURBS/Contour2D.js

@@ -82,6 +82,10 @@ Contour2D .prototype = Object .assign (Object .create (X3DNode .prototype),
    {
       return "trimmingContour";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/ContourPolyline2D.js

@@ -80,6 +80,10 @@ ContourPolyline2D .prototype = Object .assign (Object .create (X3DNurbsControlCu
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    tessellate: function (type)
    {
       switch (type)

package/src/x_ite/Components/NURBS/CoordinateDouble.js

@@ -77,6 +77,10 @@ CoordinateDouble .prototype = Object .assign (Object .create (X3DCoordinateNode
    {
       return "coord";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
 });
 
 export default CoordinateDouble;

package/src/x_ite/Components/NURBS/NurbsCurve.js

@@ -94,6 +94,10 @@ NurbsCurve .prototype = Object .assign (Object .create (X3DParametricGeometryNod
    {
       return "geometry";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DParametricGeometryNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsCurve2D.js

@@ -92,6 +92,10 @@ NurbsCurve2D .prototype = Object .assign (Object .create (X3DNurbsControlCurveNo
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    getTessellation: function (numKnots)
    {
       return NURBS .getTessellation (this ._tessellation .getValue (), numKnots - this ._order .getValue ());

package/src/x_ite/Components/NURBS/NurbsOrientationInterpolator.js

@@ -97,6 +97,10 @@ NurbsOrientationInterpolator .prototype = Object .assign (Object .create (X3DChi
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DChildNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsPatchSurface.js

@@ -90,6 +90,10 @@ NurbsPatchSurface .prototype = Object .assign (Object .create (X3DNurbsSurfaceGe
    {
       return "geometry";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
 });
 
 export default NurbsPatchSurface;

package/src/x_ite/Components/NURBS/NurbsPositionInterpolator.js

@@ -95,6 +95,10 @@ NurbsPositionInterpolator .prototype = Object .assign (Object .create (X3DChildN
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DChildNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsSet.js

@@ -90,6 +90,10 @@ NurbsSet .prototype = Object .assign (Object .create (X3DChildNode .prototype),
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DChildNode     .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsSurfaceInterpolator.js

@@ -93,6 +93,10 @@ NurbsSurfaceInterpolator .prototype = Object .assign (Object .create (X3DChildNo
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       this ._set_fraction .addInterest ("set_fraction__", this);

package/src/x_ite/Components/NURBS/NurbsSweptSurface.js

@@ -84,6 +84,10 @@ NurbsSweptSurface .prototype = Object .assign (Object .create (X3DParametricGeom
    {
       return "geometry";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DParametricGeometryNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsSwungSurface.js

@@ -84,6 +84,10 @@ NurbsSwungSurface .prototype = Object .assign (Object .create (X3DParametricGeom
    {
       return "geometry";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DParametricGeometryNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsTextureCoordinate.js

@@ -87,6 +87,10 @@ NurbsTextureCoordinate .prototype = Object .assign (Object .create (X3DNode .pro
    {
       return "texCoord";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DNode .prototype .initialize .call (this);

package/src/x_ite/Components/NURBS/NurbsTrimmedSurface.js

@@ -96,6 +96,10 @@ NurbsTrimmedSurface .prototype = Object .assign (Object .create (X3DNurbsSurface
    {
       return "geometry";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DNurbsSurfaceGeometryNode .prototype .initialize .call (this);

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

@@ -90,6 +90,10 @@ Billboard .prototype = Object .assign (Object .create (X3DGroupingNode .prototyp
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    getBBox: function (bbox, shadows)
    {
       return X3DGroupingNode .prototype .getBBox .call (this, bbox, shadows) .multRight (this .matrix);

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

@@ -95,6 +95,10 @@ Collision .prototype = Object .assign (Object .create (X3DGroupingNode .prototyp
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DGroupingNode .prototype .initialize .call (this);

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

@@ -103,6 +103,10 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DGroupingNode .prototype .initialize .call (this);
@@ -115,10 +119,7 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
       {
          const boundedObject = X3DCast (X3DConstants .X3DBoundedObject, this .visibleNode);
 
-         if (boundedObject)
-            return boundedObject .getBBox (bbox, shadows);
-
-         return bbox .set ();
+         return boundedObject?.getBBox (bbox, shadows) ?? bbox .set ();
       }
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
@@ -174,11 +175,11 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_transformSensors__: function ()
    {
-      this .setPickableObject (!!(this .getTransformSensors () .size || this .visibleNode && this .visibleNode .isPickableObject ()));
+      this .setPickableObject (!!(this .getTransformSensors () .size || this .visibleNode?.isPickableObject ()));
    },
    set_visible__: function ()
    {
@@ -250,11 +251,7 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
             case TraverseType .CAMERA:
             case TraverseType .SHADOW:
             {
-               const visibleNode = this .visibleNode;
-
-               if (visibleNode)
-                  visibleNode .traverse (type, renderObject);
-
+               this .visibleNode?.traverse (type, renderObject);
                return;
             }
             case TraverseType .PICKING:
@@ -286,11 +283,7 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
             }
             case TraverseType .COLLISION:
             {
-               const visibleNode = this .visibleNode;
-
-               if (visibleNode)
-                  visibleNode .traverse (type, renderObject);
-
+               this .visibleNode?.traverse (type, renderObject);
                return;
             }
             case TraverseType .DISPLAY:
@@ -318,16 +311,9 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
                   }
                }
 
-               const visibleNode = this .visibleNode;
-
-               if (visibleNode)
-                  visibleNode .traverse (type, renderObject);
-
-               const boundedObject = this .boundedObject;
-
-               if (boundedObject)
-                  boundedObject .displayBBox (type, renderObject);
+               this .visibleNode?.traverse (type, renderObject);
 
+               this .boundedObject?.displayBBox (type, renderObject);
                return;
             }
          }

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

@@ -104,6 +104,10 @@ NavigationInfo .prototype = Object .assign (Object .create (X3DBindableNode .pro
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DBindableNode .prototype .initialize .call (this);

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

@@ -106,6 +106,10 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DViewpointNode .prototype .initialize .call (this);

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

@@ -99,6 +99,10 @@ Viewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototy
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    getRelativeTransformation: function (fromViewpointNode)
    {
       const relative = X3DViewpointNode .prototype .getRelativeTransformation .call (this, fromViewpointNode);

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

@@ -92,6 +92,10 @@ ViewpointGroup .prototype = Object .assign (Object .create (X3DChildNode .protot
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.2", "Infinity"];
+   },
    initialize: function ()
    {
       X3DChildNode .prototype .initialize .call (this);

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

@@ -442,7 +442,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    {
       bbox = bbox .copy () .multRight (Matrix4 .inverse (this .getModelMatrix ()));
 
-      const minDistance = layerNode .getNavigationInfo () .getNearValue () * 2;
+      const minDistance = Math .max (layerNode .getNavigationInfo () .getNearValue () * 2, this .getLookAtDistance (bbox));
 
       this .lookAt (layerNode, bbox .center, minDistance, factor, straighten);
    },
@@ -451,10 +451,14 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       const
          offset = point .copy () .add (this .getUserOrientation () .multVecRot (new Vector3 (0, 0, distance))) .subtract (this .getPosition ());
 
+      layerNode .getNavigationInfo () ._transitionStart = true;
+
       this .timeSensor ._cycleInterval = 1;
       this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
       this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
 
+      this .timeSensor ._isActive .addInterest ("set_active__", this, layerNode .getNavigationInfo ());
+
       this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 1), new Fields .SFVec2f (1, 0));
 
       const
@@ -484,10 +488,14 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    },
    straightenView: function (layerNode)
    {
+      layerNode .getNavigationInfo () ._transitionStart = true;
+
       this .timeSensor ._cycleInterval = 1;
       this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
       this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
 
+      this .timeSensor ._isActive .addInterest ("set_active__", this, layerNode .getNavigationInfo ());
+
       this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 1), new Fields .SFVec2f (1, 0));
 
       const rotation = Rotation4 .multRight (Rotation4 .inverse (this .getOrientation ()), this .straightenHorizon (this .getUserOrientation ()));

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

@@ -98,6 +98,10 @@ Anchor .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DGroupingNode .prototype .initialize .call (this);

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

@@ -103,6 +103,10 @@ Inline .prototype = Object .assign (Object .create (X3DChildNode .prototype),
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DChildNode     .prototype .initialize .call (this);