x_ite 8.7.8 → 8.7.9

package/docs/_config.yml

@@ -20,7 +20,7 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.7.8                         # x_ite latest version
+version: 8.7.9                         # x_ite latest version
 size: 290                              # size in kb
 x3d_latest_version: 4.0                # x3d latest version
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.7.8",
+	"version": "8.7.9",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",

package/src/assets/shaders/webgl1/include/Shadow.glsl.js

@@ -245,21 +245,19 @@ getShadowIntensity (const in int index, const in x3d_LightSourceParameters light
          if (any (greaterThan (abs (shadowCoord .xy - 0.5), vec2 (0.5))))
             return 0.0;
 
-         float dx0 = - texelSize .x;
-         float dy0 = - texelSize .y;
-         float dx1 = + texelSize .x;
-         float dy1 = + texelSize .y;
+         vec2 d0 = - texelSize;
+         vec2 d1 =   texelSize;
 
          float value = (
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx0, dy0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (0.0, dy0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx1, dy0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx0, 0.0), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + d0,                  shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (0.0,   d0 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d1 .x, d0 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d0 .x, 0.0),   shadowCoord .z) +
             texture2DCompare (index, shadowCoord .xy, shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx1, 0.0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx0, dy1), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (0.0, dy1), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx1, dy1), shadowCoord .z)
+            texture2DCompare (index, shadowCoord .xy + vec2 (d1 .x, 0.0),   shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d0 .x, d1 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (0.0,   d1 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + d1,                  shadowCoord .z)
          ) * (1.0 / 9.0);
 
          return light .shadowIntensity * value;
@@ -275,22 +273,20 @@ getShadowIntensity (const in int index, const in x3d_LightSourceParameters light
          if (any (greaterThan (abs (shadowCoord .xy - 0.5), vec2 (0.5))))
             return 0.0;
 
-         float dx0 = - texelSize.x;
-         float dy0 = - texelSize.y;
-         float dx1 = + texelSize.x;
-         float dy1 = + texelSize.y;
+         vec2 d0 = - texelSize;
+         vec2 d1 =   texelSize;
 
          float value = (
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx0, dy0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0, dy0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx1, dy0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx0, 0.0), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + d0,                  shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0,   d0 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d1 .x, d0 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d0 .x, 0.0),   shadowCoord .z) +
             texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy, shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx1, 0.0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx0, dy1), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0, dy1), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx1, dy1), shadowCoord .z)
-         ) * ( 1.0 / 9.0 );
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d1 .x, 0.0),   shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d0 .x, d1 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0, d1 .y),   shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + d1,                  shadowCoord .z)
+         ) * (1.0 / 9.0);
 
          return light .shadowIntensity * value;
 

package/src/assets/shaders/webgl2/include/Shadow.glsl.js

@@ -259,21 +259,19 @@ getShadowIntensity (const in int index, const in x3d_LightSourceParameters light
          if (any (greaterThan (abs (shadowCoord .xy - 0.5), vec2 (0.5))))
             return 0.0;
 
-         float dx0 = - texelSize .x;
-         float dy0 = - texelSize .y;
-         float dx1 = + texelSize .x;
-         float dy1 = + texelSize .y;
+         vec2 d0 = - texelSize;
+         vec2 d1 =   texelSize;
 
          float value = (
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx0, dy0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (0.0, dy0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx1, dy0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx0, 0.0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy, shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx1, 0.0), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx0, dy1), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (0.0, dy1), shadowCoord .z) +
-            texture2DCompare (index, shadowCoord .xy + vec2 (dx1, dy1), shadowCoord .z)
+            texture2DCompare (index, shadowCoord .xy + d0,                  shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (0.0,   d0 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d1 .x, d0 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d0 .x, 0.0),   shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy,                       shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d1 .x, 0.0),   shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (d0 .x, d1 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + vec2 (0.0,   d1 .y), shadowCoord .z) +
+            texture2DCompare (index, shadowCoord .xy + d1,                  shadowCoord .z)
          ) * (1.0 / 9.0);
 
          return light .shadowIntensity * value;
@@ -289,22 +287,20 @@ getShadowIntensity (const in int index, const in x3d_LightSourceParameters light
          if (any (greaterThan (abs (shadowCoord .xy - 0.5), vec2 (0.5))))
             return 0.0;
 
-         float dx0 = - texelSize.x;
-         float dy0 = - texelSize.y;
-         float dx1 = + texelSize.x;
-         float dy1 = + texelSize.y;
+         vec2 d0 = - texelSize;
+         vec2 d1 =   texelSize;
 
          float value = (
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx0, dy0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0, dy0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx1, dy0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx0, 0.0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy, shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx1, 0.0), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx0, dy1), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0, dy1), shadowCoord .z) +
-            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (dx1, dy1), shadowCoord .z)
-         ) * ( 1.0 / 9.0 );
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + d0,                  shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0,   d0 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d1 .x, d0 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d0 .x, 0.0),   shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy,                       shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d1 .x, 0.0),   shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (d0 .x, d1 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + vec2 (0.0,   d1 .y), shadowCoord .z) +
+            texture2DShadowLerp (index, texelSize, float (shadowMapSize), shadowCoord .xy + d1,                  shadowCoord .z)
+         ) * (1.0 / 9.0);
 
          return light .shadowIntensity * value;
 

package/src/x_ite/Base/X3DBaseNode.js

@@ -242,6 +242,8 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    },
    setup: function ()
    {
+      Object .freeze (this [_type]);
+
       for (const field of this [_fields])
          field .setTainted (false);
 
@@ -502,14 +504,11 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    },
    hasRoutes: function ()
    {
-      ///  Returns true if there are any routes from or to fields of this node otherwise false.
+      ///  Returns true if there are any routes from or to fields of this node, otherwise false.
 
       for (const field of this [_fields])
       {
-         if (field .getInputRoutes () .size)
-            return true;
-
-         if (field .getOutputRoutes () .size)
+         if (field .getInputRoutes () .size || field .getOutputRoutes () .size)
             return true;
       }
 

package/src/x_ite/Base/X3DObject.js

@@ -217,7 +217,7 @@ Object .assign (X3DObject,
    })(),
    getInterestId: function (callbackName, object)
    {
-      return `${this .getId (object)}.${this .getId (object [callbackName])}`;
+      return this .getId (object) + "." + this .getId (object [callbackName]);
    },
 });
 

package/src/x_ite/Base/X3DObjectArrayField.js

@@ -134,7 +134,7 @@ function X3DObjectArrayField (value)
    if (value [0] instanceof Array)
       value = value [0];
 
-   X3DObjectArrayField .prototype .push .apply (this, value);
+   this .push (... value);
 
    return proxy;
 }
@@ -164,8 +164,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          copy   = target .create (),
          array  = target .getValue ();
 
-      X3DObjectArrayField .prototype .push .apply (copy, array);
-
+      copy .push (... array);
       copy .setModificationTime (0);
 
       return copy;
@@ -323,47 +322,17 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          args .push (field);
       }
 
-      Array .prototype .splice .call (target .getValue (), index, 0, ... args);
-
+      target .getValue () .splice (index, 0, ... args);
       target .addEvent ();
    },
    remove: function (first, last, value)
    {
       const
          target = this [_target],
-         array  = target .getValue ();
-
-      if (typeof value === "function")
-      {
-         first = array .findIndex ((current, index) => index >= first && value (current .valueOf ()))
-
-         if (first !== -1)
-         {
-            for (let i = first; ++ i < last; )
-            {
-               const current = array [i];
-
-               if (!value (current .valueOf ()))
-               {
-                  const tmp = array [first];
-
-                  array [first ++] = current;
-                  array [i]        = tmp;
-               }
-            }
-         }
-         else
-         {
-            first = last;
-         }
-
-         if (first !== last)
-            target .addEvent ();
-
-         return first;
-      }
+         array  = target .getValue (),
+         cmp    = typeof value === "function" ? value : v => v === value;
 
-      first = array .findIndex ((current, index) => index >= first && current .equals (value))
+      first = array .findIndex ((current, index) => index >= first && cmp (current .valueOf ()));
 
       if (first !== -1)
       {
@@ -371,7 +340,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          {
             const current = array [i];
 
-            if (!current .equals (value))
+            if (!cmp (current .valueOf ()))
             {
                const tmp = array [first];
 

package/src/x_ite/Base/X3DTypedArrayField.js

@@ -179,7 +179,7 @@ function X3DTypedArrayField (args)
       this [_tmp]   = [ ]; // Array with components size.
    }
 
-   X3DTypedArrayField .prototype .push .call (this, ... args);
+   this .push (... args);
 
    return proxy;
 }
@@ -233,7 +233,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       copy [_length] = target [_length];
 
-      X3DArrayField .prototype .set .call (copy, copyArray, target [_length]);
+      X3DArrayField .prototype .set .call (copy, copyArray);
 
       copy .setModificationTime (0);
 

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.7.8";
+export default "8.7.9";

package/src/x_ite/Browser/X3DBrowser.js

@@ -254,11 +254,19 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    })(),
    getSupportedNode: function (typeName)
    {
-      return SupportedNodes .getType (String (typeName));
+      return SupportedNodes .getNodeTypes () .get (String (typeName));
    },
    getSupportedNodes: function ()
    {
-      return SupportedNodes .getTypes ();
+      return SupportedNodes .getNodeTypes ();
+   },
+   getAbstractNode: function (typeName)
+   {
+      return SupportedNodes .getAbstractNodeTypes () .get (String (typeName));
+   },
+   getAbstractNodes: function ()
+   {
+      return SupportedNodes .getAbstractNodeTypes ();
    },
    createScene: function (profile, component1 /*, ...*/)
    {

package/src/x_ite/Components/Core/X3DNode.js

@@ -77,7 +77,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             const namedNode = executionContext .getNamedNodes () .get (this .getName ());
 
             if (namedNode)
-               return namedNode;
+               return namedNode .getValue ();
          }
 
          // Create copy.
@@ -110,7 +110,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                      }
                      catch (error)
                      {
-                        console .error (error .message);
+                        console .error (error);
                      }
                   }
                }
@@ -135,7 +135,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             }
             catch (error)
             {
-               console .log (error .message);
+               console .error (error);
             }
          }
 
@@ -1290,7 +1290,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             const parentContext = executionContext .getExecutionContext ();
 
-            for (const importedNode of parentContext .getImportedNodes ())
+            for (const importedNode of [... parentContext .getImportedNodes ()])
             {
                try
                {
@@ -1306,7 +1306,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
          // Remove exported node if any.
 
-         for (const exportedNode of executionContext .getExportedNodes ())
+         for (const exportedNode of [... executionContext .getExportedNodes ()])
          {
             if (exportedNode .getLocalNode () === this)
                executionContext .removeExportedNode (exportedNode .getExportedName ());
@@ -1317,20 +1317,20 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       for (const firstParent of new Set (this .getParents ()))
       {
-         if (firstParent instanceof Fields .SFNode)
+         if (!(firstParent instanceof Fields .SFNode))
+            continue;
+
+         for (const secondParent of new Set (firstParent .getParents ()))
          {
-            for (const secondParent of new Set (firstParent .getParents ()))
-            {
-               if (secondParent instanceof Fields .MFNode)
-               {
-                  const length = secondParent .length;
+            if (!(secondParent instanceof Fields .MFNode))
+               continue;
 
-                  secondParent .erase (secondParent .remove (0, length, firstParent), length);
-               }
-            }
+            const length = secondParent .length;
 
-            firstParent .setValue (null);
+            secondParent .erase (secondParent .remove (0, length, firstParent .valueOf ()), length);
          }
+
+         firstParent .setValue (null);
       }
 
       // Call super.dispose, where fields get disposed.

package/src/x_ite/Components/Core.js

@@ -84,9 +84,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/EnvironmentalEffects.js

@@ -70,9 +70,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/EnvironmentalSensor.js

@@ -64,9 +64,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Followers.js

@@ -90,9 +90,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Geometry3D.js

@@ -70,9 +70,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

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

@@ -709,9 +709,7 @@ function remove (array, first, last, range, rfirst, rlast)
    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 array .remove (first, last, value => set .has (value));
 }
 
 export default X3DGroupingNode;

package/src/x_ite/Components/Grouping.js

@@ -72,9 +72,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Interpolation.js

@@ -84,9 +84,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Layering.js

@@ -66,9 +66,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Lighting.js

@@ -66,9 +66,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

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

@@ -162,9 +162,7 @@ function remove (array, first, last, range, rfirst, rlast)
    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 array .remove (first, last, value => set .has (value));
 }
 
 export default Contour2D;

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

@@ -178,9 +178,7 @@ function remove (array, first, last, range, rfirst, rlast)
    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 array .remove (first, last, value => set .has (value));
 }
 
 export default NurbsSet;

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

@@ -169,9 +169,7 @@ function remove (array, first, last, range, rfirst, rlast)
    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 array .remove (first, last, value => set .has (value));
 }
 
 export default NurbsTrimmedSurface;

package/src/x_ite/Components/Navigation.js

@@ -72,9 +72,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Networking.js

@@ -66,9 +66,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/PointingDeviceSensor.js

@@ -70,9 +70,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Rendering.js

@@ -98,9 +98,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Scripting/Script.js

@@ -353,13 +353,6 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
 
       this .context = this .getContext (sourceText);
 
-      // Call initialize function.
-
-      const initialize = this .context .get ("initialize");
-
-      if (typeof initialize === "function")
-         this .call__ (initialize, "initialize");
-
       // Connect shutdown.
 
       const shutdown = this .context .get ("shutdown");
@@ -407,6 +400,13 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
             }
          }
       }
+
+      // Call initialize function.
+
+      const initialize = this .context .get ("initialize");
+
+      if (typeof initialize === "function")
+         this .call__ (initialize, "initialize");
    },
    call__: function (callback, name)
    {