x_ite 5.0.3 → 6.1.0

package/src/x_ite/Components/Geometry2D/Disk2D.js

@@ -53,6 +53,7 @@ define ([
    "x_ite/Base/FieldDefinitionArray",
    "x_ite/Components/Rendering/X3DGeometryNode",
    "x_ite/Components/Rendering/X3DLineGeometryNode",
+   "x_ite/Components/Rendering/X3DPointGeometryNode",
    "x_ite/Base/X3DConstants",
 ],
 function (Fields,
@@ -60,6 +61,7 @@ function (Fields,
           FieldDefinitionArray,
           X3DGeometryNode,
           X3DLineGeometryNode,
+          X3DPointGeometryNode,
           X3DConstants)
 {
 "use strict";
@@ -75,7 +77,6 @@ function (Fields,
    }
 
    Disk2D .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
-      //X3DLineGeometryNode .prototype, // Considered X3DLineGeometryNode.
    {
       constructor: Disk2D,
       [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
@@ -112,7 +113,9 @@ function (Fields,
       build: function ()
       {
          const
-            options     = this .getBrowser () .getDisk2DOptions (),
+            browser     = this .getBrowser (),
+            gl          = browser .getContext (),
+            options     = browser .getDisk2DOptions (),
             innerRadius = Math .min (Math .abs (this ._innerRadius .getValue ()), Math .abs (this ._outerRadius .getValue ())),
             outerRadius = Math .max (Math .abs (this ._innerRadius .getValue ()), Math .abs (this ._outerRadius .getValue ()));
 
@@ -124,8 +127,15 @@ function (Fields,
 
             if (outerRadius === 0)
             {
-               // vertexArray .push (0, 0, 0, 1);
-               // this .setGeometryType (0);
+               vertexArray .push (0, 0, 0, 1);
+
+               this .getMin () .set (0, 0, 0);
+               this .getMax () .set (0, 0, 0);
+
+               this .setGeometryType (0);
+               this .setPrimitiveMode (gl .POINTS);
+               this .setTransparent (true);
+               this .setBase (X3DPointGeometryNode);
                return;
             }
 
@@ -147,6 +157,9 @@ function (Fields,
             this .getMax () .set ( outerRadius,  outerRadius, 0);
 
             this .setGeometryType (1);
+            this .setPrimitiveMode (gl .LINES);
+            this .setTransparent (false);
+            this .setBase (X3DLineGeometryNode);
             return;
          }
 
@@ -175,7 +188,10 @@ function (Fields,
             this .getMax () .set ( outerRadius,  outerRadius, 0);
 
             this .setGeometryType (2);
+            this .setPrimitiveMode (gl .TRIANGLES);
+            this .setTransparent (false);
             this .setSolid (this ._solid .getValue ());
+            this .setBase (X3DGeometryNode);
             return;
          }
 
@@ -218,52 +234,20 @@ function (Fields,
          this .getMax () .set ( outerRadius,  outerRadius, 0);
 
          this .setGeometryType (2);
+         this .setPrimitiveMode (gl .TRIANGLES);
+         this .setTransparent (false);
          this .setSolid (this ._solid .getValue ());
+         this .setBase (X3DGeometryNode);
       },
-      intersectsLine: function (line, clipPlanes, modelViewMatrix, intersections)
-      {
-         if (this .getGeometryType () < 2)
-         {
-            return X3DLineGeometryNode .prototype .intersectsLine .call (this, line, clipPlanes, modelViewMatrix, intersections);
-         }
-         else
-         {
-            return X3DGeometryNode .prototype .intersectsLine .call (this, line, clipPlanes, modelViewMatrix, intersections);
-         }
-      },
-      intersectsBox: function (box, clipPlanes, modelViewMatrix)
+      setBase: function (base)
       {
-         if (this .getGeometryType () < 2)
-         {
-            return X3DLineGeometryNode .prototype .intersectsBox .call (this, box, clipPlanes, modelViewMatrix);
-         }
-         else
-         {
-            return X3DGeometryNode .prototype .intersectsBox .call (this, box, clipPlanes, modelViewMatrix);
-         }
+         this .intersectsLine   = base .prototype .intersectsLine;
+         this .intersectsBox    = base .prototype .intersectsBox;
+         this .display          = base .prototype .display;
+         this .displayParticles = base .prototype .displayParticles;
       },
-      display: function (gl, context)
-      {
-         if (this .getGeometryType () < 2)
-         {
-            return X3DLineGeometryNode .prototype .display .call (this, gl, context);
-         }
-         else
-         {
-            return X3DGeometryNode .prototype .display .call (this, gl, context);
-         }
-      },
-      displayParticles: function (gl, context, particles, numParticles)
-      {
-         if (this .getGeometryType () < 2)
-         {
-            return X3DLineGeometryNode .prototype .displayParticles .call (this, gl, context, particles, numParticles);
-         }
-         else
-         {
-            return X3DGeometryNode .prototype .displayParticles .call (this, gl, context, particles, numParticles);
-         }
-      }
+      setRenderFunctions: function ()
+      { },
    });
 
    return Disk2D;

package/src/x_ite/Components/Geometry2D/TriangleSet2D.js

@@ -131,7 +131,7 @@ function (Fields,
             texCoordArray .shrinkToFit ();
          }
 
-         return texCoordArray;
+         this .getMultiTexCoords () .push (texCoordArray);
       },
    });
 

package/src/x_ite/Components/Geometry3D/ElevationGrid.js

@@ -144,7 +144,10 @@ function (Fields,
          const attribNodes = this .getAttrib ();
 
          for (const attribNode of attribNodes)
+         {
             attribNode .removeInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .removeInterest ("updateVertexArrays", this);
+         }
 
          attribNodes .length = 0;
 
@@ -157,7 +160,12 @@ function (Fields,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -350,8 +358,8 @@ function (Fields,
             normalPerVertex    = this ._normalPerVertex .getValue (),
             coordIndex         = this .createCoordIndex (),
             attribNodes        = this .getAttrib (),
-            numAttrib          = attribNodes .length,
-            attribs            = this .getAttribs (),
+            numAttribNodes     = attribNodes .length,
+            attribArrays       = this .getAttribs (),
             fogCoordNode       = this .fogCoordNode,
             colorNode          = this .getColor (),
             texCoordNode       = this .getTexCoord (),
@@ -388,8 +396,8 @@ function (Fields,
                   index = coordIndex [c],
                   point = points [index];
 
-               for (let a = 0; a < numAttrib; ++ a)
-                  attribNodes [a] .addValue (index, attribs [a]);
+               for (let a = 0; a < numAttribNodes; ++ a)
+                  attribNodes [a] .addValue (index, attribArrays [a]);
 
                if (fogCoordNode)
                   fogCoordNode .addDepth (index, fogDepthArray);

package/src/x_ite/Components/Geometry3D/IndexedFaceSet.js

@@ -177,8 +177,8 @@ function (Fields,
             normalPerVertex    = this ._normalPerVertex .getValue (),
             coordIndex         = this ._coordIndex .getValue (),
             attribNodes        = this .getAttrib (),
-            numAttrib          = attribNodes .length,
-            attribs            = this .getAttribs (),
+            numAttribNodes     = attribNodes .length,
+            attribArrays       = this .getAttribs (),
             fogCoordNode       = this .getFogCoord (),
             colorNode          = this .getColor (),
             texCoordNode       = this .getTexCoord (),
@@ -203,8 +203,8 @@ function (Fields,
             {
                const index = coordIndex [i];
 
-               for (let a = 0; a < numAttrib; ++ a)
-                  attribNodes [a] .addValue (index, attribs [a]);
+               for (let a = 0; a < numAttribNodes; ++ a)
+                  attribNodes [a] .addValue (index, attribArrays [a]);
 
                if (fogCoordNode)
                   fogCoordNode .addDepth (index, fogDepthArray);

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

@@ -102,27 +102,10 @@ function (Fields,
       {
          X3DCoordinateNode   .prototype .initialize .call (this);
          X3DGeospatialObject .prototype .initialize .call (this);
-
-         this ._point .addInterest ("set_point__", this);
-
-         this .set_point__ ();
-      },
-      set_point__: function ()
-      {
-         this .point  = this ._point .getValue ();
-         this .length = this ._point .length;
-      },
-      isEmpty: function ()
-      {
-         return this .length === 0;
-      },
-      getSize: function ()
-      {
-         return this .length;
       },
       set1Point: (function ()
       {
-         var result = new Vector3 (0, 0, 0);
+         const result = new Vector3 (0, 0, 0);
 
          return function (index, point)
          {
@@ -131,7 +114,7 @@ function (Fields,
       })(),
       get1Point: (function ()
       {
-         var p = new Vector3 (0, 0, 0);
+         const p = new Vector3 (0, 0, 0);
 
          return function (index, result)
          {
@@ -151,7 +134,7 @@ function (Fields,
       })(),
       addPoint: (function ()
       {
-         var
+         const
             p = new Vector3 (0, 0, 0),
             g = new Vector3 (0, 0, 0);
 
@@ -175,7 +158,7 @@ function (Fields,
       })(),
       addPoints: (function ()
       {
-         var
+         const
             p = new Vector3 (0, 0, 0),
             g = new Vector3 (0, 0, 0);
 
@@ -183,20 +166,20 @@ function (Fields,
          {
             const point = this .point;
 
-            for (var index = 0, length = this .length * 3; index < length; index += 3)
+            for (let index = 0, length = this .length * 3; index < length; index += 3)
             {
                this .getCoord (p .set (point [index], point [index + 1], point [index + 2]), g);
 
                array .push (g [0], g [1], g [2], 1);
             }
 
-            for (var index = length, length = min * 3; index < length; index += 3)
+            for (let index = this .length * 3, length = min * 3; index < length; index += 3)
                array .push (0, 0, 0, 1);
          };
       })(),
       getNormal: (function ()
       {
-         var
+         const
             point1 = new Vector3 (0, 0, 0),
             point2 = new Vector3 (0, 0, 0),
             point3 = new Vector3 (0, 0, 0);
@@ -205,7 +188,7 @@ function (Fields,
          {
             // The index[1,2,3] cannot be less than 0.
 
-            var length = this .length;
+            const length = this .length;
 
             if (index1 < length && index2 < length && index3 < length)
             {
@@ -220,7 +203,7 @@ function (Fields,
       })(),
       getQuadNormal: (function ()
       {
-         var
+         const
             point1 = new Vector3 (0, 0, 0),
             point2 = new Vector3 (0, 0, 0),
             point3 = new Vector3 (0, 0, 0),
@@ -230,7 +213,7 @@ function (Fields,
          {
             // The index[1,2,3,4] cannot be less than 0.
 
-            var length = this .length;
+            const length = this .length;
 
             if (index1 < length && index2 < length && index3 < length && index4 < length)
             {

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

@@ -308,7 +308,7 @@ function (Fields,
       {
          modelViewMatrix .translate (this .getCoord (this ._center .getValue (), center));
 
-         return modelViewMatrix .origin .abs ();
+         return modelViewMatrix .origin .magnitude ();
       },
       traverse: function (type, renderObject)
       {

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

@@ -133,18 +133,13 @@ function (Fields,
       },
       interpolate: function (index0, index1, weight)
       {
-         try
-         {
-            this .getCoord (this ._keyValue [index0] .getValue (), this .keyValue0);
-            this .getCoord (this ._keyValue [index1] .getValue (), this .keyValue1);
+         this .getCoord (this ._keyValue [index0] .getValue (), this .keyValue0);
+         this .getCoord (this ._keyValue [index1] .getValue (), this .keyValue1);
 
-            var coord = this .geocentric .slerp (this .keyValue0, this .keyValue1, weight);
+         var coord = this .geocentric .slerp (this .keyValue0, this .keyValue1, weight);
 
-            this ._geovalue_changed = this .getGeoCoord (coord, this .geovalue);
-            this ._value_changed    = coord;
-         }
-         catch (error)
-         { }
+         this ._geovalue_changed = this .getGeoCoord (coord, this .geovalue);
+         this ._value_changed    = coord;
       },
    });
 

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

@@ -119,25 +119,18 @@ function (Fields,
       },
       set_over__: function (over, hit, modelViewMatrix, projectionMatrix, viewport)
       {
-         try
-         {
-            X3DTouchSensorNode .prototype .set_over__ .call (this, over, hit, modelViewMatrix, projectionMatrix, viewport);
+         X3DTouchSensorNode .prototype .set_over__ .call (this, over, hit, modelViewMatrix, projectionMatrix, viewport);
 
-            if (this ._isOver .getValue ())
-            {
-               var intersection = hit .intersection;
+         if (this ._isOver .getValue ())
+         {
+            var intersection = hit .intersection;
 
-               invModelViewMatrix .assign (modelViewMatrix) .inverse ();
+            invModelViewMatrix .assign (modelViewMatrix) .inverse ();
 
-               this ._hitTexCoord_changed = intersection .texCoord;
-               this ._hitNormal_changed   = modelViewMatrix .multMatrixDir (intersection .normal .copy ()) .normalize ();
-               this ._hitPoint_changed    = invModelViewMatrix .multVecMatrix (intersection .point .copy ());
-               this ._hitGeoCoord_changed = this .getGeoCoord (this ._hitPoint_changed .getValue (), geoCoords);
-            }
-         }
-         catch (error)
-         {
-            console .error (error);
+            this ._hitTexCoord_changed = intersection .texCoord;
+            this ._hitNormal_changed   = modelViewMatrix .multMatrixDir (intersection .normal .copy ()) .normalize ();
+            this ._hitPoint_changed    = invModelViewMatrix .multVecMatrix (intersection .point .copy ());
+            this ._hitGeoCoord_changed = this .getGeoCoord (this ._hitPoint_changed .getValue (), geoCoords);
          }
       },
    });

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

@@ -124,26 +124,14 @@ function (Fields,
       },
       eventsProcessed: function ()
       {
-         try
-         {
-            this .setHidden (this ._scale .x === 0 ||
-                             this ._scale .y === 0 ||
-                             this ._scale .z === 0);
+         this .getLocationMatrix (this ._geoCenter .getValue (), locationMatrix);
 
-            this .getLocationMatrix (this ._geoCenter .getValue (), locationMatrix);
+         matrix .set (this ._translation      .getValue (),
+                        this ._rotation         .getValue (),
+                        this ._scale            .getValue (),
+                        this ._scaleOrientation .getValue ());
 
-            matrix .set (this ._translation      .getValue (),
-                         this ._rotation         .getValue (),
-                         this ._scale            .getValue (),
-                         this ._scaleOrientation .getValue ());
-
-            this .setMatrix (matrix .multRight (locationMatrix) .multLeft (locationMatrix .inverse ()));
-         }
-         catch (error)
-         {
-            // Should normally not happen.
-            this .setHidden (true);
-         }
+         this .setMatrix (matrix .multRight (locationMatrix) .multLeft (locationMatrix .inverse ()));
       },
    });
 

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

@@ -188,7 +188,7 @@ function (Fields,
       },
       setPosition: (function ()
       {
-         var geoPosition = new Vector3 (0, 0, 0);
+         const geoPosition = new Vector3 (0, 0, 0);
 
          return function (value)
          {
@@ -197,7 +197,7 @@ function (Fields,
       })(),
       getPosition: (function ()
       {
-         var position = new Vector3 (0, 0, 0);
+         const position = new Vector3 (0, 0, 0);
 
          return function ()
          {
@@ -206,7 +206,7 @@ function (Fields,
       })(),
       set_position__: (function ()
       {
-         var position = new Vector3 (0, 0, 0);
+         const position = new Vector3 (0, 0, 0);
 
          return function ()
          {
@@ -217,7 +217,7 @@ function (Fields,
       })(),
       setOrientation: (function ()
       {
-         var
+         const
             locationMatrix = new Matrix4 (),
             geoOrientation = new Rotation4 (0, 0, 1, 0);
 
@@ -225,7 +225,7 @@ function (Fields,
          {
             ///  Returns the resulting orientation for this viewpoint.
 
-            var rotationMatrix = this .getLocationMatrix (this ._position .getValue (), locationMatrix) .submatrix;
+            const rotationMatrix = this .getLocationMatrix (this ._position .getValue (), locationMatrix) .submatrix;
 
             geoOrientation .setMatrix (rotationMatrix);
 
@@ -234,7 +234,7 @@ function (Fields,
       })(),
       getOrientation: (function ()
       {
-         var
+         const
             locationMatrix = new Matrix4 (),
             orientation    = new Rotation4 (0, 0, 1, 0);
 
@@ -242,7 +242,7 @@ function (Fields,
          {
             ///  Returns the resulting orientation for this viewpoint.
 
-            var rotationMatrix = this .getLocationMatrix (this ._position .getValue (), locationMatrix) .submatrix;
+            const rotationMatrix = this .getLocationMatrix (this ._position .getValue (), locationMatrix) .submatrix;
 
             orientation .setMatrix (rotationMatrix);
 
@@ -251,7 +251,7 @@ function (Fields,
       })(),
       getCenterOfRotation: (function ()
       {
-         var centerOfRotation = new Vector3 (0, 0, 0);
+         const centerOfRotation = new Vector3 (0, 0, 0);
 
          return function ()
          {
@@ -260,7 +260,7 @@ function (Fields,
       })(),
       getFieldOfView: function ()
       {
-         var fov = this ._fieldOfView * this ._fieldOfViewScale;
+         const fov = this ._fieldOfView * this ._fieldOfViewScale;
 
          return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
       },
@@ -270,7 +270,7 @@ function (Fields,
       },
       getUpVector: (function ()
       {
-         var
+         const
             position = new Vector3 (0, 0, 0),
             upVector = new Vector3 (0, 0, 0);
 
@@ -285,34 +285,30 @@ function (Fields,
       {
          return (Math .max (this .elevation, 0.0) + 10) / 10 * this ._speedFactor .getValue ();
       },
-      getScreenScale: (function ()
+      getScreenScale: function (point, viewport, screenScale)
       {
-         var screenScale = new Vector3 (0, 0, 0);
+         // Returns the screen scale in meter/pixel for on pixel.
 
-         return function (point, viewport)
-         {
-            // Returns the screen scale in meter/pixel for on pixel.
+         const
+            width  = viewport [2],
+            height = viewport [3];
 
-            var
-               width  = viewport [2],
-               height = viewport [3],
-               size   = Math .abs (point .z) * Math .tan (this .getFieldOfView () / 2) * 2;
+         let 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);
+         const viewportSize = new Vector2 (0, 0);
 
          return function (viewport, nearValue)
          {
-            var
+            const
                width  = viewport [2],
                height = viewport [3],
                size   = nearValue * Math .tan (this .getFieldOfView () / 2) * 2,
@@ -326,7 +322,7 @@ function (Fields,
       })(),
       getLookAtDistance: function (bbox)
       {
-         return (bbox .size .abs () / 2) / Math .tan (this .getFieldOfView () / 2);
+         return (bbox .size .magnitude () / 2) / Math .tan (this .getFieldOfView () / 2);
       },
       getProjectionMatrixWithLimits: function (nearValue, farValue, viewport, limit)
       {
@@ -335,7 +331,7 @@ function (Fields,
 
          // Linear interpolate nearValue and farValue
 
-         var
+         const
             geoZNear = Math .max (Algorithm .lerp (Math .min (nearValue, 1e4), 1e4, this .elevation / 1e7), 1),
             geoZFar  = Math .max (Algorithm .lerp (1e6, Math .max (farValue, 1e6),  this .elevation / 1e7), 1e6);
 

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

@@ -130,42 +130,35 @@ function (X3DConstants,
       },
       set_originMatrix__: function ()
       {
-         try
+         if (this .geoOriginNode)
          {
-            if (this .geoOriginNode)
-            {
-               // Position
-               var t = this .origin;
+            // Position
+            var t = this .origin;
 
-               // Let's work out the orientation at that location in order
-               // to maintain a view where +Y is in the direction of gravitional
-               // up for that region of the planet's surface. This will be the
-               // value of the rotation matrix for the transform.
+            // Let's work out the orientation at that location in order
+            // to maintain a view where +Y is in the direction of gravitional
+            // up for that region of the planet's surface. This will be the
+            // value of the rotation matrix for the transform.
 
-               this .elevationFrame .normal (t, y);
+            this .elevationFrame .normal (t, y);
 
-               x .set (0, 0, 1) .cross (y);
+            x .set (0, 0, 1) .cross (y);
 
-               // Handle pole cases.
-               if (x .equals (Vector3 .Zero))
-                  x .set (1, 0, 0);
+            // Handle pole cases.
+            if (x .equals (Vector3 .Zero))
+               x .set (1, 0, 0);
 
-               z .assign (x) .cross (y);
+            z .assign (x) .cross (y);
 
-               x .normalize ();
-               z .normalize ();
+            x .normalize ();
+            z .normalize ();
 
-               this .originMatrix .set (x .x, x .y, x .z, 0,
-                                        y .x, y .y, y .z, 0,
-                                        z .x, z .y, z .z, 0,
-                                        t .x, t .y, t .z, 1);
+            this .originMatrix .set (x .x, x .y, x .z, 0,
+                                       y .x, y .y, y .z, 0,
+                                       z .x, z .y, z .z, 0,
+                                       t .x, t .y, t .z, 1);
 
-               this .invOriginMatrix .assign (this .originMatrix) .inverse ();
-            }
-         }
-         catch (error)
-         {
-            /// ???
+            this .invOriginMatrix .assign (this .originMatrix) .inverse ();
          }
       },
       set_rotateYUp__: function ()

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

@@ -587,18 +587,18 @@ function (X3DChildNode,
             {
                const
                   pointingDeviceSensorNodes = this .pointingDeviceSensorNodes,
-                  clipPlaneNodes            = this .clipPlaneNodes;
+                  clipPlaneNodes            = this .clipPlaneNodes,
+                  sensors                   = this .sensors;
+
+               sensors .clear ();
 
                if (pointingDeviceSensorNodes .length)
                {
-                  const sensors = this .sensors;
-
-                  sensors .clear ();
-
-                  renderObject .getBrowser () .getSensors () .push (sensors);
-
                   for (const pointingDeviceSensorNode of pointingDeviceSensorNodes)
                      pointingDeviceSensorNode .push (renderObject, sensors);
+
+                  if (sensors .size)
+                     renderObject .getBrowser () .getSensors () .push (sensors);
                }
 
                for (const clipPlaneNode of clipPlaneNodes)
@@ -610,7 +610,7 @@ function (X3DChildNode,
                for (const clipPlaneNode of clipPlaneNodes)
                   clipPlaneNode .pop (renderObject);
 
-               if (pointingDeviceSensorNodes .length)
+               if (sensors .size)
                   renderObject .getBrowser () .getSensors () .pop ();
 
                return;