x_ite 8.6.12 → 8.6.14

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

@@ -83,6 +83,10 @@ TextureCoordinateGenerator .prototype = Object .assign (Object .create (X3DSingl
    {
       return "texCoord";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSingleTextureCoordinateNode .prototype .initialize .call (this);

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

@@ -95,6 +95,10 @@ TextureProperties .prototype = Object .assign (Object .create (X3DNode .prototyp
    {
       return "textureProperties";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.0", "Infinity"];
+   },
    getBorderWidth: function ()
    {
       // https://stackoverflow.com/questions/27760277/webgl-border-color-shader?lq=1

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

@@ -88,6 +88,10 @@ TextureTransform .prototype = Object .assign (Object .create (X3DSingleTextureTr
    {
       return "textureTransform";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSingleTextureTransformNode .prototype .initialize .call (this);

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

@@ -88,6 +88,10 @@ ComposedTexture3D .prototype = Object .assign (Object .create (X3DTexture3DNode
    {
       return "texture";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DTexture3DNode .prototype .initialize .call (this);

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

@@ -91,6 +91,10 @@ ImageTexture3D .prototype = Object .assign (Object .create (X3DTexture3DNode .pr
    {
       return "texture";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DTexture3DNode .prototype .initialize .call (this);

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

@@ -96,6 +96,10 @@ ImageTextureAtlas .prototype = Object .assign (Object .create (X3DTexture3DNode
    {
       return "texture";
    },
+   getSpecificationRange: function ()
+   {
+      return ["4.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DTexture3DNode .prototype .initialize .call (this);
@@ -140,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 ();
    },
@@ -149,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/Texturing3D/PixelTexture3D.js

@@ -84,6 +84,10 @@ PixelTexture3D .prototype = Object .assign (Object .create (X3DTexture3DNode .pr
    {
       return "texture";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DTexture3DNode .prototype .initialize .call (this);

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

@@ -79,6 +79,10 @@ TextureCoordinate3D .prototype = Object .assign (Object .create (X3DSingleTextur
    {
       return "texCoord";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSingleTextureCoordinateNode .prototype .initialize .call (this);

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

@@ -79,6 +79,10 @@ TextureCoordinate4D .prototype = Object .assign (Object .create (X3DSingleTextur
    {
       return "texCoord";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSingleTextureCoordinateNode .prototype .initialize .call (this);

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

@@ -86,6 +86,10 @@ TextureTransform3D .prototype = Object .assign (Object .create (X3DSingleTexture
    {
       return "textureTransform";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSingleTextureTransformNode .prototype .initialize .call (this);

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

@@ -78,6 +78,10 @@ TextureTransformMatrix3D .prototype = Object .assign (Object .create (X3DSingleT
    {
       return "textureTransform";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.1", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSingleTextureTransformNode .prototype .initialize .call (this);

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

@@ -103,6 +103,10 @@ TimeSensor .prototype = Object .assign (Object .create (X3DSensorNode .prototype
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["2.0", "Infinity"];
+   },
    initialize: function ()
    {
       X3DSensorNode        .prototype .initialize .call (this);
@@ -144,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/BlendedVolumeStyle.js

@@ -87,6 +87,10 @@ BlendedVolumeStyle .prototype = Object .assign (Object .create (X3DComposableVol
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -80,6 +80,10 @@ BoundaryEnhancementVolumeStyle .prototype = Object .assign (Object .create (X3DC
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    addShaderFields: function (shaderNode)
    {
       if (! this ._enabled .getValue ())

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

@@ -82,6 +82,10 @@ CartoonVolumeStyle .prototype = Object .assign (Object .create (X3DComposableVol
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -81,6 +81,10 @@ ComposedVolumeStyle .prototype = Object .assign (Object .create (X3DComposableVo
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -81,6 +81,10 @@ EdgeEnhancementVolumeStyle .prototype = Object .assign (Object .create (X3DCompo
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -92,6 +92,10 @@ IsoSurfaceVolumeData .prototype = Object .assign (Object .create (X3DVolumeDataN
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DVolumeDataNode .prototype .initialize .call (this);

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

@@ -79,6 +79,10 @@ OpacityMapVolumeStyle .prototype = Object .assign (Object .create (X3DComposable
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -79,6 +79,10 @@ ProjectionVolumeStyle .prototype = Object .assign (Object .create (X3DVolumeRend
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    addShaderFields: function (shaderNode)
    {
       if (! this ._enabled .getValue ())

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

@@ -91,6 +91,10 @@ SegmentedVolumeData .prototype = Object .assign (Object .create (X3DVolumeDataNo
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DVolumeDataNode .prototype .initialize .call (this);

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

@@ -83,6 +83,10 @@ ShadedVolumeStyle .prototype = Object .assign (Object .create (X3DComposableVolu
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -82,6 +82,10 @@ SilhouetteEnhancementVolumeStyle .prototype = Object .assign (Object .create (X3
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -81,6 +81,10 @@ ToneMappedVolumeStyle .prototype = Object .assign (Object .create (X3DComposable
    {
       return "renderStyle";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DComposableVolumeRenderStyleNode .prototype .initialize .call (this);

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

@@ -88,6 +88,10 @@ VolumeData .prototype = Object .assign (Object .create (X3DVolumeDataNode .proto
    {
       return "children";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DVolumeDataNode .prototype .initialize .call (this);

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/Components/X_ITE/BlendMode.js

@@ -87,6 +87,10 @@ BlendMode .prototype = Object .assign (Object .create (X3DAppearanceChildNode .p
    {
       return "blendMode";
    },
+   getSpecificationRange: function ()
+   {
+      return ["3.3", "Infinity"];
+   },
    initialize: function ()
    {
       X3DAppearanceChildNode .prototype .initialize .call (this);

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);
 
@@ -172,6 +172,17 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          if (! Type)
             return null;
 
+         const specificationRange = Type .prototype .getSpecificationRange ();
+
+         if (this .getSpecificationVersion () < specificationRange [0])
+            return null;
+
+         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
@@ -179,7 +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 in '${this .getWorldURL ()}.`);
+
+         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 ()))
+            console .warn (`Node type '${typeName}' does not match component/profile statements in '${this .getWorldURL ()}'.`);
 
          const baseNode = new Type (this);
 
@@ -188,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);
 
@@ -199,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.