x_ite 8.6.10 → 8.6.12

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

@@ -108,10 +108,7 @@ Switch .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 ());
@@ -165,11 +162,11 @@ Switch .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 ()
    {
@@ -196,11 +193,7 @@ Switch .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:
@@ -232,25 +225,14 @@ Switch .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:
          {
-            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/Grouping/X3DBoundedObject.js

@@ -106,7 +106,6 @@ X3DBoundedObject .prototype =
          const modelViewMatrix = renderObject .getModelViewMatrix ();
 
          this .getBBox (bbox);
-
          matrix .set (bbox .center, null, bbox .size);
 
          modelViewMatrix .push ();

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

@@ -105,7 +105,7 @@ X3DGroupingNode .prototype = Object .assign (Object .create (X3DChildNode .proto
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
    },
-   getHidden: function ()
+   isHidden: function ()
    {
       return this .hidden;
    },

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++,
@@ -441,11 +442,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 +489,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 +525,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 +549,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 +614,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 ();
 }
@@ -118,11 +120,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 +143,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/NURBS/X3DNurbsSurfaceGeometryNode.js

@@ -89,20 +89,14 @@ X3DNurbsSurfaceGeometryNode .prototype = Object .assign (Object .create (X3DPara
    },
    set_texCoord__: function ()
    {
-      if (this .texCoordNode)
-         this .texCoordNode .removeInterest ("requestRebuild", this);
-
-      if (this .nurbsTexCoordNode)
-         this .nurbsTexCoordNode .removeInterest ("requestRebuild", this);
+      this .texCoordNode     ?.removeInterest ("requestRebuild", this);
+      this .nurbsTexCoordNode?.removeInterest ("requestRebuild", this);
 
       this .texCoordNode      = X3DCast (X3DConstants .X3DTextureCoordinateNode, this ._texCoord);
       this .nurbsTexCoordNode = X3DCast (X3DConstants .NurbsTextureCoordinate,   this ._texCoord);
 
-      if (this .texCoordNode)
-         this .texCoordNode .addInterest ("requestRebuild", this);
-
-      if (this .nurbsTexCoordNode)
-         this .nurbsTexCoordNode .addInterest ("requestRebuild", this);
+      this .texCoordNode     ?.addInterest ("requestRebuild", this);
+      this .nurbsTexCoordNode?.addInterest ("requestRebuild", this);
    },
    set_controlPoint__: function ()
    {

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

@@ -115,10 +115,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 +171,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 +247,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 +279,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 +307,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/X3DViewpointNode.js

@@ -279,11 +279,6 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
          if (this ._viewAll .getValue ())
             this .viewAll (layerNode .getBBox (new Box3 ()));
 
-         if (this .getBrowser () .getBrowserOption ("StraightenHorizon"))
-         {
-            this ._orientationOffset = this .straightenHorizon (this .getUserOrientation ()) .multLeft (this .getOrientation () .copy () .inverse ());
-         }
-
          // Handle NavigationInfo.
 
          const
@@ -382,11 +377,6 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this ._centerOfRotationOffset = Vector3   .Zero;
       this ._fieldOfViewScale       = 1;
 
-      if (this .getBrowser () .getBrowserOption ("StraightenHorizon"))
-      {
-         this ._orientationOffset = this .straightenHorizon (this .getUserOrientation ()) .multLeft (this .getOrientation () .copy () .inverse ());
-      }
-
       this .set_nearDistance__ ();
       this .set_farDistance__ ();
    },
@@ -452,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);
    },

package/src/x_ite/Components/ParticleSystems/ParticleSystem.js

@@ -275,9 +275,10 @@ ParticleSystem .prototype = Object .assign (Object .create (X3DShapeNode .protot
             }
             default:
             {
-               this .setTransparent (this .getAppearance () .isTransparent () ||
-                                     (this .colorRampNode && this .colorRampNode .isTransparent ()) ||
-                                     (this .geometryType === GeometryTypes .GEOMETRY && this .geometryNode && this .geometryNode .isTransparent ()));
+               this .setTransparent (!!(this .getAppearance () .isTransparent () ||
+                                        this .colorRampNode?.isTransparent () ||
+                                        (this .geometryType === GeometryTypes .GEOMETRY &&
+                                         this .geometryNode?.isTransparent ())));
                break;
             }
          }

package/src/x_ite/Components/Rendering/IndexedLineSet.js

@@ -140,57 +140,37 @@ IndexedLineSet .prototype = Object .assign (Object .create (X3DLineGeometryNode
    },
    set_fogCoord__: function ()
    {
-      if (this .fogCoordNode)
-         this .fogCoordNode .removeInterest ("requestRebuild", this);
+      this .fogCoordNode?.removeInterest ("requestRebuild", this);
 
       this .fogCoordNode = X3DCast (X3DConstants .FogCoordinate, this ._fogCoord);
 
-      if (this .fogCoordNode)
-         this .fogCoordNode .addInterest ("requestRebuild", this);
+      this .fogCoordNode?.addInterest ("requestRebuild", this);
    },
    set_color__: function ()
    {
-      if (this .colorNode)
-      {
-         this .colorNode .removeInterest ("requestRebuild", this);
-         this .colorNode ._transparent .removeInterest ("set_transparent__", this);
-      }
+      this .colorNode?.removeInterest ("requestRebuild", this);
 
       this .colorNode = X3DCast (X3DConstants .X3DColorNode, this ._color);
 
-      if (this .colorNode)
-      {
-         this .colorNode .addInterest ("requestRebuild", this);
-         this .colorNode ._transparent .addInterest ("set_transparent__", this);
+      this .colorNode?.addInterest ("requestRebuild", this);
 
-         this .set_transparent__ ();
-      }
-      else
-         this .setTransparent (false);
-   },
-   set_transparent__: function ()
-   {
-      this .setTransparent (this .colorNode .isTransparent ());
+      this .setTransparent (this .colorNode?.isTransparent () ?? false);
    },
    set_normal__: function ()
    {
-      if (this .normalNode)
-         this .normalNode .removeInterest ("requestRebuild", this);
+      this .normalNode?.removeInterest ("requestRebuild", this);
 
       this .normalNode = X3DCast (X3DConstants .X3DNormalNode, this ._normal);
 
-      if (this .normalNode)
-         this .normalNode .addInterest ("requestRebuild", this);
+      this .normalNode?.addInterest ("requestRebuild", this);
    },
    set_coord__: function ()
    {
-      if (this .coordNode)
-         this .coordNode .removeInterest ("requestRebuild", this);
+      this .coordNode?.removeInterest ("requestRebuild", this);
 
       this .coordNode = X3DCast (X3DConstants .X3DCoordinateNode, this ._coord);
 
-      if (this .coordNode)
-         this .coordNode .addInterest ("requestRebuild", this);
+      this .coordNode?.addInterest ("requestRebuild", this);
    },
    getColorPerVertexIndex: function (index)
    {
@@ -284,8 +264,7 @@ IndexedLineSet .prototype = Object .assign (Object .create (X3DLineGeometryNode
                   for (let a = 0; a < numAttribNodes; ++ a)
                      attribNodes [a] .addValue (index, attribArrays [a]);
 
-                  if (fogCoordNode)
-                     fogCoordNode .addDepth (index, fogDepthArray);
+                  fogCoordNode?.addDepth (index, fogDepthArray);
 
                   if (colorNode)
                   {
@@ -295,8 +274,7 @@ IndexedLineSet .prototype = Object .assign (Object .create (X3DLineGeometryNode
                         colorNode .addColor (this .getColorIndex (face), colorArray);
                   }
 
-                  if (normalNode)
-                     normalNode .addVector (index, normalArray);
+                  normalNode?.addVector (index, normalArray);
 
                   coordNode .addPoint (index, vertexArray);
                }

package/src/x_ite/Components/Rendering/LineSet.js

@@ -134,57 +134,37 @@ LineSet .prototype = Object .assign (Object .create (X3DLineGeometryNode .protot
    },
    set_fogCoord__: function ()
    {
-      if (this .fogCoordNode)
-         this .fogCoordNode .removeInterest ("requestRebuild", this);
+      this .fogCoordNode?.removeInterest ("requestRebuild", this);
 
       this .fogCoordNode = X3DCast (X3DConstants .FogCoordinate, this ._fogCoord);
 
-      if (this .fogCoordNode)
-         this .fogCoordNode .addInterest ("requestRebuild", this);
+      this .fogCoordNode?.addInterest ("requestRebuild", this);
    },
    set_color__: function ()
    {
-      if (this .colorNode)
-      {
-         this .colorNode .removeInterest ("requestRebuild", this);
-         this .colorNode ._transparent .removeInterest ("set_transparent__", this);
-      }
+      this .colorNode?.removeInterest ("requestRebuild", this);
 
       this .colorNode = X3DCast (X3DConstants .X3DColorNode, this ._color);
 
-      if (this .colorNode)
-      {
-         this .colorNode .addInterest ("requestRebuild", this);
-         this .colorNode ._transparent .addInterest ("set_transparent__", this);
+      this .colorNode?.addInterest ("requestRebuild", this);
 
-         this .set_transparent__ ();
-      }
-      else
-         this .setTransparent (false);
-   },
-   set_transparent__: function ()
-   {
-      this .setTransparent (this .colorNode .isTransparent ());
+      this .setTransparent (this .colorNode?.isTransparent () ?? false);
    },
    set_normal__: function ()
    {
-      if (this .normalNode)
-         this .normalNode .removeInterest ("requestRebuild", this);
+      this .normalNode?.removeInterest ("requestRebuild", this);
 
       this .normalNode = X3DCast (X3DConstants .X3DNormalNode, this ._normal);
 
-      if (this .normalNode)
-         this .normalNode .addInterest ("requestRebuild", this);
+      this .normalNode?.addInterest ("requestRebuild", this);
    },
    set_coord__: function ()
    {
-      if (this .coordNode)
-         this .coordNode .removeInterest ("requestRebuild", this);
+      this .coordNode?.removeInterest ("requestRebuild", this);
 
       this .coordNode = X3DCast (X3DConstants .X3DCoordinateNode, this ._coord);
 
-      if (this .coordNode)
-         this .coordNode .addInterest ("requestRebuild", this);
+      this .coordNode?.addInterest ("requestRebuild", this);
    },
    build: function ()
    {
@@ -224,14 +204,9 @@ LineSet .prototype = Object .assign (Object .create (X3DLineGeometryNode .protot
                for (let a = 0; a < numAttribNodes; ++ a)
                   attribNodes [a] .addValue (index, attribArrays [a]);
 
-               if (fogCoordNode)
-                  fogCoordNode .addDepth (index, fogDepthArray);
-
-               if (colorNode)
-                  colorNode .addColor (index, colorArray);
-
-               if (normalNode)
-                  normalNode .addVector (index, normalArray);
+               fogCoordNode?.addDepth  (index, fogDepthArray);
+               colorNode   ?.addColor  (index, colorArray);
+               normalNode  ?.addVector (index, normalArray);
 
                coordNode .addPoint (index, vertexArray);
             }

package/src/x_ite/Components/Rendering/PointSet.js

@@ -137,43 +137,35 @@ PointSet .prototype = Object .assign (Object .create (X3DPointGeometryNode .prot
    },
    set_fogCoord__: function ()
    {
-      if (this .fogCoordNode)
-         this .fogCoordNode .removeInterest ("requestRebuild", this);
+      this .fogCoordNode?.removeInterest ("requestRebuild", this);
 
       this .fogCoordNode = X3DCast (X3DConstants .FogCoordinate, this ._fogCoord);
 
-      if (this .fogCoordNode)
-         this .fogCoordNode .addInterest ("requestRebuild", this);
+      this .fogCoordNode?.addInterest ("requestRebuild", this);
    },
    set_color__: function ()
    {
-      if (this .colorNode)
-         this .colorNode .removeInterest ("requestRebuild", this);
+      this .colorNode?.removeInterest ("requestRebuild", this);
 
       this .colorNode = X3DCast (X3DConstants .X3DColorNode, this ._color);
 
-      if (this .colorNode)
-         this .colorNode .addInterest ("requestRebuild", this);
+      this .colorNode?.addInterest ("requestRebuild", this);
    },
    set_normal__: function ()
    {
-      if (this .normalNode)
-         this .normalNode .removeInterest ("requestRebuild", this);
+      this .normalNode?.removeInterest ("requestRebuild", this);
 
       this .normalNode = X3DCast (X3DConstants .X3DNormalNode, this ._normal);
 
-      if (this .normalNode)
-         this .normalNode .addInterest ("requestRebuild", this);
+      this .normalNode?.addInterest ("requestRebuild", this);
    },
    set_coord__: function ()
    {
-      if (this .coordNode)
-         this .coordNode .removeInterest ("requestRebuild", this);
+      this .coordNode?.removeInterest ("requestRebuild", this);
 
       this .coordNode = X3DCast (X3DConstants .X3DCoordinateNode, this ._coord);
 
-      if (this .coordNode)
-         this .coordNode .addInterest ("requestRebuild", this);
+      this .coordNode?.addInterest ("requestRebuild", this);
    },
    build: function ()
    {
@@ -200,14 +192,9 @@ PointSet .prototype = Object .assign (Object .create (X3DPointGeometryNode .prot
             attribNodes [a] .addValue (i, attribArrays [a]);
       }
 
-      if (fogCoordNode)
-         fogCoordNode .addDepths (fogDepthArray, numPoints);
-
-      if (colorNode)
-         colorNode .addColors (colorArray, numPoints);
-
-      if (normalNode)
-         normalNode .addNormals (normalArray, numPoints);
+      fogCoordNode?.addDepths  (fogDepthArray, numPoints);
+      colorNode   ?.addColors  (colorArray,    numPoints);
+      normalNode  ?.addNormals (normalArray,   numPoints);
 
       coordNode .addPoints (vertexArray, numPoints);
    },