x_ite 5.0.2 → 6.0.0

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/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/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;

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

@@ -79,10 +79,6 @@ function (X3DTransformMatrix3DNode,
       },
       eventsProcessed: function ()
       {
-         this .setHidden (this ._scale .x === 0 ||
-                          this ._scale .y === 0 ||
-                          this ._scale .z === 0);
-
          this .setTransform (this ._translation      .getValue (),
                              this ._rotation         .getValue (),
                              this ._scale            .getValue (),

package/src/x_ite/Components/HAnim/HAnimHumanoid.js

@@ -255,103 +255,96 @@ function (Fields,
 
          return function (type, renderObject)
          {
-            try
-            {
-               if (type !== TraverseType .CAMERA)
-                  return;
+            if (type !== TraverseType .CAMERA)
+               return;
 
-               if (! this .skinCoordNode)
-                  return;
+            if (! this .skinCoordNode)
+               return;
 
-               var
-                  jointNodes     = this .jointNodes,
-                  skinNormalNode = this .skinNormalNode,
-                  skinCoordNode  = this .skinCoordNode,
-                  restNormalNode = this .restNormalNode,
-                  restCoordNode  = this .restCoordNode;
+            var
+               jointNodes     = this .jointNodes,
+               skinNormalNode = this .skinNormalNode,
+               skinCoordNode  = this .skinCoordNode,
+               restNormalNode = this .restNormalNode,
+               restCoordNode  = this .restCoordNode;
 
-               // Reset skin normals and coords.
+            // Reset skin normals and coords.
 
-               if (skinNormalNode)
-                  skinNormalNode ._vector .assign (restNormalNode ._vector);
+            if (skinNormalNode)
+               skinNormalNode ._vector .assign (restNormalNode ._vector);
 
-               skinCoordNode ._point .assign (restCoordNode ._point);
+            skinCoordNode ._point .assign (restCoordNode ._point);
 
-               // Determine inverse model matrix of humanoid.
+            // Determine inverse model matrix of humanoid.
 
-               invModelMatrix .assign (this .transformNode .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ()) .inverse ();
+            invModelMatrix .assign (this .transformNode .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ()) .inverse ();
 
-               // Apply joint transformations.
+            // Apply joint transformations.
 
-               for (var j = 0, jointNodesLength = jointNodes .length; j < jointNodesLength; ++ j)
-               {
-                  var
-                     jointNode            = jointNodes [j],
-                     skinCoordIndexLength = jointNode ._skinCoordIndex .length;
+            for (var j = 0, jointNodesLength = jointNodes .length; j < jointNodesLength; ++ j)
+            {
+               var
+                  jointNode            = jointNodes [j],
+                  skinCoordIndexLength = jointNode ._skinCoordIndex .length;
 
-                  if (skinCoordIndexLength === 0)
-                     continue;
+               if (skinCoordIndexLength === 0)
+                  continue;
 
-                  var
-                     jointMatrix    = jointNode .getModelMatrix () .multRight (invModelMatrix),
-                     displacerNodes = jointNode .getDisplacers ();
+               var
+                  jointMatrix    = jointNode .getModelMatrix () .multRight (invModelMatrix),
+                  displacerNodes = jointNode .getDisplacers ();
 
-                  for (var d = 0, displacerNodesLength = displacerNodes .length; d < displacerNodesLength; ++ d)
+               for (var d = 0, displacerNodesLength = displacerNodes .length; d < displacerNodesLength; ++ d)
+               {
+                  var
+                     displacerNode       = displacerNodes [d],
+                     coordIndex          = displacerNode ._coordIndex .getValue (),
+                     coordIndexLength    = displacerNode ._coordIndex .length,
+                     weight              = displacerNode ._weight .getValue (),
+                     displacements       = displacerNode ._displacements .getValue (),
+                     displacementsLength = displacerNode ._displacements .length;
+
+                  for (var i = 0; i < coordIndexLength; ++ i)
                   {
                      var
-                        displacerNode       = displacerNodes [d],
-                        coordIndex          = displacerNode ._coordIndex .getValue (),
-                        coordIndexLength    = displacerNode ._coordIndex .length,
-                        weight              = displacerNode ._weight .getValue (),
-                        displacements       = displacerNode ._displacements .getValue (),
-                        displacementsLength = displacerNode ._displacements .length;
-
-                     for (var i = 0; i < coordIndexLength; ++ i)
-                     {
-                        var
-                           i3           = i * 3,
-                           index        = coordIndex [i],
-                           displacement = i < displacementsLength ? point .set (displacements [i3], displacements [i3 + 1], displacements [i3 + 2]) : point .assign (Vector3 .Zero);
-
-                        skinCoordNode .get1Point (index, skin);
-                        jointMatrix .multDirMatrix (displacement) .multiply (weight) .add (skin);
-                        skinCoordNode .set1Point (index, displacement);
-                     }
+                        i3           = i * 3,
+                        index        = coordIndex [i],
+                        displacement = i < displacementsLength ? point .set (displacements [i3], displacements [i3 + 1], displacements [i3 + 2]) : point .assign (Vector3 .Zero);
+
+                     skinCoordNode .get1Point (index, skin);
+                     jointMatrix .multDirMatrix (displacement) .multiply (weight) .add (skin);
+                     skinCoordNode .set1Point (index, displacement);
                   }
+               }
 
+               var
+                  normalMatrix          = skinNormalNode ? jointMatrix .submatrix .transpose () .inverse () : null,
+                  skinCoordIndex        = jointNode ._skinCoordIndex .getValue (),
+                  skinCoordWeight       = jointNode ._skinCoordWeight .getValue (),
+                  skinCoordWeightLength = jointNode ._skinCoordWeight .length;
+
+               for (var i = 0; i < skinCoordIndexLength; ++ i)
+               {
                   var
-                     normalMatrix          = skinNormalNode ? jointMatrix .submatrix .transpose () .inverse () : null,
-                     skinCoordIndex        = jointNode ._skinCoordIndex .getValue (),
-                     skinCoordWeight       = jointNode ._skinCoordWeight .getValue (),
-                     skinCoordWeightLength = jointNode ._skinCoordWeight .length;
+                     index  = skinCoordIndex [i],
+                     weight = i < skinCoordWeightLength ? skinCoordWeight [i] : 1;
 
-                  for (var i = 0; i < skinCoordIndexLength; ++ i)
+                  if (skinNormalNode)
                   {
-                     var
-                        index  = skinCoordIndex [i],
-                        weight = i < skinCoordWeightLength ? skinCoordWeight [i] : 1;
-
-                     if (skinNormalNode)
-                     {
-                        rest .assign (restNormalNode .get1Vector (index, vector));
-                        skinNormalNode .get1Vector (index, skin);
-                        normalMatrix .multVecMatrix (vector) .subtract (rest) .multiply (weight) .add (skin);
-                        skinNormalNode .set1Vector (index, vector);
-                        // Should the normals be normalzed at end, or let it the shader do?
-                     }
-
-                     //skin += (rest * J - rest) * weight
-                     rest .assign (restCoordNode .get1Point (index, point));
-                     skinCoordNode .get1Point (index, skin);
-                     jointMatrix .multVecMatrix (point) .subtract (rest) .multiply (weight) .add (skin);
-                     skinCoordNode .set1Point (index, point);
+                     rest .assign (restNormalNode .get1Vector (index, vector));
+                     skinNormalNode .get1Vector (index, skin);
+                     normalMatrix .multVecMatrix (vector) .subtract (rest) .multiply (weight) .add (skin);
+                     skinNormalNode .set1Vector (index, vector);
+                     // Should the normals be normalized at end, or let it the shader do?
                   }
+
+                  //skin += (rest * J - rest) * weight
+                  rest .assign (restCoordNode .get1Point (index, point));
+                  skinCoordNode .get1Point (index, skin);
+                  jointMatrix .multVecMatrix (point) .subtract (rest) .multiply (weight) .add (skin);
+                  skinCoordNode .set1Point (index, point);
                }
             }
-            catch (error)
-            {
-               console .error (error);
-            }
          };
       })(),
    });

package/src/x_ite/Components/Interpolation/OrientationInterpolator.js

@@ -119,18 +119,11 @@ function (Fields,
 
          return function (index0, index1, weight)
          {
-            try
-            {
-               // Both values can change in slerp.
-               keyValue0 .assign (this ._keyValue [index0] .getValue ());
-               keyValue1 .assign (this ._keyValue [index1] .getValue ());
+            // Both values can change in slerp.
+            keyValue0 .assign (this ._keyValue [index0] .getValue ());
+            keyValue1 .assign (this ._keyValue [index1] .getValue ());
 
-               this ._value_changed = keyValue0 .slerp (keyValue1, weight);
-            }
-            catch (error)
-            {
-               //console .error (error);
-            }
+            this ._value_changed = keyValue0 .slerp (keyValue1, weight);
          };
       }) (),
    });

package/src/x_ite/Components/Interpolation/X3DInterpolatorNode.js

@@ -107,7 +107,7 @@ function (X3DChildNode,
                if (fraction <= key [0])
                   return this .interpolate (0, 1, 0);
 
-               const index1 = Algorithm .upperBound (key, 0, length, fraction, Algorithm .less);
+               const index1 = Algorithm .upperBound (key, 0, length, fraction);
 
                if (index1 !== length)
                {

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

@@ -131,15 +131,10 @@ function (Fields,
       },
       getMatrix: function ()
       {
-         try
-         {
-            if (this .layoutNode)
-               this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
-            else
-               this .matrix .identity ();
-         }
-         catch (error)
-         { }
+         if (this .layoutNode)
+            this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
+         else
+            this .matrix .identity ();
 
          return this .matrix;
       },

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

@@ -104,7 +104,7 @@ function (Fields,
       },
       getScale: function ()
       {
-         return this ._pointSize .getValue () * this .getBrowser () .getPointSize ();
+         return this ._pointSize .getValue () * this .getBrowser () .getPixelPerPoint ();
       },
    });
 

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

@@ -169,31 +169,26 @@ function (Fields,
       })(),
       traverse: function (type, renderObject)
       {
-         try
+         switch (type)
          {
-            switch (type)
-            {
-               case TraverseType .CAMERA:
-               case TraverseType .PICKING:
-               case TraverseType .SHADOW: // ???
-                  // No clone support for shadow, generated cube map texture and bbox
-                  break;
-               default:
-                  this .scale (renderObject);
-                  break;
-            }
-
-            var modelViewMatrix = renderObject .getModelViewMatrix ();
-
-            modelViewMatrix .push ();
-            modelViewMatrix .multLeft (this .matrix);
-
-            X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
-
-            modelViewMatrix .pop ();
+            case TraverseType .CAMERA:
+            case TraverseType .PICKING:
+            case TraverseType .SHADOW: // ???
+               // No clone support for shadow, generated cube map texture and bbox
+               break;
+            default:
+               this .scale (renderObject);
+               break;
          }
-         catch (error)
-         { }
+
+         var modelViewMatrix = renderObject .getModelViewMatrix ();
+
+         modelViewMatrix .push ();
+         modelViewMatrix .multLeft (this .matrix);
+
+         X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
+
+         modelViewMatrix .pop ();
       },
    });