x_ite 5.0.0 → 5.0.2

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

@@ -131,7 +131,7 @@ function (Fields,
       },
       tessellate: function (type)
       {
-         var array = this .array;
+         const array = this .array;
 
          array .length = 0;
 
@@ -143,22 +143,22 @@ function (Fields,
 
          // Order and dimension are now positive numbers.
 
-         var
+         const
             closed        = this .getClosed (this ._order .getValue (), this ._knot, this ._weight, this ._controlPoint),
             weights       = this .getWeights (this .weights, this ._controlPoint .length, this ._weight),
             controlPoints = this .getControlPoints (this .controlPoints, closed, this ._order .getValue (), weights, this ._controlPoint);
 
          // Knots
 
-         var
+         const
             knots = this .getKnots (this .knots, closed, this ._order .getValue (), this ._controlPoint .length, this ._knot),
             scale = knots .at (-1) - knots [0];
 
          // Initialize NURBS tessellator
 
-         var degree = this ._order .getValue () - 1;
+         const degree = this ._order .getValue () - 1;
 
-         var surface = this .surface = (this .surface || nurbs) ({
+         const surface = this .surface = (this .surface || nurbs) ({
             boundary: ["open"],
             degree: [degree],
             knots: [knots],
@@ -169,7 +169,7 @@ function (Fields,
          this .sampleOptions .resolution [0] = this .getTessellation (knots .length);
          this .sampleOptions .haveWeights    = Boolean (weights);
 
-         var
+         const
             mesh   = nurbs .sample (this .mesh, surface, this .sampleOptions),
             points = mesh .points;
 
@@ -177,7 +177,7 @@ function (Fields,
          {
             case 0:
             {
-               for (var i = 0, length = points .length; i < length; i += 2)
+               for (let i = 0, length = points .length; i < length; i += 2)
                {
                   array .push (points [i], points [i + 1]);
                }
@@ -186,7 +186,7 @@ function (Fields,
             }
             case 1:
             {
-               for (var i = 0, length = points .length; i < length; i += 2)
+               for (let i = 0, length = points .length; i < length; i += 2)
                {
                   array .push (points [i], 0, points [i + 1]);
                }
@@ -195,7 +195,7 @@ function (Fields,
             }
             case 2:
             {
-               for (var i = 0, length = points .length; i < length; i += 2)
+               for (let i = 0, length = points .length; i < length; i += 2)
                {
                   array .push (new Vector3 (points [i], points [i + 1], 0));
                }

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

@@ -177,22 +177,22 @@ function (Fields,
 
          // Order and dimension are now positive numbers.
 
-         var
+         const
             closed        = this .getClosed (this ._order .getValue (), this ._knot, this ._weight, this .controlPointNode),
             weights       = this .getWeights (this .weights, this .controlPointNode .getSize (), this ._weight),
             controlPoints = this .getControlPoints (this .controlPoints, closed, this ._order .getValue (), weights, this .controlPointNode);
 
          // Knots
 
-         var
+         const
             knots = this .getKnots (this .knots, closed, this ._order .getValue (), this .controlPointNode .getSize (), this ._knot),
             scale = knots .at (-1) - knots [0];
 
          // Initialize NURBS tessellator
 
-         var degree = this ._order .getValue () - 1;
+         const degree = this ._order .getValue () - 1;
 
-         var surface = this .surface = (this .surface || nurbs) ({
+         const surface = this .surface = (this .surface || nurbs) ({
             boundary: ["open"],
             degree: [degree],
             knots: [knots],
@@ -202,7 +202,7 @@ function (Fields,
 
          this .sampleOptions .haveWeights = Boolean (weights);
 
-         var
+         const
             mesh         = nurbs .sample (this .mesh, surface, this .sampleOptions),
             points       = mesh .points,
             interpolator = this .interpolator;
@@ -210,11 +210,11 @@ function (Fields,
          interpolator ._key      .length = 0;
          interpolator ._keyValue .length = 0;
 
-         for (var i = 0, length = points .length - 3; i < length; i += 3)
+         for (let i = 0, length = points .length - 3; i < length; i += 3)
          {
-            var direction = new Vector3 (points [i + 3] - points [i + 0],
-                                         points [i + 4] - points [i + 1],
-                                         points [i + 5] - points [i + 2]);
+            const direction = new Vector3 (points [i + 3] - points [i + 0],
+                                           points [i + 4] - points [i + 1],
+                                           points [i + 5] - points [i + 2]);
 
             interpolator ._key      .push (knots [0] + i / (length - 3 + (3 * closed)) * scale);
             interpolator ._keyValue. push (new Rotation4 (Vector3 .zAxis, direction));

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

@@ -173,22 +173,22 @@ function (Fields,
 
          // Order and dimension are now positive numbers.
 
-         var
+         const
             closed        = this .getClosed (this ._order .getValue (), this ._knot, this ._weight, this .controlPointNode),
             weights       = this .getWeights (this .weights, this .controlPointNode .getSize (), this ._weight),
             controlPoints = this .getControlPoints (this .controlPoints, closed, this ._order .getValue (), weights, this .controlPointNode);
 
          // Knots
 
-         var
+         const
             knots = this .getKnots (this .knots, closed, this ._order .getValue (), this .controlPointNode .getSize (), this ._knot),
             scale = knots .at (-1) - knots [0];
 
          // Initialize NURBS tessellator
 
-         var degree = this ._order .getValue () - 1;
+         const degree = this ._order .getValue () - 1;
 
-         var surface = this .surface = (this .surface || nurbs) ({
+         const surface = this .surface = (this .surface || nurbs) ({
             boundary: ["open"],
             degree: [degree],
             knots: [knots],
@@ -198,7 +198,7 @@ function (Fields,
 
          this .sampleOptions .haveWeights = Boolean (weights);
 
-         var
+         const
             mesh         = nurbs .sample (this .mesh, surface, this .sampleOptions),
             points       = mesh .points,
             interpolator = this .interpolator;
@@ -206,7 +206,7 @@ function (Fields,
          interpolator ._key      .length = 0;
          interpolator ._keyValue .length = 0;
 
-         for (var i = 0, length = points .length; i < length; i += 3)
+         for (let i = 0, length = points .length; i < length; i += 3)
          {
             interpolator ._key      .push (knots [0] + i / (length - 3) * scale);
             interpolator ._keyValue. push (new Fields .SFVec3f (points [i], points [i + 1], points [i + 2]));

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

@@ -66,18 +66,6 @@ function (Fields,
 {
 "use strict";
 
-   function remove (array, first, last, range, rfirst, rlast)
-   {
-      var set = { };
-
-      for (var i = rfirst; i < rlast; ++ i)
-         set [getId (range [i])] = true;
-
-      function compare (value) { return set [getId (value)]; }
-
-      return array .remove (first, last, compare);
-   }
-
    function NurbsSet (executionContext)
    {
       X3DChildNode     .call (this, executionContext);
@@ -131,49 +119,53 @@ function (Fields,
       {
          // Add bounding boxes
 
-         for (var i = 0, length = this .geometryNodes .length; i < length; ++ i)
-         {
-            bbox .add (this .geometryNodes [i] .getBBox ());
-         }
+         for (const geometryNode of this .geometryNodes)
+            bbox .add (geometryNode .getBBox ());
 
          return bbox;
       },
       set_tessellationScale__: function ()
       {
-         var tessellationScale = Math .max (0, this ._tessellationScale .getValue ());
+         const tessellationScale = Math .max (0, this ._tessellationScale .getValue ());
 
-         for (var i = 0, length = this .geometryNodes .length; i < length; ++ i)
-            this .geometryNodes [i] .setTessellationScale (tessellationScale);
+         for (const geometryNode of this .geometryNodes)
+            geometryNode .setTessellationScale (tessellationScale);
       },
       set_addGeometry__: function ()
       {
          this ._addGeometry .setTainted (true);
 
          this ._addGeometry .erase (remove (this ._addGeometry, 0, this ._addGeometry .length,
-                                            this ._geometry, 0, this ._geometry .length),
+                                            this ._geometry,    0, this ._geometry .length),
                                     this ._addGeometry .length);
 
-         for (var i = 0, length = this ._addGeometry .length; i < length; ++ i)
-            this ._geometry .push (this ._addGeometry [i]);
+         for (const geometry of this ._addGeometry)
+            this ._geometry .push (geometry);
 
+         this ._addGeometry .length = 0;
          this ._addGeometry .setTainted (false);
       },
       set_removeGeometry__: function ()
       {
+         this ._removeGeometry .setTainted (true);
+
          this ._geometry .erase (remove (this ._geometry,       0, this ._geometry .length,
                                          this ._removeGeometry, 0, this ._removeGeometry .length),
-                                 this .geometry__ .length);
+                                 this ._geometry .length);
+
+         this ._removeGeometry .length = 0;
+         this ._removeGeometry .setTainted (false);
       },
       set_geometry__: function ()
       {
-         for (var i = 0, length = this .geometryNodes .length; i < length; ++ i)
-            this .geometryNodes [i] .setTessellationScale (1);
+         for (const geometryNode of this .geometryNodes)
+            geometryNode .setTessellationScale (1);
 
          this .geometryNodes .length = 0;
 
-         for (var i = 0, length = this ._geometry .length; i < length; ++ i)
+         for (const node of this ._geometry)
          {
-            var geometryNode = X3DCast (X3DConstants .X3DNurbsSurfaceGeometryNode, this ._geometry [i]);
+            const geometryNode = X3DCast (X3DConstants .X3DNurbsSurfaceGeometryNode, node);
 
             if (geometryNode)
                this .geometryNodes .push (geometryNode);
@@ -183,5 +175,17 @@ function (Fields,
       },
    });
 
+   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 NurbsSet;
 });

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

@@ -136,7 +136,7 @@ function (Fields,
       },
       set_fraction__: (function ()
       {
-         var
+         const
             a     = new Vector3 (0, 0, 0),
             b     = new Vector3 (0, 0, 0),
             c     = new Vector3 (0, 0, 0),
@@ -146,13 +146,13 @@ function (Fields,
 
          return function ()
          {
-            var
+            const
                fraction       = this ._set_fraction .getValue (),
                texCoordsArray = this .geometry .getTexCoords (),
                normalArray    = this .geometry .getNormals (),
                verticesArray  = this .geometry .getVertices ();
 
-            for (var i4 = 0, i3 = 0, length = texCoordsArray .length; i4 < length; i4 += 12, i3 += 9)
+            for (let i4 = 0, i3 = 0, length = texCoordsArray .length; i4 < length; i4 += 12, i3 += 9)
             {
                a .set (texCoordsArray [i4 + 0], texCoordsArray [i4 + 1], 0);
                b .set (texCoordsArray [i4 + 4], texCoordsArray [i4 + 5], 0);
@@ -164,18 +164,18 @@ function (Fields,
 
                   if (line .intersectsTriangle (a, b, c, uvt))
                   {
-                     var
+                     const
                         u = uvt .u,
                         v = uvt .v,
                         t = uvt .t;
 
-                     var normal = new Vector3 (t * normalArray [i3 + 0] + u * normalArray [i3 + 3] + v * normalArray [i3 + 6],
-                                               t * normalArray [i3 + 1] + u * normalArray [i3 + 4] + v * normalArray [i3 + 7],
-                                               t * normalArray [i3 + 2] + u * normalArray [i3 + 5] + v * normalArray [i3 + 8]);
+                     const normal = new Vector3 (t * normalArray [i3 + 0] + u * normalArray [i3 + 3] + v * normalArray [i3 + 6],
+                                                 t * normalArray [i3 + 1] + u * normalArray [i3 + 4] + v * normalArray [i3 + 7],
+                                                 t * normalArray [i3 + 2] + u * normalArray [i3 + 5] + v * normalArray [i3 + 8]);
 
-                     var position = new Vector3 (t * verticesArray [i4 + 0] + u * verticesArray [i4 + 4] + v * verticesArray [i4 +  8],
-                                                 t * verticesArray [i4 + 1] + u * verticesArray [i4 + 5] + v * verticesArray [i4 +  9],
-                                                 t * verticesArray [i4 + 2] + u * verticesArray [i4 + 6] + v * verticesArray [i4 + 10]);
+                     const position = new Vector3 (t * verticesArray [i4 + 0] + u * verticesArray [i4 + 4] + v * verticesArray [i4 +  8],
+                                                   t * verticesArray [i4 + 1] + u * verticesArray [i4 + 5] + v * verticesArray [i4 +  9],
+                                                   t * verticesArray [i4 + 2] + u * verticesArray [i4 + 6] + v * verticesArray [i4 + 10]);
 
                      this ._normal_changed   = normal;
                      this ._position_changed = position;

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

@@ -47,7 +47,7 @@
  ******************************************************************************/
 
 
-define ([
+ define ([
    "x_ite/Fields",
    "x_ite/Base/X3DFieldDefinition",
    "x_ite/Base/FieldDefinitionArray",
@@ -104,7 +104,7 @@ function (Fields,
          this ._crossSectionCurve .addInterest ("set_crossSectionCurve__", this);
          this ._trajectoryCurve   .addInterest ("set_trajectoryCurve__",   this);
 
-         var extrusion = this .extrusion;
+         const extrusion = this .extrusion;
 
          extrusion ._beginCap     = false;
          extrusion ._endCap       = false;
@@ -149,7 +149,7 @@ function (Fields,
          if (! this .trajectoryCurveNode)
             return;
 
-         var extrusion = this .extrusion;
+         const extrusion = this .extrusion;
 
          extrusion ._crossSection = this .crossSectionCurveNode .tessellate (0);
          extrusion ._spine        = this .trajectoryCurveNode   .tessellate (0);
@@ -165,9 +165,9 @@ function (Fields,
 
          if (! this ._ccw .getValue ())
          {
-            var normals = this .getNormals ();
+            const normals = this .getNormals ();
 
-            for (var i = 0, length = normals .length; i < length; ++ i)
+            for (let i = 0, length = normals .length; i < length; ++ i)
                normals [i] = -normals [i];
          }
 

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

@@ -104,7 +104,7 @@ function (Fields,
          this ._profileCurve    .addInterest ("set_profileCurve__",    this);
          this ._trajectoryCurve .addInterest ("set_trajectoryCurve__", this);
 
-         var extrusion = this .extrusion;
+         const extrusion = this .extrusion;
 
          extrusion ._beginCap     = false;
          extrusion ._endCap       = false;
@@ -149,7 +149,7 @@ function (Fields,
          if (! this .trajectoryCurveNode)
             return;
 
-         var extrusion = this .extrusion;
+         const extrusion = this .extrusion;
 
          extrusion ._crossSection = this .profileCurveNode    .tessellate (0);
          extrusion ._spine        = this .trajectoryCurveNode .tessellate (1);
@@ -165,9 +165,9 @@ function (Fields,
 
          if (! this ._ccw .getValue ())
          {
-            var normals = this .getNormals ();
+            const normals = this .getNormals ();
 
-            for (var i = 0, length = normals .length; i < length; ++ i)
+            for (let i = 0, length = normals .length; i < length; ++ i)
                normals [i] = -normals [i];
          }
 

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

@@ -47,7 +47,7 @@
  ******************************************************************************/
 
 
-define ([
+ define ([
    "x_ite/Fields",
    "x_ite/Base/X3DFieldDefinition",
    "x_ite/Base/FieldDefinitionArray",
@@ -105,20 +105,20 @@ function (Fields,
       },
       getControlPoints: function (texWeights)
       {
-         var
+         const
             controlPointArray = this ._controlPoint .getValue (),
             controlPoints     = this .controlPoints;
 
-         for (var u = 0, uDimension = this ._uDimension .getValue (); u < uDimension; ++ u)
+         for (let u = 0, uDimension = this ._uDimension .getValue (); u < uDimension; ++ u)
          {
-            var cp = controlPoints [u];
+            let cp = controlPoints [u];
 
             if (! cp)
                cp = controlPoints [u] = [ ];
 
-            for (var v = 0, vDimension = this ._vDimension .getValue (); v < vDimension; ++ v)
+            for (let v = 0, vDimension = this ._vDimension .getValue (); v < vDimension; ++ v)
             {
-               var
+               const
                   index = v * uDimension + u,
                   p     = cp [v] || new Vector4 (),
                   i     = index * 2;

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

@@ -112,19 +112,46 @@ function (Fields,
       {
          X3DNurbsSurfaceGeometryNode .prototype .initialize .call (this);
 
-         this ._trimmingContour .addInterest ("set_trimmingContour__", this);
+         this ._addTrimmingContour    .addInterest ("set_addTrimmingContour__",    this);
+         this ._removeTrimmingContour .addInterest ("set_removeTrimmingContour__", this);
+         this ._trimmingContour       .addInterest ("set_trimmingContour__",       this);
 
          this .set_trimmingContour__ ();
       },
+      set_addTrimmingContour__: function ()
+      {
+         this ._addTrimmingContour .setTainted (true);
+
+         this ._addTrimmingContour .erase (remove (this ._addTrimmingContour, 0, this ._addTrimmingContour .length,
+                                                   this ._trimmingContour,    0, this ._trimmingContour .length),
+                                           this ._addTrimmingContour .length);
+
+         for (const trimmingContour of this ._addTrimmingContour)
+            this ._trimmingContour .push (trimmingContour);
+
+         this ._addTrimmingContour .length = 0;
+         this ._addTrimmingContour .setTainted (false);
+      },
+      set_removeTrimmingContour__: function ()
+      {
+         this ._removeTrimmingContour .setTainted (true);
+
+         this ._trimmingContour .erase (remove (this ._trimmingContour,       0, this ._trimmingContour .length,
+                                                this ._removeTrimmingContour, 0, this ._removeTrimmingContour .length),
+                                        this ._trimmingContour .length);
+
+         this ._removeTrimmingContour .length = 0;
+         this ._removeTrimmingContour .setTainted (false);
+      },
       set_trimmingContour__: function ()
       {
-         var trimmingContourNodes = this .trimmingContourNodes;
+         const trimmingContourNodes = this .trimmingContourNodes;
 
          trimmingContourNodes .length = 0;
 
-         for (var i = 0, length = this ._trimmingContour .length; i < length; ++ i)
+         for (const node of this ._trimmingContour)
          {
-            var trimmingContourNode = X3DCast (X3DConstants .Contour2D, this ._trimmingContour [i]);
+            const trimmingContourNode = X3DCast (X3DConstants .Contour2D, node);
 
             if (trimmingContourNode)
                trimmingContourNodes .push (trimmingContourNode);
@@ -132,16 +159,28 @@ function (Fields,
       },
       getTrimmingContours: function ()
       {
-         var
+         const
             trimmingContourNodes = this .trimmingContourNodes,
             trimmingContours     = [ ];
 
-         for (var i = 0, length = trimmingContourNodes .length; i < length; ++ i)
-            trimmingContourNodes [i] .addTrimmingContour (trimmingContours);
+         for (const trimmingContourNode of trimmingContourNodes)
+            trimmingContourNode .addTrimmingContour (trimmingContours);
 
          return trimmingContours;
       },
    });
 
+   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 NurbsTrimmedSurface;
 });