x_ite 5.0.3 → 6.1.0

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

@@ -128,14 +128,7 @@ function (Fields,
          this .lightNode = lightNode;
          this .groupNode = groupNode;
 
-         try
-         {
-            this .matrixArray .set (modelViewMatrix .submatrix .inverse ());
-         }
-         catch (error)
-         {
-            this .matrixArray .set (Matrix3 .Identity);
-         }
+         this .matrixArray .set (modelViewMatrix .submatrix .inverse ());
 
          this .modelViewMatrix .pushMatrix (modelViewMatrix);
 
@@ -151,56 +144,48 @@ function (Fields,
       },
       renderShadowMap: function (renderObject)
       {
-         try
-         {
-            if (! this .shadowBuffer)
-               return;
+         if (! this .shadowBuffer)
+            return;
 
-            const
-               lightNode            = this .lightNode,
-               cameraSpaceMatrix    = renderObject .getCameraSpaceMatrix () .get (),
-               modelMatrix          = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
-               invLightSpaceMatrix  = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
+         const
+            lightNode            = this .lightNode,
+            cameraSpaceMatrix    = renderObject .getCameraSpaceMatrix () .get (),
+            modelMatrix          = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
+            invLightSpaceMatrix  = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
 
-            invLightSpaceMatrix .translate (lightNode .getLocation ());
-            invLightSpaceMatrix .rotate (this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (lightNode .getDirection ()) .negate ()));
-            invLightSpaceMatrix .inverse ();
+         invLightSpaceMatrix .translate (lightNode .getLocation ());
+         invLightSpaceMatrix .rotate (this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (lightNode .getDirection ()) .negate ()));
+         invLightSpaceMatrix .inverse ();
 
-            const
-               groupBBox        = this .groupNode .getSubBBox (this .bbox, true),                 // Group bbox.
-               lightBBox        = groupBBox .multRight (invLightSpaceMatrix),                     // Group bbox from the perspective of the light.
-               lightBBoxExtents = lightBBox .getExtents (this .lightBBoxMin, this .lightBBoxMax), // Result not used, but arguments.
-               shadowMapSize    = lightNode .getShadowMapSize (),
-               farValue         = Math .min (lightNode .getRadius (), -this .lightBBoxMin .z),
-               viewport         = this .viewport .set (0, 0, shadowMapSize, shadowMapSize),
-               projectionMatrix = Camera .perspective (lightNode .getCutOffAngle () * 2, 0.125, Math .max (10000, farValue), shadowMapSize, shadowMapSize, this .projectionMatrix); // Use higher far value for better precision.
+         const
+            groupBBox        = this .groupNode .getSubBBox (this .bbox, true),                 // Group bbox.
+            lightBBox        = groupBBox .multRight (invLightSpaceMatrix),                     // Group bbox from the perspective of the light.
+            lightBBoxExtents = lightBBox .getExtents (this .lightBBoxMin, this .lightBBoxMax), // Result not used, but arguments.
+            shadowMapSize    = lightNode .getShadowMapSize (),
+            farValue         = Math .min (lightNode .getRadius (), -this .lightBBoxMin .z),
+            viewport         = this .viewport .set (0, 0, shadowMapSize, shadowMapSize),
+            projectionMatrix = Camera .perspective (lightNode .getCutOffAngle () * 2, 0.125, Math .max (10000, farValue), shadowMapSize, shadowMapSize, this .projectionMatrix); // Use higher far value for better precision.
 
-            this .renderShadow = farValue > 0;
+         this .renderShadow = farValue > 0;
 
-            this .shadowBuffer .bind ();
+         this .shadowBuffer .bind ();
 
-            renderObject .getViewVolumes      () .push (this .viewVolume .set (projectionMatrix, viewport, viewport));
-            renderObject .getProjectionMatrix () .pushMatrix (projectionMatrix);
-            renderObject .getModelViewMatrix  () .pushMatrix (invLightSpaceMatrix);
+         renderObject .getViewVolumes      () .push (this .viewVolume .set (projectionMatrix, viewport, viewport));
+         renderObject .getProjectionMatrix () .pushMatrix (projectionMatrix);
+         renderObject .getModelViewMatrix  () .pushMatrix (invLightSpaceMatrix);
 
-            renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
+         renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
 
-            renderObject .getModelViewMatrix  () .pop ();
-            renderObject .getProjectionMatrix () .pop ();
-            renderObject .getViewVolumes      () .pop ();
+         renderObject .getModelViewMatrix  () .pop ();
+         renderObject .getProjectionMatrix () .pop ();
+         renderObject .getViewVolumes      () .pop ();
 
-            this .shadowBuffer .unbind ();
+         this .shadowBuffer .unbind ();
 
-            if (! lightNode .getGlobal ())
-               invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
+         if (! lightNode .getGlobal ())
+            invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
-            this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix) .multRight (projectionMatrix) .multRight (lightNode .getBiasMatrix ());
-         }
-         catch (error)
-         {
-            // Catch error from matrix inverse.
-            console .error (error);
-         }
+         this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix) .multRight (projectionMatrix) .multRight (lightNode .getBiasMatrix ());
       },
       setGlobalVariables: function (renderObject)
       {
@@ -260,7 +245,7 @@ function (Fields,
             {
                gl .activeTexture (gl .TEXTURE0 + this .textureUnit);
 
-               if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
+               if (gl .getVersion () >= 2 || gl .getExtension ("WEBGL_depth_texture"))
                   gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getDepthTexture ());
                else
                   gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getColorTexture ());

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

@@ -70,17 +70,6 @@ function (Fields,
 {
 "use strict";
 
-   const
-      inverseModelViewMatrix = new Matrix4 (),
-      yAxis                  = new Vector3 (0, 1, 0),
-      zAxis                  = new Vector3 (0, 0, 1),
-      viewerYAxis            = new Vector3 (0, 0, 0),
-      x                      = new Vector3 (0, 0, 0),
-      y                      = new Vector3 (0, 0, 0),
-      N1                     = new Vector3 (0, 0, 0),
-      N2                     = new Vector3 (0, 0, 0),
-      rotation               = new Rotation4 (0, 0, 1, 0);
-
    function Billboard (executionContext)
    {
       X3DGroupingNode .call (this, executionContext);
@@ -124,70 +113,74 @@ function (Fields,
       {
          return this .matrix;
       },
-      rotate: function (modelViewMatrix)
+      rotate: (function ()
       {
-         // throws domain error
+         const
+            inverseModelViewMatrix = new Matrix4 (),
+            viewerYAxis            = new Vector3 (0, 0, 0),
+            y                      = new Vector3 (0, 0, 0),
+            N1                     = new Vector3 (0, 0, 0),
+            N2                     = new Vector3 (0, 0, 0),
+            rotation               = new Rotation4 (0, 0, 1, 0);
+
+         return function (modelViewMatrix)
+         {
+            // throws domain error
 
-         inverseModelViewMatrix .assign (modelViewMatrix) .inverse ();
+            inverseModelViewMatrix .assign (modelViewMatrix) .inverse ();
 
-         const billboardToViewer = inverseModelViewMatrix .origin .normalize (); // Normalized to get work with Geo
+            const billboardToViewer = inverseModelViewMatrix .origin .normalize (); // Normalized to get work with Geo
 
-         if (this ._axisOfRotation .getValue () .equals (Vector3 .Zero))
-         {
-            inverseModelViewMatrix .multDirMatrix (viewerYAxis .assign (yAxis)) .normalize (); // Normalized to get work with Geo
+            if (this ._axisOfRotation .getValue () .equals (Vector3 .Zero))
+            {
+               inverseModelViewMatrix .multDirMatrix (viewerYAxis .assign (Vector3 .yAxis)) .normalize (); // Normalized to get work with Geo
 
-            x .assign (viewerYAxis) .cross (billboardToViewer);
-            y .assign (billboardToViewer) .cross (x);
-            const z = billboardToViewer;
+               const x = viewerYAxis .cross (billboardToViewer);
+               y .assign (billboardToViewer) .cross (x);
+               const z = billboardToViewer;
 
-            // Compose rotation
+               // Compose rotation
 
-            x .normalize ();
-            y .normalize ();
+               x .normalize ();
+               y .normalize ();
 
-            this .matrix .set (x [0], x [1], x [2], 0,
-                               y [0], y [1], y [2], 0,
-                               z [0], z [1], z [2], 0,
-                               0,     0,     0,     1);
-         }
-         else
-         {
-            N1 .assign (this ._axisOfRotation .getValue ()) .cross (billboardToViewer); // Normal vector of plane as in specification
-            N2 .assign (this ._axisOfRotation .getValue ()) .cross (zAxis);             // Normal vector of plane between axisOfRotation and zAxis
+               this .matrix .set (x .x, x .y, x .z, 0,
+                                  y .x, y .y, y .z, 0,
+                                  z .x, z .y, z .z, 0,
+                                  0,    0,    0,    1);
+            }
+            else
+            {
+               N1 .assign (this ._axisOfRotation .getValue ()) .cross (billboardToViewer); // Normal vector of plane as in specification
+               N2 .assign (this ._axisOfRotation .getValue ()) .cross (Vector3 .zAxis);    // Normal vector of plane between axisOfRotation and zAxis
 
-            this .matrix .setRotation (rotation .setFromToVec (N2, N1));                // Rotate zAxis in plane
-         }
+               this .matrix .setRotation (rotation .setFromToVec (N2, N1));                // Rotate zAxis in plane
+            }
 
-         return this .matrix;
-      },
+            return this .matrix;
+         };
+      })(),
       traverse: function (type, renderObject)
       {
          const modelViewMatrix = renderObject .getModelViewMatrix ();
 
          modelViewMatrix .push ();
 
-         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
-                  modelViewMatrix .multLeft (this .matrix);
-                  break;
-               default:
-                  modelViewMatrix .multLeft (this .rotate (modelViewMatrix .get ()));
-                  break;
-            }
-
-            X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
-         }
-         catch (error)
-         {
-            console .error (error);
+            case TraverseType .CAMERA:
+            case TraverseType .PICKING:
+            case TraverseType .SHADOW:
+               // No clone support for shadow, generated cube map texture, and bbox
+               modelViewMatrix .multLeft (this .matrix);
+               break;
+            default:
+               modelViewMatrix .multLeft (this .rotate (modelViewMatrix .get ()));
+               break;
          }
 
+         X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
+
          modelViewMatrix .pop ();
       },
    });

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

@@ -266,9 +266,9 @@ function (Fields,
                }
             }
 
-            const distance = modelViewMatrix .translate (this ._center .getValue ()) .origin .abs ();
+            const distance = modelViewMatrix .translate (this ._center .getValue ()) .origin .magnitude ();
 
-            return Algorithm .upperBound (this ._range, 0, this ._range .length, distance, Algorithm .less);
+            return Algorithm .upperBound (this ._range, 0, this ._range .length, distance);
          };
       })(),
       traverse: (function ()

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

@@ -157,7 +157,7 @@ function (Fields,
       },
       set_fieldOfView__: function ()
       {
-         var
+         const
             length           = this ._fieldOfView .length,
             fieldOfViewScale = this ._fieldOfViewScale .getValue ();
 
@@ -245,38 +245,35 @@ function (Fields,
       {
          return 1e5;
       },
-      getScreenScale: (function ()
+      getScreenScale: function (point, viewport, screenScale)
       {
-         var screenScale = new Vector3 (0, 0, 0);
+         const
+            width  = viewport [2],
+            height = viewport [3],
+            sizeX  = this .sizeX,
+            sizeY  = this .sizeY,
+            aspect = width / height;
 
-         return function (point, viewport)
+         if (aspect > sizeX / sizeY)
          {
-            var
-               width  = viewport [2],
-               height = viewport [3],
-               sizeX  = this .sizeX,
-               sizeY  = this .sizeY,
-               aspect = width / height;
-
-            if (aspect > sizeX / sizeY)
-            {
-               var s = sizeY / height;
+            const s = sizeY / height;
 
-               return screenScale .set (s, s, s);
-            }
-
-            var s = sizeX / width;
+            return screenScale .set (s, s, s);
+         }
+         else
+         {
+            const s = sizeX / width;
 
             return screenScale .set (s, s, s);
-         };
-      })(),
+         }
+      },
       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],
                sizeX  = this .sizeX,
@@ -291,11 +288,11 @@ function (Fields,
       })(),
       getLookAtDistance: function (bbox)
       {
-         return bbox .size .abs () / 2 + 10;
+         return bbox .size .magnitude () / 2 + 10;
       },
       getProjectionMatrixWithLimits: function (nearValue, farValue, viewport)
       {
-         var
+         const
             width  = viewport [2],
             height = viewport [3],
             aspect = width / height,
@@ -304,18 +301,20 @@ function (Fields,
 
          if (aspect > sizeX / sizeY)
          {
-            var
+            const
                center  = (this .minimumX + this .maximumX) / 2,
                size1_2 = (sizeY * aspect) / 2;
 
             return Camera .ortho (center - size1_2, center + size1_2, this .minimumY, this .maximumY, nearValue, farValue, this .projectionMatrix);
          }
+         else
+         {
+            const
+               center  = (this .minimumY + this .maximumY) / 2,
+               size1_2 = (sizeX / aspect) / 2;
 
-         var
-            center  = (this .minimumY + this .maximumY) / 2,
-            size1_2 = (sizeX / aspect) / 2;
-
-         return Camera .ortho (this .minimumX, this .maximumX, center - size1_2, center + size1_2, nearValue, farValue, this .projectionMatrix);
+            return Camera .ortho (this .minimumX, this .maximumX, center - size1_2, center + size1_2, nearValue, farValue, this .projectionMatrix);
+         }
       },
    });
 

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

@@ -143,40 +143,36 @@ function (Fields,
       },
       getFieldOfView: function ()
       {
-         var fov = this ._fieldOfView .getValue () * this ._fieldOfViewScale .getValue ();
+         const fov = this ._fieldOfView .getValue () * this ._fieldOfViewScale .getValue ();
 
          return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
       },
-      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)
          {
             // Returns viewport size in meters.
 
-            var
+            const
                width  = viewport [2],
                height = viewport [3],
                size   = nearValue * Math .tan (this .getFieldOfView () / 2) * 2,
@@ -190,7 +186,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)
       {