x_ite 5.0.2 → 6.0.0

package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorParallel.js

@@ -105,66 +105,59 @@ function (Fields,
       },
       setGlobalVariables: function (renderObject)
       {
-         try
-         {
-            var
-               textureProjectorNode  = this .textureProjectorNode,
-               cameraSpaceMatrix     = renderObject .getCameraSpaceMatrix () .get (),
-               modelMatrix           = this .modelMatrix .assign (this .modelViewMatrix) .multRight (cameraSpaceMatrix),
-               invTextureSpaceMatrix = this .invTextureSpaceMatrix .assign (textureProjectorNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
+         var
+            textureProjectorNode  = this .textureProjectorNode,
+            cameraSpaceMatrix     = renderObject .getCameraSpaceMatrix () .get (),
+            modelMatrix           = this .modelMatrix .assign (this .modelViewMatrix) .multRight (cameraSpaceMatrix),
+            invTextureSpaceMatrix = this .invTextureSpaceMatrix .assign (textureProjectorNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
 
-            this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (textureProjectorNode .getDirection ()) .negate ());
-            textureProjectorNode .straightenHorizon (this .rotation);
+         this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (textureProjectorNode .getDirection ()) .negate ());
+         textureProjectorNode .straightenHorizon (this .rotation);
 
-            invTextureSpaceMatrix .translate (textureProjectorNode .getLocation ());
-            invTextureSpaceMatrix .rotate (this .rotation);
-            invTextureSpaceMatrix .inverse ();
+         invTextureSpaceMatrix .translate (textureProjectorNode .getLocation ());
+         invTextureSpaceMatrix .rotate (this .rotation);
+         invTextureSpaceMatrix .inverse ();
 
-            var
-               width        = textureProjectorNode .getTexture () .getWidth (),
-               height       = textureProjectorNode .getTexture () .getHeight (),
-               aspect       = width / height,
-               minimumX     = textureProjectorNode .getMinimumX (),
-               maximumX     = textureProjectorNode .getMaximumX (),
-               minimumY     = textureProjectorNode .getMinimumY (),
-               maximumY     = textureProjectorNode .getMaximumY (),
-               sizeX        = textureProjectorNode .getSizeX (),
-               sizeY        = textureProjectorNode .getSizeY (),
-               nearDistance = textureProjectorNode .getNearDistance (),
-               farDistance  = textureProjectorNode .getFarDistance ();
+         var
+            width        = textureProjectorNode .getTexture () .getWidth (),
+            height       = textureProjectorNode .getTexture () .getHeight (),
+            aspect       = width / height,
+            minimumX     = textureProjectorNode .getMinimumX (),
+            maximumX     = textureProjectorNode .getMaximumX (),
+            minimumY     = textureProjectorNode .getMinimumY (),
+            maximumY     = textureProjectorNode .getMaximumY (),
+            sizeX        = textureProjectorNode .getSizeX (),
+            sizeY        = textureProjectorNode .getSizeY (),
+            nearDistance = textureProjectorNode .getNearDistance (),
+            farDistance  = textureProjectorNode .getFarDistance ();
 
-            if (aspect > sizeX / sizeY)
-            {
-               var
-                  center  = (minimumX + maximumX) / 2,
-                  size1_2 = (sizeY * aspect) / 2;
+         if (aspect > sizeX / sizeY)
+         {
+            var
+               center  = (minimumX + maximumX) / 2,
+               size1_2 = (sizeY * aspect) / 2;
 
-               Camera .ortho (center - size1_2, center + size1_2, minimumY, maximumY, nearDistance, farDistance, this .projectionMatrix);
-            }
-            else
-            {
-               var
-                  center  = (minimumY + maximumY) / 2,
-                  size1_2 = (sizeX / aspect) / 2;
+            Camera .ortho (center - size1_2, center + size1_2, minimumY, maximumY, nearDistance, farDistance, this .projectionMatrix);
+         }
+         else
+         {
+            var
+               center  = (minimumY + maximumY) / 2,
+               size1_2 = (sizeX / aspect) / 2;
 
-               Camera .ortho (minimumX, maximumX, center - size1_2, center + size1_2, nearDistance, farDistance, this .projectionMatrix);
-            }
+            Camera .ortho (minimumX, maximumX, center - size1_2, center + size1_2, nearDistance, farDistance, this .projectionMatrix);
+         }
 
-            if (! textureProjectorNode .getGlobal ())
-               invTextureSpaceMatrix .multLeft (modelMatrix .inverse ());
+         if (! textureProjectorNode .getGlobal ())
+            invTextureSpaceMatrix .multLeft (modelMatrix .inverse ());
 
-            this .invTextureSpaceProjectionMatrix .assign (invTextureSpaceMatrix) .multRight (this .projectionMatrix) .multRight (textureProjectorNode .getBiasMatrix ());
+         this .invTextureSpaceProjectionMatrix .assign (invTextureSpaceMatrix) .multRight (this .projectionMatrix) .multRight (textureProjectorNode .getBiasMatrix ());
 
-            this .projectiveTextureMatrix .assign (cameraSpaceMatrix) .multRight (this .invTextureSpaceProjectionMatrix);
-            this .projectiveTextureMatrixArray .set (this .projectiveTextureMatrix);
+         this .projectiveTextureMatrix .assign (cameraSpaceMatrix) .multRight (this .invTextureSpaceProjectionMatrix);
+         this .projectiveTextureMatrixArray .set (this .projectiveTextureMatrix);
 
-            this .modelViewMatrix .multVecMatrix (this .location .assign (textureProjectorNode ._location .getValue ()));
-            this .locationArray .set (this .location);
-         }
-         catch (error)
-         {
-            console .error (error);
-         }
+         this .modelViewMatrix .multVecMatrix (this .location .assign (textureProjectorNode ._location .getValue ()));
+         this .locationArray .set (this .location);
       },
       setShaderUniforms: function (gl, shaderObject, renderObject)
       {

package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorPerspective.js

@@ -105,45 +105,38 @@ function (Fields,
       },
       setGlobalVariables: function (renderObject)
       {
-         try
-         {
-            var
-               textureProjectorNode  = this .textureProjectorNode,
-               cameraSpaceMatrix     = renderObject .getCameraSpaceMatrix () .get (),
-               modelMatrix           = this .modelMatrix .assign (this .modelViewMatrix) .multRight (cameraSpaceMatrix),
-               invTextureSpaceMatrix = this .invTextureSpaceMatrix .assign (textureProjectorNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
-
-            this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (textureProjectorNode .getDirection ()) .negate ());
-            textureProjectorNode .straightenHorizon (this .rotation);
-
-            invTextureSpaceMatrix .translate (textureProjectorNode .getLocation ());
-            invTextureSpaceMatrix .rotate (this .rotation);
-            invTextureSpaceMatrix .inverse ();
-
-            var
-               width            = textureProjectorNode .getTexture () .getWidth (),
-               height           = textureProjectorNode .getTexture () .getHeight (),
-               nearDistance     = textureProjectorNode .getNearDistance (),
-               farDistance      = textureProjectorNode .getFarDistance (),
-               fieldOfView      = textureProjectorNode .getFieldOfView ();
-
-            Camera .perspective (fieldOfView, nearDistance, farDistance, width, height, this .projectionMatrix);
-
-            if (! textureProjectorNode .getGlobal ())
-               invTextureSpaceMatrix .multLeft (modelMatrix .inverse ());
-
-            this .invTextureSpaceProjectionMatrix .assign (invTextureSpaceMatrix) .multRight (this .projectionMatrix) .multRight (textureProjectorNode .getBiasMatrix ());
-
-            this .projectiveTextureMatrix .assign (cameraSpaceMatrix) .multRight (this .invTextureSpaceProjectionMatrix);
-            this .projectiveTextureMatrixArray .set (this .projectiveTextureMatrix);
-
-            this .modelViewMatrix .multVecMatrix (this .location .assign (textureProjectorNode ._location .getValue ()));
-            this .locationArray .set (this .location);
-         }
-         catch (error)
-         {
-            console .error (error);
-         }
+         var
+            textureProjectorNode  = this .textureProjectorNode,
+            cameraSpaceMatrix     = renderObject .getCameraSpaceMatrix () .get (),
+            modelMatrix           = this .modelMatrix .assign (this .modelViewMatrix) .multRight (cameraSpaceMatrix),
+            invTextureSpaceMatrix = this .invTextureSpaceMatrix .assign (textureProjectorNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
+
+         this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (textureProjectorNode .getDirection ()) .negate ());
+         textureProjectorNode .straightenHorizon (this .rotation);
+
+         invTextureSpaceMatrix .translate (textureProjectorNode .getLocation ());
+         invTextureSpaceMatrix .rotate (this .rotation);
+         invTextureSpaceMatrix .inverse ();
+
+         var
+            width            = textureProjectorNode .getTexture () .getWidth (),
+            height           = textureProjectorNode .getTexture () .getHeight (),
+            nearDistance     = textureProjectorNode .getNearDistance (),
+            farDistance      = textureProjectorNode .getFarDistance (),
+            fieldOfView      = textureProjectorNode .getFieldOfView ();
+
+         Camera .perspective (fieldOfView, nearDistance, farDistance, width, height, this .projectionMatrix);
+
+         if (! textureProjectorNode .getGlobal ())
+            invTextureSpaceMatrix .multLeft (modelMatrix .inverse ());
+
+         this .invTextureSpaceProjectionMatrix .assign (invTextureSpaceMatrix) .multRight (this .projectionMatrix) .multRight (textureProjectorNode .getBiasMatrix ());
+
+         this .projectiveTextureMatrix .assign (cameraSpaceMatrix) .multRight (this .invTextureSpaceProjectionMatrix);
+         this .projectiveTextureMatrixArray .set (this .projectiveTextureMatrix);
+
+         this .modelViewMatrix .multVecMatrix (this .location .assign (textureProjectorNode ._location .getValue ()));
+         this .locationArray .set (this .location);
       },
       setShaderUniforms: function (gl, shaderObject, renderObject)
       {

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

@@ -90,18 +90,10 @@ function (Fields,
             plane      = this .plane,
             localPlane = clipPlane .plane;
 
-         try
-         {
-            plane .normal .assign (localPlane);
-            plane .distanceFromOrigin = -localPlane .w;
+         plane .normal .assign (localPlane);
+         plane .distanceFromOrigin = -localPlane .w;
 
-            plane .multRight (modelViewMatrix);
-         }
-         catch (error)
-         {
-            plane .normal .set (0, 0, 0);
-            plane .distanceFromOrigin = 0;
-         }
+         plane .multRight (modelViewMatrix);
       },
       setShaderUniforms: function (gl, shaderObject)
       {

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

@@ -53,14 +53,12 @@
    "x_ite/Base/FieldDefinitionArray",
    "x_ite/Components/Rendering/X3DColorNode",
    "x_ite/Base/X3DConstants",
-   "standard/Math/Numbers/Vector4",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DColorNode,
-          X3DConstants,
-          Vector4)
+          X3DConstants)
 {
 "use strict";
 
@@ -90,19 +88,6 @@ function (Fields,
       {
          return "color";
       },
-      initialize: function ()
-      {
-         X3DColorNode .prototype .initialize .call (this);
-
-         this ._color .addInterest ("set_color__", this);
-
-         this .set_color__ ();
-      },
-      set_color__: function ()
-      {
-         this .color  = this ._color .getValue ();
-         this .length = this ._color .length;
-      },
       addColor: function (index, array)
       {
          if (index >= 0 && index < this .length)
@@ -132,37 +117,27 @@ function (Fields,
          {
             const color = this .color;
 
-            for (var index = 0, length = this .length * 3; index < length; index += 3)
+            for (var index = 0, length = Math .min (min, this .length) * 3; index < length; index += 3)
                array .push (color [index], color [index + 1], color [index + 2], 1);
 
-            var index = (this .length - 1) * 3;
+            if (this .length < min)
+            {
+               var index = (this .length - 1) * 3;
 
-            const
-               r = color [index],
-               g = color [index + 1],
-               b = color [index + 2];
+               const
+                  r = color [index],
+                  g = color [index + 1],
+                  b = color [index + 2];
 
-            for (var index = length, length = min * 3; index < length; index += 3)
-               array .push (r, g, b, 1);
+               for (var index = length, length = min * 3; index < length; index += 3)
+                  array .push (r, g, b, 1);
+            }
          }
          else
          {
             for (let index = 0; index < min; ++ index)
                array .push (1, 1, 1, 1);
          }
-      },
-      getVectors: function (array)
-      {
-         const color = this ._color;
-
-         for (var i = 0, length = color .length; i < length; ++ i)
-         {
-            const c = color [i];
-
-            array [i] = new Vector4 (c .r, c .g, c .b, 1);
-         }
-
-         array .length = length;
 
          return array;
       },

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

@@ -53,14 +53,12 @@ define ([
    "x_ite/Base/FieldDefinitionArray",
    "x_ite/Components/Rendering/X3DColorNode",
    "x_ite/Base/X3DConstants",
-   "standard/Math/Numbers/Vector4",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DColorNode,
-          X3DConstants,
-          Vector4)
+          X3DConstants)
 {
 "use strict";
 
@@ -92,19 +90,6 @@ function (Fields,
       {
          return "color";
       },
-      initialize: function ()
-      {
-         X3DColorNode .prototype .initialize .call (this);
-
-         this ._color .addInterest ("set_color__", this);
-
-         this .set_color__ ();
-      },
-      set_color__: function ()
-      {
-         this .color  = this ._color .getValue ();
-         this .length = this ._color .length;
-      },
       addColor: function (index, array)
       {
          if (index >= 0 && index < this .length)
@@ -134,38 +119,28 @@ function (Fields,
          {
             const color = this .color;
 
-            for (var index = 0, length = this .length * 4; index < length; index += 4)
+            for (var index = 0, length = Math .min (min, this .length) * 4; index < length; index += 4)
                array .push (color [index], color [index + 1], color [index + 2], color [index + 3]);
 
-            var index = (this .length - 1) * 4;
+            if (this .length < min)
+            {
+               var index = (this .length - 1) * 4;
 
-            const
-               r = color [index],
-               g = color [index + 1],
-               b = color [index + 2],
-               a = color [index + 2];
+               const
+                  r = color [index],
+                  g = color [index + 1],
+                  b = color [index + 2],
+                  a = color [index + 2];
 
-            for (var index = length, length = min * 4; index < length; index += 4)
-               array .push (r, g, b, a);
+               for (var index = length, length = min * 4; index < length; index += 4)
+                  array .push (r, g, b, a);
+            }
          }
          else
          {
             for (let index = 0; index < min; ++ index)
                array .push (1, 1, 1, 1);
          }
-      },
-      getVectors: function (array)
-      {
-         const color = this ._color;
-
-         for (var i = 0, length = color .length; i < length; ++ i)
-         {
-            const c = color [i];
-
-            array [i] = new Vector4 (c .r, c .g, c .b, c .a);
-         }
-
-         array .length = length;
 
          return array;
       },

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

@@ -123,7 +123,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;
 
@@ -136,7 +139,12 @@ function (Fields,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -242,8 +250,8 @@ function (Fields,
             polylines      = this .getPolylineIndices (),
             colorPerVertex = this ._colorPerVertex .getValue (),
             attribNodes    = this .getAttrib (),
-            numAttrib      = attribNodes .length,
-            attribs        = this .getAttribs (),
+            numAttribNodes = attribNodes .length,
+            attribArrays   = this .getAttribs (),
             fogCoordNode   = this .fogCoordNode,
             colorNode      = this .colorNode,
             coordNode      = this .coordNode,
@@ -269,8 +277,8 @@ function (Fields,
                         i     = polyline [l],
                         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/Rendering/LineSet.js

@@ -117,7 +117,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;
 
@@ -130,7 +133,12 @@ function (Fields,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -184,17 +192,17 @@ function (Fields,
          // Fill GeometryNode
 
          const
-            vertexCount   = this ._vertexCount,
-            attribNodes   = this .getAttrib (),
-            numAttrib     = attribNodes .length,
-            attribs       = this .getAttribs (),
-            fogCoordNode  = this .fogCoordNode,
-            colorNode     = this .colorNode,
-            coordNode     = this .coordNode,
-            fogDepthArray = this .getFogDepths (),
-            colorArray    = this .getColors (),
-            vertexArray   = this .getVertices (),
-            size          = coordNode .getSize ();
+            vertexCount    = this ._vertexCount,
+            attribNodes    = this .getAttrib (),
+            numAttribNodes = attribNodes .length,
+            attribArrays   = this .getAttribs (),
+            fogCoordNode   = this .fogCoordNode,
+            colorNode      = this .colorNode,
+            coordNode      = this .coordNode,
+            fogDepthArray  = this .getFogDepths (),
+            colorArray     = this .getColors (),
+            vertexArray    = this .getVertices (),
+            size           = coordNode .getSize ();
 
          let index = 0;
 
@@ -209,8 +217,8 @@ function (Fields,
 
                for (let i = 0; i < count; ++ i, index += i & 1)
                {
-                  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/Rendering/PointSet.js

@@ -120,7 +120,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;
 
@@ -133,7 +136,12 @@ function (Fields,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -171,21 +179,21 @@ function (Fields,
             return;
 
          const
-            attribNodes   = this .getAttrib (),
-            numAttrib     = attribNodes .length,
-            attribs       = this .getAttribs (),
-            fogCoordNode  = this .fogCoordNode,
-            fogDepthArray = this .getFogDepths (),
-            colorNode     = this .colorNode,
-            colorArray    = this .getColors (),
-            coordNode     = this .coordNode,
-            vertexArray   = this .getVertices (),
-            numPoints     = coordNode ._point .length;
-
-         for (let a = 0; a < numAttrib; ++ a)
+            attribNodes    = this .getAttrib (),
+            numAttribNodes = attribNodes .length,
+            attribArrays   = this .getAttribs (),
+            fogCoordNode   = this .fogCoordNode,
+            fogDepthArray  = this .getFogDepths (),
+            colorNode      = this .colorNode,
+            colorArray     = this .getColors (),
+            coordNode      = this .coordNode,
+            vertexArray    = this .getVertices (),
+            numPoints      = coordNode ._point .length;
+
+         for (let a = 0; a < numAttribNodes; ++ a)
          {
             for (let i = 0; i < numPoints; ++ i)
-               attribNodes [a] .addValue (i, attribs [a]);
+               attribNodes [a] .addValue (i, attribArrays [a]);
          }
 
          if (fogCoordNode)

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

@@ -72,6 +72,19 @@ function (Fields,
    X3DColorNode .prototype = Object .assign (Object .create (X3DGeometricPropertyNode .prototype),
    {
       constructor: X3DColorNode,
+      initialize: function ()
+      {
+         X3DGeometricPropertyNode .prototype .initialize .call (this);
+
+         this ._color .addInterest ("set_color__", this);
+
+         this .set_color__ ();
+      },
+      set_color__: function ()
+      {
+         this .color  = this ._color .getValue ();
+         this .length = this ._color .length;
+      },
       setTransparent: function (value)
       {
          if (value !== this ._transparent .getValue ())

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

@@ -119,11 +119,14 @@ function (X3DGeometryNode,
          const attribNodes = this .getAttrib ();
 
          for (const attribNode of attribNodes)
+         {
             attribNode .removeInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .removeInterest ("updateVertexArrays", this);
+         }
 
          attribNodes .length = 0;
 
-         for (const node of  this ._attrib)
+         for (const node of this ._attrib)
          {
             const attribNode = X3DCast (X3DConstants .X3DVertexAttributeNode, node);
 
@@ -132,7 +135,12 @@ function (X3DGeometryNode,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -222,8 +230,8 @@ function (X3DGeometryNode,
             colorPerVertex     = this ._colorPerVertex .getValue (),
             normalPerVertex    = this ._normalPerVertex .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 (),
@@ -246,8 +254,8 @@ function (X3DGeometryNode,
                face  = Math .floor (i / verticesPerFace),
                index = this .getPolygonIndex (this .getTriangleIndex (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);