x_ite 8.6.13 → 8.6.14

package/src/x_ite/Components/Sound/Sound.js

@@ -115,7 +115,7 @@ Sound .prototype = Object .assign (Object .create (X3DSoundNode .prototype),
    {
       X3DSoundNode .prototype .initialize .call (this);
 
-      this .isLive ()  .addInterest ("set_live__", this);
+      this .getLive ()  .addInterest ("set_live__", this);
       this ._traversed .addInterest ("set_live__", this);
 
       this ._source .addInterest ("set_source__", this);
@@ -144,7 +144,7 @@ Sound .prototype = Object .assign (Object .create (X3DSoundNode .prototype),
    },
    set_live__: function ()
    {
-      if (this .isLive () .getValue () && this ._traversed .getValue ())
+      if (this .getLive () .getValue () && this ._traversed .getValue ())
       {
          this .getBrowser () .sensorEvents () .addInterest ("update", this);
       }

package/src/x_ite/Components/Text/Text.js

@@ -118,7 +118,7 @@ Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
    {
        X3DGeometryNode .prototype .set_live__ .call (this);
 
-      if (this .isLive () .getValue ())
+      if (this .getLive () .getValue ())
          this .getBrowser () .getBrowserOptions () ._PrimitiveQuality .addInterest ("requestRebuild", this);
       else
          this .getBrowser () .getBrowserOptions () ._PrimitiveQuality .removeInterest ("requestRebuild", this);

package/src/x_ite/Components/Texturing/ImageTexture.js

@@ -144,7 +144,7 @@ ImageTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
    setError: function (event)
    {
       if (this .URL .protocol !== "data:")
-         console .warn ("Error loading image:", decodeURI (this .URL .href), event .type);
+         console .warn (`Error loading image '${decodeURI (this .URL .href)}'`, event .type);
 
       this .loadNext ();
    },
@@ -153,7 +153,7 @@ ImageTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
       if (DEBUG)
       {
          if (this .URL .protocol !== "data:")
-            console .info ("Done loading image:", decodeURI (this .URL .href));
+            console .info (`Done loading image '${decodeURI (this .URL .href)}'`);
       }
 
       try

package/src/x_ite/Components/Texturing/MovieTexture.js

@@ -198,7 +198,7 @@ MovieTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
    setError: function (event)
    {
       if (this .URL .protocol !== "data:")
-         console .warn ("Error loading movie:", decodeURI (this .URL .href), event .type);
+         console .warn (`Error loading movie '${decodeURI (this .URL .href)}'`, event .type);
 
       this .loadNext ();
    },
@@ -207,7 +207,7 @@ MovieTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
       if (DEBUG)
       {
          if (this .URL .protocol !== "data:")
-            console .info ("Done loading movie:", decodeURI (this .URL .href));
+            console .info (`Done loading movie '${decodeURI (this .URL .href)}'`);
       }
 
       try

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

@@ -144,7 +144,7 @@ ImageTextureAtlas .prototype = Object .assign (Object .create (X3DTexture3DNode
    setError: function (event)
    {
       if (this .URL .protocol !== "data:")
-         console .warn ("Error loading image:", decodeURI (this .URL .href), event .type);
+         console .warn (`Error loading image '${decodeURI (this .URL .href)}'`, event .type);
 
       this .loadNext ();
    },
@@ -153,7 +153,7 @@ ImageTextureAtlas .prototype = Object .assign (Object .create (X3DTexture3DNode
       if (DEBUG)
       {
          if (this .URL .protocol !== "data:")
-            console .info ("Done loading image:", decodeURI (this .URL .href));
+            console .info (`Done loading image '${decodeURI (this .URL .href)}'`);
       }
 
       try

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

@@ -148,7 +148,7 @@ TimeSensor .prototype = Object .assign (Object .create (X3DSensorNode .prototype
    {
       this .setRange (this ._range [0], this ._range [1], this ._range [2]);
 
-      if (this .isLive () .getValue ())
+      if (this .getLive () .getValue ())
       {
          this ._fraction_changed = this .fraction;
          this ._time             = this .getBrowser () .getCurrentTime ();

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

@@ -75,7 +75,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
    constructor: X3DTimeDependentNode,
    initialize: function ()
    {
-      this .isLive ()   .addInterest ("set_live__", this);
+      this .getLive ()  .addInterest ("set_live__", this);
       this ._isEvenLive .addInterest ("set_live__", this);
 
       this ._initialized .addInterest ("set_loop__",       this);
@@ -101,7 +101,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
    {
       ///  Determines the live state of this node.
 
-      return this .getLive () && (this .getExecutionContext () .isLive () .getValue () || this ._isEvenLive .getValue ());
+      return this .isLive () && (this .getExecutionContext () .getLive () .getValue () || this ._isEvenLive .getValue ());
    },
    getElapsedTime: function ()
    {
@@ -115,7 +115,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
    },
    set_live__: function ()
    {
-      if (this .isLive () .getValue () || this ._isEvenLive .getValue ())
+      if (this .getLive () .getValue () || this ._isEvenLive .getValue ())
       {
          if (this .disabled)
          {
@@ -241,7 +241,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
 
          this .set_start ();
 
-         if (this .isLive () .getValue ())
+         if (this .getLive () .getValue ())
          {
             this .getBrowser () .timeEvents () .addInterest ("set_time" ,this);
          }
@@ -261,7 +261,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
          if (this .pauseTimeValue !== this .getBrowser () .getCurrentTime ())
             this .pauseTimeValue = this .getBrowser () .getCurrentTime ();
 
-         if (this .isLive () .getValue ())
+         if (this .getLive () .getValue ())
             this .real_pause ();
       }
    },
@@ -282,7 +282,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
          if (this .resumeTimeValue !== this .getBrowser () .getCurrentTime ())
             this .resumeTimeValue = this .getBrowser () .getCurrentTime ();
 
-         if (this .isLive () .getValue ())
+         if (this .getLive () .getValue ())
             this .real_resume ();
       }
    },

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

@@ -60,14 +60,14 @@ function X3DVolumeDataNode (executionContext)
 
    this .addType (X3DConstants .X3DVolumeDataNode);
 
-   this .proximitySensorNode      = executionContext .createNode ("ProximitySensor",     false);
-   this .transformNode            = executionContext .createNode ("Transform",           false);
-   this .shapeNode                = executionContext .createNode ("Shape",               false);
-   this .appearanceNode           = executionContext .createNode ("Appearance",          false);
-   this .textureTransformNode     = executionContext .createNode ("TextureTransform3D",  false);
-   this .geometryNode             = executionContext .createNode ("QuadSet",             false);
-   this .textureCoordinateNode    = executionContext .createNode ("TextureCoordinate3D", false);
-   this .coordinateNode           = executionContext .createNode ("Coordinate",          false);
+   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);
    this .textureNormalMatrixArray = new Float32Array (9);
 

package/src/x_ite/Execution/BindableList.js

@@ -71,25 +71,24 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
    },
    getBound: function (name)
    {
-      if (this .array .length === 1)
+      const length = this .array .length;
+
+      if (length === 1)
          return this .array [0]; // Return default viewpoint.
 
-      const
-         enableInlineBindables = false,
-         mainScene             = this .getMainScene ();
+      const enableInlineBindables = false;
 
       if (name)
       {
          // Return first viewpoint with @name.
 
-         for (let i = 1, length = this .array .length; i < length; ++ i)
+         for (let i = 1; i < length; ++ i)
          {
             const
-               node      = this .array [i],
-               outerNode = node .getExecutionContext () .getOuterNode (),
-               scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
+               node  = this .array [i],
+               scene = node .getExecutionContext () .getOuterNode () ?.getScene () ?? node .getScene ();
 
-            if (!enableInlineBindables && scene !== mainScene)
+            if (!enableInlineBindables && !scene .isMainScene ())
                continue;
 
             if (node .getName () == name)
@@ -99,14 +98,13 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
 
       // Return first bound viewpoint in scene.
 
-      for (let i = 1, length = this .array .length; i < length; ++ i)
+      for (let i = 1; i < length; ++ i)
       {
          const
-            node      = this .array [i],
-            outerNode = node .getExecutionContext () .getOuterNode (),
-            scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
+            node  = this .array [i],
+            scene = node .getExecutionContext () .getOuterNode () ?.getScene () ?? node .getScene ();
 
-         if (!enableInlineBindables && scene !== mainScene)
+         if (!enableInlineBindables && !scene .isMainScene ())
             continue;
 
          if (node ._isBound .getValue ())
@@ -115,14 +113,13 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
 
       // Return first viewpoint in scene.
 
-      for (let i = 1, length = this .array .length; i < length; ++ i)
+      for (let i = 1; i < length; ++ i)
       {
          const
-            node      = this .array [i],
-            outerNode = node .getExecutionContext () .getOuterNode (),
-            scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
+            node  = this .array [i],
+            scene = node .getExecutionContext () .getOuterNode () ?.getScene () ?? node .getScene ();
 
-         if (!enableInlineBindables && scene !== mainScene)
+         if (!enableInlineBindables && !scene .isMainScene ())
             continue;
 
          return node;

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -72,7 +72,7 @@ const
    _routes         = Symbol (),
    _outerNode      = Symbol ();
 
-function X3DExecutionContext (executionContext)
+function X3DExecutionContext (executionContext, outerNode = null)
 {
    X3DBaseNode .call (this, executionContext);
 
@@ -90,6 +90,7 @@ function X3DExecutionContext (executionContext)
    this ._rootNodes .setAccessType (X3DConstants .initializeOnly);
    this ._rootNodes .addCloneCount (1);
 
+   this [_outerNode]      = outerNode;
    this [_namedNodes]     = new NamedNodesArray ();
    this [_importedNodes]  = new ImportedNodesArray ();
    this [_protos]         = new ProtoDeclarationArray ();
@@ -119,16 +120,11 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return "X3DExecutionContext";
    },
-   [_outerNode]: null,
    getOuterNode: function ()
    {
       // Can be either of type X3DProtoDeclaration or X3DPrototypeInstance, or null.
       return this [_outerNode];
    },
-   setOuterNode: function (value)
-   {
-      this [_outerNode] = value;
-   },
    getSpecificationVersion: function ()
    {
       return this .getExecutionContext () .getSpecificationVersion ();
@@ -149,6 +145,10 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this .getExecutionContext () .getComponents ();
    },
+   hasComponent: function (componentName)
+   {
+      return this .getExecutionContext () .hasComponent (componentName);
+   },
    fromUnit: function (category, value)
    {
       return this .getExecutionContext () .fromUnit (category, value);
@@ -161,7 +161,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this .getExecutionContext () .getUnits ();
    },
-   createNode: function (typeName, setup = true)
+   createNode: function (typeName, { setup = true, warn = true } = { })
    {
       typeName = String (typeName);
 
@@ -180,6 +180,9 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          if (this .getSpecificationVersion () > specificationRange [1])
             return null;
 
+         if (warn && !this .hasComponent (Type .prototype .getComponentName ()))
+            console .warn (`Node type '${typeName}' does not match component/profile statements in '${this .getWorldURL ()}'.`);
+
          return new Type (this);
       }
       else
@@ -187,15 +190,18 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          const Type = this .getBrowser () .getSupportedNode (typeName);
 
          if (! Type)
-            throw new Error ("Unknown node type '" + typeName + "'.");
+            throw new Error (`Unknown node type '${typeName}'.`);
 
          const specificationRange = Type .prototype .getSpecificationRange ();
 
          if (this .getSpecificationVersion () < specificationRange [0])
-            throw new Error ("Node type '" + typeName + "' does not match specification version.");
+            throw new Error (`Node type '${typeName}' does not match specification version in '${this .getWorldURL ()}.`);
 
          if (this .getSpecificationVersion () > specificationRange [1])
-            throw new Error ("Node type '" + typeName + "' does not match specification version.");
+            throw new Error (`Node type '${typeName}' does not match specification version in '${this .getWorldURL ()}.`);
+
+         if (warn && !this .hasComponent (Type .prototype .getComponentName ()))
+            console .warn (`Node type '${typeName}' does not match component/profile statements in '${this .getWorldURL ()}'.`);
 
          const baseNode = new Type (this);
 
@@ -204,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 } = { })
    {
       name = String (name);
 
@@ -215,12 +221,12 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          const proto = executionContext .protos .get (name);
 
          if (proto)
-            return proto .createInstance (this, setup);
+            return proto .createInstance (this, { setup: setup });
 
          const externproto = executionContext .externprotos .get (name);
 
          if (externproto)
-            return externproto .createInstance (this, setup);
+            return externproto .createInstance (this, { setup: setup });
 
          if (executionContext .isScene ())
             break;

package/src/x_ite/Execution/X3DScene.js

@@ -169,6 +169,10 @@ 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

@@ -136,29 +136,37 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    addCloneCount: function (count)
    {
-      this [_cloneCount] += count;
+      const target = this .getTarget ();
 
-      for (const element of this .getValue ())
+      target [_cloneCount] += count;
+
+      for (const element of target .getValue ())
          element .addCloneCount (count);
    },
    removeCloneCount: function (count)
    {
-      this [_cloneCount] -= count;
+      const target = this .getTarget ();
+
+      target [_cloneCount] -= count;
 
-      for (const element of this .getValue ())
+      for (const element of target .getValue ())
          element .removeCloneCount (count);
    },
    addChildObject: function (value)
    {
-      X3DObjectArrayField .prototype .addChildObject .call (this, value);
+      const target = this .getTarget ();
 
-      value .addCloneCount (this [_cloneCount]);
+      X3DObjectArrayField .prototype .addChildObject .call (target, value);
+
+      value .addCloneCount (target [_cloneCount]);
    },
    removeChildObject: function (value)
    {
-      X3DObjectArrayField .prototype .removeChildObject .call (this, value);
+      const target = this .getTarget ();
+
+      X3DObjectArrayField .prototype .removeChildObject .call (target, value);
 
-      value .removeCloneCount (this [_cloneCount]);
+      value .removeCloneCount (target [_cloneCount]);
    },
    toStream: function (generator)
    {
@@ -210,11 +218,13 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    toVRMLString: function ()
    {
-      this .addCloneCount (1);
+      const target = this .getTarget ();
 
-      const string = X3DObjectArrayField .prototype .toVRMLString .call (this);
+      target .addCloneCount (1);
 
-      this .removeCloneCount (1);
+      const string = X3DObjectArrayField .prototype .toVRMLString .call (target);
+
+      target .removeCloneCount (1);
 
       return string;
    },
@@ -268,23 +278,27 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    toXMLString: function ()
    {
-      this .addCloneCount (1);
+      const target = this .getTarget ();
+
+      target .addCloneCount (1);
 
-      const string = X3DObjectArrayField .prototype .toXMLString .call (this);
+      const string = X3DObjectArrayField .prototype .toXMLString .call (target);
 
-      this .removeCloneCount (1);
+      target .removeCloneCount (1);
 
       return string;
    },
    toXMLStream: function (generator)
    {
-      const length = this .length;
+      const
+         target = this .getTarget (),
+         length = target .length;
 
       if (length)
       {
          generator .EnterScope ();
 
-         const array = this .getValue ();
+         const array = target .getValue ();
 
          for (let i = 0, n = length - 1; i < n; ++ i)
          {
@@ -343,11 +357,13 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    toJSONStream: function (generator)
    {
-      const length = this .length;
+      const
+         target = this .getTarget (),
+         length = target .length;
 
       if (length)
       {
-         const array = this .getValue ();
+         const array = target .getValue ();
 
          generator .EnterScope ();
 
@@ -391,9 +407,11 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    dispose: function ()
    {
-      this .resize (0);
+      const target = this .getTarget ();
 
-      X3DObjectArrayField .prototype .dispose .call (this);
+      target .resize (0);
+
+      X3DObjectArrayField .prototype .dispose .call (target);
    },
 });
 
@@ -434,11 +452,13 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
    },
    toXMLStream: function (generator)
    {
-      const length = this .length;
+      const
+         target = this .getTarget (),
+         length = target .length;
 
       if (length)
       {
-         const value = this .getValue ();
+         const value = target .getValue ();
 
          for (let i = 0, n = length - 1; i < n; ++ i)
          {

package/src/x_ite/Fields/SFNode.js

@@ -51,7 +51,7 @@ import Generator    from "../InputOutput/Generator.js";
 import SFNodeCache  from "./SFNodeCache.js";
 
 const
-   _target     = Symbol (),
+   _target     = Symbol .for ("X_ITE.SFNode.target"),
    _proxy      = Symbol (),
    _cloneCount = Symbol ();
 
@@ -469,12 +469,9 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    dispose: function ()
    {
-      const
-         target = this [_target],
-         value  = target .getValue ();
+      const target = this [_target];
 
-      if (value)
-         value .dispose ();
+      target .setValue (null);
 
       X3DField .prototype .dispose .call (target);
    },

package/src/x_ite/Fields/SFNodeCache.js

@@ -45,32 +45,47 @@
  *
  ******************************************************************************/
 
-import SFNode from "./SFNode.js";
+import SFNode   from "./SFNode.js";
+import X3DField from "../Base/X3DField.js";
 
-const SFNodeCache =
+const cache = new WeakMap ();
+
+class SFNodeCache
 {
-   get: (function ()
+   static get (baseNode)
    {
-      const cache = new WeakMap ();
+      const node = cache .get (baseNode);
 
-      return function (baseNode)
+      if (node)
+      {
+         return node;
+      }
+      else
       {
-         const node = cache .get (baseNode);
+         const node = new SFNode (baseNode);
+
+         node .dispose = dispose;
+
+         cache .set (baseNode, node);
+
+         return node;
+      }
+   }
+}
+
+const _target = Symbol .for ("X_ITE.SFNode.target");
+
+function dispose ()
+{
+   const
+      target = this [_target],
+      value  = target .getValue ();
 
-         if (node)
-         {
-            return node;
-         }
-         else
-         {
-            const node = new SFNode (baseNode);
+   cache .delete (value);
 
-            cache .set (baseNode, node);
+   value ?.dispose ();
 
-            return node;
-         }
-      };
-   })(),
-};
+   X3DField .prototype .dispose .call (target);
+}
 
 export default SFNodeCache;

package/src/x_ite/InputOutput/FileLoader.js

@@ -156,6 +156,8 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    },
    set_initLoadCount__: function (scene, success, error, field)
    {
+      // Wait for extern protos to be loaded.
+
       if (field .getValue ())
          return;
 
@@ -163,22 +165,28 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       delete scene .loader;
 
-      try
-      {
-         success (scene);
-      }
-      catch (exception)
+      // Wait for instances to be created.
+
+      setTimeout (function ()
       {
-         if (error)
-            error (exception);
-         else
-            throw exception;
-      }
+         try
+         {
+            success (scene);
+         }
+         catch (exception)
+         {
+            if (error)
+               error (exception);
+            else
+               throw exception;
+         }
+      },
+      0);
 
       if (DEBUG)
       {
          if (this .URL .protocol !== "data:")
-            console .info ("Done loading scene " + decodeURI (this .URL .href));
+            console .info (`Done loading scene '${decodeURI (this .URL .href)}'`);
       }
    },
    createX3DFromURL: function (url, parameter, callback, bindViewpoint, foreign)
@@ -283,7 +291,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       const
          options     = { cache: this .node .getCache () ? "default" : "reload" },
          response    = this .handleErrors (await fetch (this .URL .href, options)),
-         contentType = response .headers .get ("content-type")?.replace (/;.*$/, "");
+         contentType = response .headers .get ("content-type") ?.replace (/;.*$/, "");
 
       if (this .foreign)
       {
@@ -323,9 +331,9 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    error: function (exception)
    {
       if (this .URL .protocol === "data:")
-         console .warn ("Couldn't load URL 'data':", exception .message);
+         console .warn (`Couldn't load data URL: ${exception .message}`);
       else
-         console .warn ("Couldn't load URL '" + decodeURI (this .URL .href) + "':", exception .message);
+         console .warn (`Couldn't load URL '${decodeURI (this .URL .href)}': ${exception .message}`);
 
       if (DEBUG)
          console .error (exception);