x_ite 5.0.0 → 5.0.2

package/docs/_config.yml

@@ -20,7 +20,7 @@ github: [metadata]
 author:
   name: *title
   avatar: "assets/images/logo.png"
-  bio: "Version 5.0.0"
+  bio: "Version 5.0.2"
   links:
     - label: "GitHub"
       icon: "fab fa-2x fa-fw fa-github"

package/docs/index.md

@@ -838,8 +838,8 @@ If you are a developer or you always wanna be up to date:
 If you are on production and everything works fine, then use a numbered version.
 
 ```html
-<link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/5.0.0/dist/x_ite.css"/>
-<script type="text/javascript" src="https://create3000.github.io/code/x_ite/5.0.0/dist/x_ite.min.js"></script>
+<link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/5.0.2/dist/x_ite.css"/>
+<script type="text/javascript" src="https://create3000.github.io/code/x_ite/5.0.2/dist/x_ite.min.js"></script>
 ```
 
 ### jsDelivr CDN

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "x_ite",
-	"version": "5.0.0",
-	"revision": "1145",
+	"version": "5.0.2",
+	"revision": "1147",
 	"description": "X_ITE X3D Browser, a framework for integrating and manipulating X3D and VRML scenes in HTML.",
 	"main": "dist/x_ite.js",
 	"repository": {
@@ -63,7 +63,7 @@
 		"OpenJPEG.js": "^0.10.2",
 		"opentype.js": "^1.3.4",
 		"pako": "^2.0.4",
-		"require": "2.4.20",
+		"require": "^2.4.20",
 		"requirejs": "^2.3.6",
 		"requirejs-text": "^2.0.16",
 		"terser": "^5.12.1"

package/src/assets/shaders/webgl1/Phong.fs

@@ -53,11 +53,11 @@ uniform x3d_OcclusionTextureParameters x3d_OcclusionTexture;
 #endif
 
 vec3
-getAmbientColor ()
+getAmbientColor (in vec3 diffuseColor)
 {
    // Get ambient parameter.
 
-   vec3 ambientParameter = x3d_Material .ambientIntensity * x3d_Material .diffuseColor;
+   vec3 ambientParameter = x3d_Material .ambientIntensity * diffuseColor;
 
    // Get texture color.
 
@@ -192,7 +192,7 @@ getMaterialColor ()
    vec4  diffuseColorAlpha = getDiffuseColor ();
    float alpha             = diffuseColorAlpha .a;
    vec3  diffuseColor      = diffuseColorAlpha .rgb;
-   vec3  ambientColor      = getAmbientColor ();
+   vec3  ambientColor      = getAmbientColor (diffuseColor);
    vec3  specularColor     = getSpecularColor ();
    float shininessFactor   = getShininessFactor ();
 

package/src/assets/shaders/webgl2/Phong.fs

@@ -51,11 +51,11 @@ uniform x3d_OcclusionTextureParameters x3d_OcclusionTexture;
 #endif
 
 vec3
-getAmbientColor ()
+getAmbientColor (in vec3 diffuseColor)
 {
    // Get ambient parameter.
 
-   vec3 ambientParameter = x3d_Material .ambientIntensity * x3d_Material .diffuseColor;
+   vec3 ambientParameter = x3d_Material .ambientIntensity * diffuseColor;
 
    // Get texture color.
 
@@ -202,7 +202,7 @@ getMaterialColor ()
    vec4  diffuseColorAlpha = getDiffuseColor ();
    float alpha             = diffuseColorAlpha .a;
    vec3  diffuseColor      = diffuseColorAlpha .rgb;
-   vec3  ambientColor      = getAmbientColor ();
+   vec3  ambientColor      = getAmbientColor (diffuseColor);
    vec3  specularColor     = getSpecularColor ();
    float shininessFactor   = getShininessFactor ();
 

package/src/x_ite/Base/X3DBaseNode.js

@@ -188,7 +188,10 @@ function (X3DEventObject,
 
             // Connect to execution context.
 
-            if (this [_executionContext] !== this)
+            if (this .getOuterNode && this .getOuterNode ())
+               this .getOuterNode () .isLive () .addInterest (_set_live__, this);
+
+            else if (this [_executionContext] !== this)
                this [_executionContext] .isLive () .addInterest (_set_live__, this);
 
             // Return field
@@ -215,7 +218,10 @@ function (X3DEventObject,
       {
          ///  Determines the live state of this node.
 
-         if (this !== this [_executionContext])
+         if (this .getOuterNode && this .getOuterNode ())
+            return this .getLive () && this .getOuterNode () .isLive () .getValue ();
+
+         else if (this !== this [_executionContext])
             return this .getLive () && this [_executionContext] .isLive () .getValue ();
 
          return this .getLive ();

package/src/x_ite/Browser/NURBS/NURBS.js

@@ -58,7 +58,7 @@ function (Vector2,
 {
 "use strict";
 
-   var NURBS = {
+   const NURBS = {
       getTessellation: function (tessellation, dimension)
       {
          if (tessellation > 0)
@@ -71,7 +71,7 @@ function (Vector2,
       },
       getClosed2D: function (order, knot, weight, controlPoint)
       {
-         var
+         const
             dimension   = controlPoint .length,
             haveWeights = weight .length === dimension;
 
@@ -97,13 +97,13 @@ function (Vector2,
       },
       getClosed: (function ()
       {
-         var
+         const
             firstPoint = new Vector3 (0, 0, 0),
             lastPoint  = new Vector3 (0, 0, 0);
 
          return function (order, knot, weight, controlPointNode)
          {
-            var
+            const
                dimension   = controlPointNode .getSize (),
                haveWeights = weight .length === dimension;
 
@@ -130,17 +130,17 @@ function (Vector2,
       })(),
       getUClosed: (function ()
       {
-         var
+         const
             firstPoint = new Vector3 (0, 0, 0),
             lastPoint  = new Vector3 (0, 0, 0);
 
          return function (uOrder, uDimension, vDimension, uKnot, weight, controlPointNode)
          {
-            var haveWeights = weight .length === controlPointNode .getSize ();
+            const haveWeights = weight .length === controlPointNode .getSize ();
 
-            for (var v = 0, length = vDimension; v < length; ++ v)
+            for (let v = 0, length = vDimension; v < length; ++ v)
             {
-               var
+               const
                   first = v * uDimension,
                   last  = v * uDimension + uDimension - 1;
 
@@ -168,17 +168,17 @@ function (Vector2,
       })(),
       getVClosed: (function ()
       {
-         var
+         const
             firstPoint = new Vector3 (0, 0, 0),
             lastPoint  = new Vector3 (0, 0, 0);
 
          return function (vOrder, uDimension, vDimension, vKnot, weight, controlPointNode)
          {
-            var haveWeights = weight .length === controlPointNode .getSize ();
+            const haveWeights = weight .length === controlPointNode .getSize ();
 
-            for (var u = 0, size = uDimension; u < size; ++ u)
+            for (let u = 0, size = uDimension; u < size; ++ u)
             {
-               var
+               const
                   first = u,
                   last  = (vDimension - 1) * uDimension + u;
 
@@ -211,9 +211,9 @@ function (Vector2,
          if (knot .length === dimension + order)
          {
             {
-               var count = 1;
+               let count = 1;
 
-               for (var i = 1, size = order; i < size; ++ i)
+               for (let i = 1, size = order; i < size; ++ i)
                {
                   count += knot [i] === knot [0];
                }
@@ -223,9 +223,9 @@ function (Vector2,
             }
 
             {
-               var count = 1;
+               let count = 1;
 
-               for (var i = knot .length - order, size = knot .length - 1; i < size; ++ i)
+               for (let i = knot .length - order, size = knot .length - 1; i < size; ++ i)
                {
                   count += knot [i] === knot [size];
                }
@@ -239,9 +239,9 @@ function (Vector2,
       },
       getKnots: function (result, closed, order, dimension, knot)
       {
-         var knots = result || [ ];
+         const knots = result || [ ];
 
-         for (var i = 0, length = knot .length; i < length; ++ i)
+         for (let i = 0, length = knot .length; i < length; ++ i)
             knots [i] = knot [i];
 
          knots .length = knot .length;
@@ -249,15 +249,15 @@ function (Vector2,
          // check the knot-vectors. If they are not according to standard
          // default uniform knot vectors will be generated.
 
-         var generateUniform = true;
+         let generateUniform = true;
 
          if (knots .length === dimension + order)
          {
             generateUniform = false;
 
-            var consecutiveKnots = 0;
+            let consecutiveKnots = 0;
 
-            for (var i = 1, length = knots .length; i < length; ++ i)
+            for (let i = 1, length = knots .length; i < length; ++ i)
             {
                if (knots [i] == knots [i - 1])
                   ++ consecutiveKnots;
@@ -274,13 +274,13 @@ function (Vector2,
 
          if (generateUniform)
          {
-            for (var i = 0, length = dimension + order; i < length; ++ i)
+            for (let i = 0, length = dimension + order; i < length; ++ i)
                knots [i] = i / (length - 1);
          }
 
          if (closed)
          {
-            for (var i = 1, length = order - 1; i < length; ++ i)
+            for (let i = 1, length = order - 1; i < length; ++ i)
                knots .push (knots .at (-1) + (knots [i] - knots [i - 1]));
          }
 
@@ -291,9 +291,9 @@ function (Vector2,
          if (weight .length !== dimension)
             return undefined;
 
-         var weights = result || [ ];
+         const weights = result || [ ];
 
-         for (var i = 0; i < dimension; ++ i)
+         for (let i = 0; i < dimension; ++ i)
          {
             weights [i] = weight [i];
          }
@@ -304,16 +304,16 @@ function (Vector2,
       },
       getUVWeights: function (result, uDimension, vDimension, weight)
       {
-         var dimension = uDimension * vDimension;
+         const dimension = uDimension * vDimension;
 
          if (weight .length !== dimension)
             return undefined;
 
-         var weights = result || [ ];
+         const weights = result || [ ];
 
-         for (var u = 0, i = 0; u < uDimension; ++ u)
+         for (let u = 0, i = 0; u < uDimension; ++ u)
          {
-            for (var v = 0; v < vDimension; ++ v, ++ i)
+            for (let v = 0; v < vDimension; ++ v, ++ i)
             {
                weights [i] = weight [i];
             }
@@ -325,7 +325,7 @@ function (Vector2,
       },
       getControlPoints2D: function (result, closed, order, weights, controlPoint)
       {
-         var
+         const
             controlPoints     = result || [ ],
             controlPointArray = controlPoint .getValue (),
             dimension         = controlPoint .length,
@@ -338,9 +338,9 @@ function (Vector2,
             controlPoints .length      = 0;
          }
 
-         for (var i = 0; i < dimension; ++ i)
+         for (let i = 0; i < dimension; ++ i)
          {
-            var
+            const
                i2 = i * 2,
                p  = controlPoints [i] || new Vector (0, 0, 0);
 
@@ -351,7 +351,7 @@ function (Vector2,
 
          if (closed)
          {
-            for (var i = 1, size = order - 1; i < size; ++ i)
+            for (let i = 1, size = order - 1; i < size; ++ i)
                controlPoints .push (controlPoints [i]);
          }
 
@@ -359,7 +359,7 @@ function (Vector2,
       },
       getControlPoints: function (result, closed, order, weights, controlPointNode)
       {
-         var
+         const
             controlPoints = result || [ ],
             dimension     = controlPointNode .getSize (),
             haveWeights   = Boolean (weights),
@@ -371,9 +371,9 @@ function (Vector2,
             controlPoints .length      = 0;
          }
 
-         for (var i = 0; i < dimension; ++ i)
+         for (let i = 0; i < dimension; ++ i)
          {
-            var cp = controlPoints [i] = controlPointNode .get1Point (i, controlPoints [i] || new Vector (0, 0, 0, 0));
+            const cp = controlPoints [i] = controlPointNode .get1Point (i, controlPoints [i] || new Vector (0, 0, 0, 0));
 
             if (haveWeights)
                cp .w = weights [i];
@@ -383,7 +383,7 @@ function (Vector2,
 
          if (closed)
          {
-            for (var i = 1, size = order - 1; i < size; ++ i)
+            for (let i = 1, size = order - 1; i < size; ++ i)
                controlPoints .push (controlPoints [i]);
          }
 
@@ -391,7 +391,7 @@ function (Vector2,
       },
       getUVControlPoints: function (result, uClosed, vClosed, uOrder, vOrder, uDimension, vDimension, weights, controlPointNode)
       {
-         var
+         const
             controlPoints = result || [ ],
             haveWeights   = Boolean (weights),
             Vector        = haveWeights ? Vector4 : Vector3;
@@ -402,16 +402,16 @@ function (Vector2,
             controlPoints .length      = 0;
          }
 
-         for (var u = 0; u < uDimension; ++ u)
+         for (let u = 0; u < uDimension; ++ u)
          {
-            var cp = controlPoints [u];
+            let cp = controlPoints [u];
 
             if (! cp)
                cp = controlPoints [u] = [ ];
 
-            for (var v = 0; v < vDimension; ++ v)
+            for (let v = 0; v < vDimension; ++ v)
             {
-               var index = v * uDimension + u;
+               const index = v * uDimension + u;
 
                cp [v] = controlPointNode .get1Point (index, cp [v] || new Vector (0, 0, 0, 0));
 
@@ -423,7 +423,7 @@ function (Vector2,
 
             if (vClosed)
             {
-               for (var i = 1, length = vOrder - 1; i < length; ++ i)
+               for (let i = 1, length = vOrder - 1; i < length; ++ i)
                   cp .push (cp [i]);
             }
          }
@@ -432,7 +432,7 @@ function (Vector2,
 
          if (uClosed)
          {
-            for (var i = 1, length = uOrder - 1; i < length; ++ i)
+            for (let i = 1, length = uOrder - 1; i < length; ++ i)
                controlPoints .push (controlPoints [i]);
          }
 
@@ -440,18 +440,18 @@ function (Vector2,
       },
       getTexControlPoints: function (result, uClosed, vClosed, uOrder, vOrder, uDimension, vDimension, controlPointNode)
       {
-         var controlPoints = result || [ ];
+         const controlPoints = result || [ ];
 
-         for (var u = 0; u < uDimension; ++ u)
+         for (let u = 0; u < uDimension; ++ u)
          {
-            var cp = controlPoints [u];
+            let cp = controlPoints [u];
 
             if (! cp)
                cp = controlPoints [u] = [ ];
 
-            for (var v = 0; v < vDimension; ++ v)
+            for (let v = 0; v < vDimension; ++ v)
             {
-               var index = v * uDimension + u;
+               const index = v * uDimension + u;
 
                cp [v] = controlPointNode .get1Point (index, cp [v] || new Vector4 (0, 0, 0, 0));
             }
@@ -460,7 +460,7 @@ function (Vector2,
 
             if (vClosed)
             {
-               for (var i = 1, length = vOrder - 1; i < length; ++ i)
+               for (let i = 1, length = vOrder - 1; i < length; ++ i)
                   cp .push (cp [i]);
             }
          }
@@ -469,7 +469,7 @@ function (Vector2,
 
          if (uClosed)
          {
-            for (var i = 1, length = uOrder - 1; i < length; ++ i)
+            for (let i = 1, length = uOrder - 1; i < length; ++ i)
                controlPoints .push (controlPoints [i]);
          }
 

package/src/x_ite/Browser/VERSION.js

@@ -49,5 +49,5 @@
 
 define (function ()
 {
-   return "5.0.0";
+   return "5.0.2";
 });

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

@@ -62,20 +62,6 @@ function (X3DChildNode,
 {
 "use strict";
 
-   function getId (value) { return value ? value .getValue () .getId () : -1; }
-
-   function remove (array, first, last, range, rfirst, rlast)
-   {
-      const set = { };
-
-      for (let i = rfirst; i < rlast; ++ i)
-         set [getId (range [i])] = true;
-
-      function compare (value) { return set [getId (value)]; }
-
-      return array .remove (first, last, compare);
-   }
-
    function X3DGroupingNode (executionContext)
    {
       X3DChildNode     .call (this, executionContext);
@@ -167,7 +153,7 @@ function (X3DChildNode,
          this ._children .insert (this ._children .length, this ._addChildren, 0, this ._addChildren .length);
          this .add (this ._addChildren);
 
-         this ._addChildren .set ([ ]);
+         this ._addChildren .length = 0;
          this ._addChildren .setTainted (false);
       },
       set_removeChildren__: function ()
@@ -175,6 +161,8 @@ function (X3DChildNode,
          if (this ._removeChildren .length === 0)
             return;
 
+         this ._removeChildren .setTainted (true);
+
          if (this ._children .length > 0)
          {
             if (!this ._children .isTainted ())
@@ -190,7 +178,8 @@ function (X3DChildNode,
             this .remove (this ._removeChildren);
          }
 
-         this ._removeChildren .set ([ ]);
+         this ._removeChildren .length = 0;
+         this ._removeChildren .setTainted (false);
       },
       set_children__: function ()
       {
@@ -720,5 +709,17 @@ function (X3DChildNode,
       },
    });
 
+   function remove (array, first, last, range, rfirst, rlast)
+   {
+      const set = new Set ();
+
+      for (let i = rfirst; i < rlast; ++ i)
+         set .add (range [i]);
+
+      function compare (value) { return set .has (value); }
+
+      return array .remove (first, last, compare);
+   }
+
    return X3DGroupingNode;
 });

package/src/x_ite/Components/NURBS/Contour2D.js

@@ -98,43 +98,82 @@ function (Fields,
       {
          X3DNode .prototype .initialize .call (this);
 
-         this ._children .addInterest ("set_children__", this);
+         this ._addChildren    .addInterest ("set_addChildren__",    this);
+         this ._removeChildren .addInterest ("set_removeChildren__", this);
+         this ._children       .addInterest ("set_children__",       this);
 
          this .set_children__ ();
       },
+      set_addChildren__: function ()
+      {
+         this ._addChildren .setTainted (true);
+
+         this ._addChildren .erase (remove (this ._addChildren, 0, this ._addChildren .length,
+                                            this ._children,    0, this ._children .length),
+                                    this ._addChildren .length);
+
+         for (const child of this ._addChildren)
+            this ._children .push (child);
+
+         this ._addChildren .length = 0;
+         this ._addChildren .setTainted (false);
+      },
+      set_removeChildren__: function ()
+      {
+         this ._removeChildren .setTainted (true);
+
+         this ._children .erase (remove (this ._children,       0, this ._children .length,
+                                         this ._removeChildren, 0, this ._removeChildren .length),
+                                 this ._children .length);
+
+         this ._removeChildren .length = 0;
+         this ._removeChildren .setTainted (false);
+      },
       set_children__: function ()
       {
-         var childNodes = this .childNodes;
+         const childNodes = this .childNodes;
 
          childNodes .length = 0;
 
-         for (var i = 0, length = this ._children .length; i < length; ++ i)
+         for (const node of this ._children)
          {
-            var childNode = X3DCast (X3DConstants .NurbsCurve2D, this ._children [i]);
+            const childNode = X3DCast (X3DConstants .NurbsCurve2D, node);
 
             if (childNode)
             {
                childNodes .push (childNode);
                continue;
             }
-
-            var childNode = X3DCast (X3DConstants .ContourPolyline2D, this ._children [i]);
-
-            if (childNode)
+            else
             {
-               childNodes .push (childNode);
-               continue;
+               const childNode = X3DCast (X3DConstants .ContourPolyline2D, node);
+
+               if (childNode)
+               {
+                  childNodes .push (childNode);
+                  continue;
+               }
             }
          }
       },
       addTrimmingContour: function (trimmingContours)
       {
-         var childNodes = this .childNodes;
-
-         for (var i = 0, length = childNodes .length; i < length; ++ i)
-            trimmingContours .push (childNodes [i] .tessellate (2));
+         for (const childNode of this .childNodes)
+            trimmingContours .push (childNode .tessellate (2));
       }
    });
 
+   function remove (array, first, last, range, rfirst, rlast)
+   {
+      const set = new Set ();
+
+      for (let i = rfirst; i < rlast; ++ i)
+         set .add (range [i]);
+
+      function compare (value) { return set .has (value); }
+
+      return array .remove (first, last, compare);
+   }
+
    return Contour2D;
 });

package/src/x_ite/Components/NURBS/ContourPolyline2D.js

@@ -98,13 +98,14 @@ function (Fields,
          {
             case 0:
             {
-               var
+               const
                   controlPointArray = this ._controlPoint .getValue (),
-                  controlPoints     = this .controlPoints;
+                  controlPoints     = this .controlPoints,
+                  length            = this ._controlPoint .length;
 
-               for (var i = 0, length = this ._controlPoint .length; i < length; ++ i)
+               for (let i = 0; i < length; ++ i)
                {
-                  var i2 = i * 2;
+                  const i2 = i * 2;
 
                   controlPoints [i2 + 0] = controlPointArray [i2 + 0];
                   controlPoints [i2 + 1] = controlPointArray [i2 + 1];
@@ -116,13 +117,14 @@ function (Fields,
             }
             case 1:
             {
-               var
+               const
                   controlPointArray = this ._controlPoint .getValue (),
-                  controlPoints     = this .controlPoints;
+                  controlPoints     = this .controlPoints,
+                  length            = this ._controlPoint .length;
 
-               for (var i = 0, length = this ._controlPoint .length; i < length; ++ i)
+               for (let i = 0; i < length; ++ i)
                {
-                  var
+                  const
                      i2 = i * 2,
                      i3 = i * 3;
 
@@ -137,13 +139,14 @@ function (Fields,
             }
             case 3:
             {
-               var
+               const
                   controlPointArray = this ._controlPoint .getValue (),
-                  controlPoints     = this .controlPoints;
+                  controlPoints     = this .controlPoints,
+                  length            = this ._controlPoint .length;
 
-               for (var i = 0, length = this ._controlPoint .length; i < length; ++ i)
+               for (let i = 0; i < length; ++ i)
                {
-                  var i2 = i * 2;
+                  const i2 = i * 2;
 
                   controlPoints [i] = new Vector3 (controlPointArray [i2 + 0], controlPointArray [i2 + 1], 0);
                }