x_ite 8.6.17 → 8.6.18

package/src/x_ite/Components/Texturing3D/ImageTextureAtlas.js

@@ -109,13 +109,13 @@ ImageTextureAtlas .prototype = Object .assign (Object .create (X3DTexture3DNode
       this .image .on ("abort error", this .setError .bind (this));
       this .image .prop ("crossOrigin", "Anonymous");
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .clearTexture ();
    },
-   loadNow: function ()
+   loadData: function ()
    {
       this .urlStack .setValue (this ._url);
       this .loadNext ();

package/src/x_ite/Components/Time/X3DTimeDependentNode.js

@@ -63,10 +63,7 @@ function X3DTimeDependentNode (executionContext)
    this .start           = 0;
    this .pause           = 0;
    this .pauseInterval   = 0;
-   this .startTimeout    = null;
-   this .pauseTimeout    = null;
-   this .resumeTimeout   = null;
-   this .stopTimeout     = null;
+   this .timeouts        = new Map ();
    this .disabled        = false;
 }
 
@@ -165,13 +162,13 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
 
       if (this ._enabled .getValue ())
       {
-         this .removeTimeout ("startTimeout");
+         this .removeTimeout ("start");
 
          if (this .startTimeValue <= this .getBrowser () .getCurrentTime ())
             this .do_start ();
 
          else
-            this .addTimeout ("startTimeout", "do_start", this .startTimeValue);
+            this .addTimeout ("start", "do_start", this .startTimeValue);
       }
    },
    set_pauseTime__: function ()
@@ -180,7 +177,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
 
       if (this ._enabled .getValue ())
       {
-         this .removeTimeout ("pauseTimeout");
+         this .removeTimeout ("pause");
 
          if (this .pauseTimeValue <= this .resumeTimeValue)
             return;
@@ -189,7 +186,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
             this .do_pause ();
 
          else
-            this .addTimeout ("pauseTimeout", "do_pause", this .pauseTimeValue);
+            this .addTimeout ("pause", "do_pause", this .pauseTimeValue);
       }
    },
    set_resumeTime__: function ()
@@ -198,7 +195,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
 
       if (this ._enabled .getValue ())
       {
-         this .removeTimeout ("resumeTimeout");
+         this .removeTimeout ("resume");
 
          if (this .resumeTimeValue <= this .pauseTimeValue)
             return;
@@ -207,7 +204,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
             this .do_resume ();
 
          else
-            this .addTimeout ("resumeTimeout", "do_resume", this .resumeTimeValue);
+            this .addTimeout ("resume", "do_resume", this .resumeTimeValue);
       }
    },
    set_stopTime__: function ()
@@ -216,7 +213,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
 
       if (this ._enabled .getValue ())
       {
-         this .removeTimeout ("stopTimeout");
+         this .removeTimeout ("stop");
 
          if (this .stopTimeValue <= this .startTimeValue)
             return;
@@ -225,7 +222,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
             this .do_stop ();
 
          else
-            this .addTimeout ("stopTimeout", "do_stop", this .stopTimeValue);
+            this .addTimeout ("stop", "do_stop", this .stopTimeValue);
       }
    },
    do_start: function ()
@@ -319,24 +316,29 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
          this .getBrowser () .timeEvents () .removeInterest ("set_time" ,this);
       }
    },
-   timeout: function (callback)
-   {
-      if (this ._enabled .getValue ())
-      {
-         this .getBrowser () .advanceTime ();
-
-         this [callback] ();
-      }
-   },
    addTimeout: function (name, callback, time)
    {
       this .removeTimeout (name);
-      this [name] = setTimeout (this .timeout .bind (this, callback), (time - this .getBrowser () .getCurrentTime ()) * 1000);
+
+      this .timeouts .set (name, setTimeout (this .processTimeout .bind (this, callback), (time - this .getBrowser () .getCurrentTime ()) * 1000));
    },
    removeTimeout: function (name)
    {
-      clearTimeout (this [name]);
-      this [name] = null;
+      clearTimeout (this .timeouts .get (name));
+
+      this .timeouts .delete (name);
+   },
+   processTimeout: function (callback)
+   {
+      if (!this ._enabled .getValue ())
+         return;
+
+      if (!(this .getLive () .getValue () || this ._isEvenLive .getValue ()))
+         return;
+
+      this .getBrowser () .advanceTime ();
+
+      this [callback] ();
    },
    set_loop: Function .prototype,
    set_start: Function .prototype,
@@ -344,7 +346,11 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
    set_resume: Function .prototype,
    set_stop: Function .prototype,
    set_time: Function .prototype,
-   dispose: Function .prototype,
+   dispose: function ()
+   {
+      for (const name of [... this .timeouts .keys ()])
+         this .removeTimeout (name);
+   },
 });
 
 export default X3DTimeDependentNode;

package/src/x_ite/Components/VolumeRendering/IsoSurfaceVolumeData.js

@@ -158,7 +158,7 @@ IsoSurfaceVolumeData .prototype = Object .assign (Object .create (X3DVolumeDataN
       if (this .voxelsNode)
          this .getAppearance () ._texture = this ._voxels;
       else
-         this .getAppearance () ._texture = this .getBrowser () .getDefaultVoxels (this .getExecutionContext ());
+         this .getAppearance () ._texture = this .getBrowser () .getDefaultVoxels ();
    },
    createShader: function (options, vs, fs)
    {

package/src/x_ite/Components/VolumeRendering/SegmentedVolumeData.js

@@ -160,7 +160,7 @@ SegmentedVolumeData .prototype = Object .assign (Object .create (X3DVolumeDataNo
       if (this .voxelsNode)
          this .getAppearance () ._texture = this ._voxels;
       else
-         this .getAppearance () ._texture = this .getBrowser () .getDefaultVoxels (this .getExecutionContext ());
+         this .getAppearance () ._texture = this .getBrowser () .getDefaultVoxels ();
    },
    createShader: function (options, vs, fs)
    {

package/src/x_ite/Components/VolumeRendering/VolumeData.js

@@ -136,7 +136,7 @@ VolumeData .prototype = Object .assign (Object .create (X3DVolumeDataNode .proto
       if (this .voxelsNode)
          this .getAppearance () ._texture = this ._voxels;
       else
-         this .getAppearance () ._texture = this .getBrowser () .getDefaultVoxels (this .getExecutionContext ());
+         this .getAppearance () ._texture = this .getBrowser () .getDefaultVoxels ();
    },
    createShader: function (options, vs, fs)
    {

package/src/x_ite/Components/VolumeRendering/X3DVolumeDataNode.js

@@ -60,15 +60,17 @@ function X3DVolumeDataNode (executionContext)
 
    this .addType (X3DConstants .X3DVolumeDataNode);
 
-   this .proximitySensorNode      = executionContext .createNode ("ProximitySensor",     { setup: false, warn: false });
-   this .transformNode            = executionContext .createNode ("Transform",           { setup: false, warn: false });
-   this .shapeNode                = executionContext .createNode ("Shape",               { setup: false, warn: false });
-   this .appearanceNode           = executionContext .createNode ("Appearance",          { setup: false, warn: false });
-   this .textureTransformNode     = executionContext .createNode ("TextureTransform3D",  { setup: false, warn: false });
-   this .geometryNode             = executionContext .createNode ("QuadSet",             { setup: false, warn: false });
-   this .textureCoordinateNode    = executionContext .createNode ("TextureCoordinate3D", { setup: false, warn: false });
-   this .coordinateNode           = executionContext .createNode ("Coordinate",          { setup: false, warn: false });
-   this .volumeMaterialNode       = new VolumeMaterial (executionContext, this);
+   const browser = this .getBrowser ();
+
+   this .proximitySensorNode      = browser .getPrivateScene () .createNode ("ProximitySensor",     false);
+   this .transformNode            = browser .getPrivateScene () .createNode ("Transform",           false);
+   this .shapeNode                = browser .getPrivateScene () .createNode ("Shape",               false);
+   this .appearanceNode           = browser .getPrivateScene () .createNode ("Appearance",          false);
+   this .textureTransformNode     = browser .getPrivateScene () .createNode ("TextureTransform3D",  false);
+   this .geometryNode             = browser .getPrivateScene () .createNode ("QuadSet",             false);
+   this .textureCoordinateNode    = browser .getPrivateScene () .createNode ("TextureCoordinate3D", false);
+   this .coordinateNode           = browser .getPrivateScene () .createNode ("Coordinate",          false);
+   this .volumeMaterialNode       = new VolumeMaterial (browser .getPrivateScene (), this);
    this .textureNormalMatrixArray = new Float32Array (9);
 
    this .setCameraObject (true);

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -105,7 +105,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       X3DBaseNode .prototype .initialize .call (this);
 
-      if (! this .isScene ())
+      if (!this .isScene ())
          this ._sceneGraph_changed .addInterest ("set_sceneGraph", this)
    },
    set_sceneGraph: function ()
@@ -141,13 +141,13 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this .getExecutionContext () .getProfile ();
    },
-   getComponents: function ()
+   hasComponent: function (name)
    {
-      return this .getExecutionContext () .getComponents ();
+      return this .getExecutionContext () .hasComponent (name);
    },
-   hasComponent: function (componentName)
+   getComponents: function ()
    {
-      return this .getExecutionContext () .hasComponent (componentName);
+      return this .getExecutionContext () .getComponents ();
    },
    fromUnit: function (category, value)
    {
@@ -161,7 +161,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this .getExecutionContext () .getUnits ();
    },
-   createNode: function (typeName, { setup = true, warn = true } = { })
+   createNode: function (typeName, setup = true /* non-public argument */)
    {
       typeName = String (typeName);
 
@@ -169,7 +169,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       {
          const Type = this .getBrowser () .getSupportedNode (typeName);
 
-         if (! Type)
+         if (!Type)
             return null;
 
          const specificationRange = Type .prototype .getSpecificationRange ();
@@ -180,7 +180,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          if (this .getSpecificationVersion () > specificationRange [1])
             return null;
 
-         if (warn && !this .hasComponent (Type .prototype .getComponentName ()))
+         if (!this .hasComponent (Type .prototype .getComponentName ()))
             console .warn (`Node type '${typeName}' does not match component/profile statements in '${this .getWorldURL ()}'.`);
 
          return new Type (this);
@@ -189,7 +189,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       {
          const Type = this .getBrowser () .getSupportedNode (typeName);
 
-         if (! Type)
+         if (!Type)
             throw new Error (`Unknown node type '${typeName}'.`);
 
          const specificationRange = Type .prototype .getSpecificationRange ();
@@ -200,7 +200,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          if (this .getSpecificationVersion () > specificationRange [1])
             throw new Error (`Node type '${typeName}' does not match specification version in '${this .getWorldURL ()}.`);
 
-         if (warn && !this .hasComponent (Type .prototype .getComponentName ()))
+         if (!this .hasComponent (Type .prototype .getComponentName ()))
             console .warn (`Node type '${typeName}' does not match component/profile statements in '${this .getWorldURL ()}'.`);
 
          const baseNode = new Type (this);
@@ -210,7 +210,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          return SFNodeCache .get (baseNode);
       }
    },
-   createProto: function (name, { setup = true } = { })
+   createProto: function (name, setup = true /* non-public argument */)
    {
       name = String (name);
 
@@ -221,12 +221,12 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          const proto = executionContext .protos .get (name);
 
          if (proto)
-            return proto .createInstance (this, { setup: setup });
+            return proto .createInstance (this, setup);
 
          const externproto = executionContext .externprotos .get (name);
 
          if (externproto)
-            return externproto .createInstance (this, { setup: setup });
+            return externproto .createInstance (this, setup);
 
          if (executionContext .isScene ())
             break;
@@ -251,7 +251,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       name = String (name);
       node = X3DCast (X3DConstants .X3DNode, node, false);
 
-      if (! node)
+      if (!node)
          throw new Error ("Couldn't update named node: node must be of type X3DNode.");
 
       if (node .getExecutionContext () !== this)
@@ -279,7 +279,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       const node = this [_namedNodes] .get (name);
 
-      if (! node)
+      if (!node)
          return;
 
       node .setName ("");
@@ -326,7 +326,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       exportedName = String (exportedName);
       importedName = importedName === undefined ? exportedName : String (importedName);
 
-      if (! inlineNode)
+      if (!inlineNode)
          throw new Error ("Node must be of type Inline node.");
 
       if (inlineNode .getExecutionContext () !== this)
@@ -354,7 +354,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       const importedNode = this [_importedNodes] .get (importedName);
 
-      if (! importedNode)
+      if (!importedNode)
          return;
 
       importedNode .dispose ();
@@ -400,7 +400,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       node = X3DCast (X3DConstants .X3DNode, node, false);
 
-      if (! node)
+      if (!node)
          throw new Error ("Couldn't get local name: node must be of type X3DNode.");
 
       if (node .getExecutionContext () === this)
@@ -441,7 +441,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       name = String (name);
 
-      if (! (proto instanceof X3DProtoDeclaration))
+      if (!(proto instanceof X3DProtoDeclaration))
          throw new Error ("Couldn't add proto declaration: proto must be of type X3DProtoDeclaration.");
 
       if (this [_protos] .get (name))
@@ -461,7 +461,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       name = String (name);
 
-      if (! (proto instanceof X3DProtoDeclaration))
+      if (!(proto instanceof X3DProtoDeclaration))
          throw new Error ("Couldn't add proto declaration: proto must be of type X3DProtoDeclaration.");
 
       name = String (name);
@@ -505,7 +505,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       name = String (name);
 
-      if (! (externproto instanceof X3DExternProtoDeclaration))
+      if (!(externproto instanceof X3DExternProtoDeclaration))
          throw new Error ("Couldn't add extern proto declaration: extern proto must be of type X3DExternProtoDeclaration.");
 
       if (this [_externprotos] .get (name))
@@ -525,7 +525,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       name = String (name);
 
-      if (! (externproto instanceof X3DExternProtoDeclaration))
+      if (!(externproto instanceof X3DExternProtoDeclaration))
          throw new Error ("Couldn't add extern proto declaration: extern proto must be of type X3DExternProtoDeclaration.");
 
       name = String (name);
@@ -561,10 +561,10 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       destinationNode  = X3DCast (X3DConstants .X3DNode, destinationNode, false);
       destinationField = String (destinationField);
 
-      if (! sourceNode)
+      if (!sourceNode)
          throw new Error ("Bad ROUTE specification: source node must be of type X3DNode.");
 
-      if (! destinationNode)
+      if (!destinationNode)
          throw new Error ("Bad ROUTE specification: destination node must be of type X3DNode.");
 
       // Imported nodes handling.
@@ -629,10 +629,10 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          sourceField      = sourceNode      .getField (sourceField),
          destinationField = destinationNode .getField (destinationField);
 
-         if (! sourceField .isOutput ())
+         if (!sourceField .isOutput ())
             throw new Error ("Field named '" + sourceField .getName () + "' in node named '" + sourceNode .getName () + "' of type " + sourceNode .getTypeName () + " is not an output field.");
 
-         if (! destinationField .isInput ())
+         if (!destinationField .isInput ())
             throw new Error ("Field named '" + destinationField .getName () + "' in node named '" + destinationNode .getName () + "' of type " + destinationNode .getTypeName () + " is not an input field.");
 
          if (sourceField .getType () !== destinationField .getType ())
@@ -665,7 +665,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       {
          route = this .getRoute .apply (this, arguments);
 
-         if (! route)
+         if (!route)
             return false;
       }
 
@@ -745,10 +745,10 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       destinationNode  = X3DCast (X3DConstants .X3DNode, destinationNode, false);
       destinationField = String (destinationField)
 
-      if (! sourceNode)
+      if (!sourceNode)
          throw new Error ("Bad ROUTE specification: sourceNode must be of type X3DNode.");
 
-      if (! destinationNode)
+      if (!destinationNode)
          throw new Error ("Bad ROUTE specification: destinationNode must be of type X3DNode.");
 
       sourceField      = sourceNode      .getField (sourceField);
@@ -930,9 +930,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    },
    dispose: function ()
    {
-      this ._rootNodes .dispose ();
-
-      for (const route of this [_routes])
+      for (const route of [... this [_routes]])
          this .deleteRoute (route);
 
       X3DBaseNode .prototype .dispose .call (this);

package/src/x_ite/Execution/X3DScene.js

@@ -153,15 +153,19 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    {
       return this [_profile];
    },
+   hasComponent: function (name)
+   {
+      return (this [_profile] ?.components .has (name) ?? true) || this [_components] .has (name);
+   },
    addComponent: function (component)
    {
       this [_components] .add (component .name, component);
 
       this ._components_changed = this .getBrowser () .getCurrentTime ();
    },
-   removeComponent: function (component)
+   removeComponent: function (name)
    {
-      this [_components] .remove (component .name);
+      this [_components] .remove (name);
 
       this ._components_changed = this .getBrowser () .getCurrentTime ();
    },
@@ -169,10 +173,6 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    {
       return this [_components];
    },
-   hasComponent: function (componentName)
-   {
-      return (this [_profile] ?.components .has (componentName) ?? true) || this [_components] .has (componentName);
-   },
    updateUnit: function (category, name, conversionFactor)
    {
       // Private function.

package/src/x_ite/Fields/ArrayFields.js

@@ -409,7 +409,8 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    {
       const target = this .getTarget ();
 
-      target .resize (0);
+      target .resize (0, undefined, true);
+      target .processInterests ();
 
       X3DObjectArrayField .prototype .dispose .call (target);
    },

package/src/x_ite/Fields/SFImage.js

@@ -147,7 +147,6 @@ function SFImage (width, height, comp, array)
 
    this .getValue () .getArray () .addParent (this);
    this .addInterest ("set_size__", this);
-   return this;
 }
 
 SFImage .prototype = Object .assign (Object .create (X3DField .prototype),

package/src/x_ite/Fields/SFNode.js

@@ -347,8 +347,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       target [_cloneCount] += count;
 
-      if (value)
-         value .addCloneCount (count);
+      value ?.addCloneCount (count);
    },
    removeCloneCount: function (count)
    {
@@ -358,8 +357,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       target [_cloneCount] -= count;
 
-      if (value)
-         value .removeCloneCount (count);
+      value ?.removeCloneCount (count);
    },
    getNodeUserData: function (key)
    {
@@ -471,7 +469,8 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const target = this [_target];
 
-      target .setValue (null);
+      target .set (null);
+      target .processInterests ();
 
       X3DField .prototype .dispose .call (target);
    },