x_ite 8.6.17 → 8.6.19

package/src/x_ite/Components/Shaders/ShaderPart.js

@@ -118,13 +118,13 @@ ShaderPart .prototype = Object .assign (Object .create (X3DNode .prototype),
 
       this ._type .addInterest ("set_type__", this);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    set_type__: function ()
    {
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getSourceText: function ()
    {
@@ -158,11 +158,11 @@ ShaderPart .prototype = Object .assign (Object .create (X3DNode .prototype),
          return shaderTypes .get (this ._type .getValue ()) || "VERTEX_SHADER";
       };
    })(),
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .valid = false;
    },
-   loadNow: function ()
+   loadData: function ()
    {
       new FileLoader (this) .loadDocument (this ._url,
       function (data, url)

package/src/x_ite/Components/Shaders/ShaderProgram.js

@@ -98,8 +98,6 @@ ShaderProgram .prototype = Object .assign (Object .create (X3DNode .prototype),
    },
    requestImmediateLoad: function (cache = true)
    { },
-   requestUnload: function ()
-   { },
    initialize: function ()
    {
       X3DNode                     .prototype .initialize .call (this);

package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js

@@ -45,12 +45,11 @@
  *
  ******************************************************************************/
 
-import X3DCast        from "../../Base/X3DCast.js";
-import X3DConstants   from "../../Base/X3DConstants.js";
-import OrthoViewpoint from "../Navigation/OrthoViewpoint.js";
-import Matrix3        from "../../../standard/Math/Numbers/Matrix3.js";
+import X3DCast      from "../../Base/X3DCast.js";
+import X3DConstants from "../../Base/X3DConstants.js";
+import Matrix3      from "../../../standard/Math/Numbers/Matrix3.js";
 
-const _uniformLocation = Symbol .for ("X3DField.uniformLocation");
+const _uniformLocation = Symbol .for ("X_ITE.X3DField.uniformLocation");
 
 function X3DProgrammableShaderObject (executionContext)
 {

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

@@ -118,7 +118,7 @@ AudioClip .prototype = Object .assign (Object .create (X3DSoundSourceNode .proto
       this .audio .prop ("preload",     "auto");
       this .audio .prop ("muted",       true);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getElement: function ()
    {
@@ -129,11 +129,11 @@ AudioClip .prototype = Object .assign (Object .create (X3DSoundSourceNode .proto
       X3DSoundSourceNode .prototype .set_live__ .call (this);
       X3DUrlObject       .prototype .set_live__ .call (this);
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .setMedia (null);
    },
-   loadNow: function ()
+   loadData: function ()
    {
       this .setMedia (null);
       this .urlStack .setValue (this ._url);
@@ -165,12 +165,12 @@ AudioClip .prototype = Object .assign (Object .create (X3DSoundSourceNode .proto
    },
    setTimeout: function (event)
    {
-      setTimeout (function ()
+      setTimeout (() =>
       {
          if (this .checkLoadState () === X3DConstants .IN_PROGRESS_STATE)
             this .setError (event);
-      }
-      .bind (this), 3000);
+      },
+      3000);
    },
    setError: function (event)
    {

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

@@ -62,12 +62,12 @@ DynamicsCompressor .prototype = Object .assign (Object .create (X3DSoundProcessi
 {
    constructor: DynamicsCompressor,
    [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",             new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "description",          new Fields .SFString ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "enabled",              new Fields .SFBool (true)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",              new Fields .SFNode ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "description",           new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "enabled",               new Fields .SFBool (true)),
 
       new X3DFieldDefinition (X3DConstants .inputOutput, "gain",                  new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "attack",                new Fields .SFFloat (0.003)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "attack",                new Fields .SFFloat (0.003)), // TODO: SFTime
       new X3DFieldDefinition (X3DConstants .inputOutput, "knee",                  new Fields .SFFloat (30)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "ratio",                 new Fields .SFFloat (12)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "reduction",             new Fields .SFFloat ()),

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

@@ -125,12 +125,11 @@ Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
    },
    set_fontStyle__: function ()
    {
-      if (this .fontStyleNode)
-         this .fontStyleNode .removeInterest ("requestRebuild", this);
+      this .fontStyleNode ?.removeInterest ("requestRebuild", this);
 
       this .fontStyleNode = X3DCast (X3DConstants .X3DFontStyleNode, this ._fontStyle);
 
-      if (! this .fontStyleNode)
+      if (!this .fontStyleNode)
          this .fontStyleNode = this .getBrowser () .getDefaultFontStyle ();
 
       this .fontStyleNode .addInterest ("requestRebuild", this);

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

@@ -112,10 +112,10 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
       this .font        = null;
       this .familyIndex = 0;
 
+      // Don't call set_style__.
       this .set_justify__ ();
-      this .set_style__ ();
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    set_style__: function ()
    {
@@ -124,7 +124,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    set_justify__: function ()
    {
@@ -186,7 +186,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       return;
    },
-   loadNow: function ()
+   loadData: function ()
    {
       // Add default font to family array.
 

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

@@ -105,17 +105,17 @@ ImageTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
       this .image .on ("abort error", this .setError .bind (this));
       this .image .prop ("crossOrigin", "Anonymous");
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getElement: function ()
    {
       return this .image [0];
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .clearTexture ();
    },
-   loadNow: function ()
+   loadData: function ()
    {
       this .urlStack .setValue (this ._url);
       this .loadNext ();

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

@@ -126,7 +126,7 @@ MovieTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
       this .video .prop ("preload",     "auto");
       this .video .prop ("muted",       true);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getElement: function ()
    {
@@ -137,11 +137,11 @@ MovieTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
       X3DSoundSourceNode .prototype .set_live__ .call (this);
       X3DUrlObject       .prototype .set_live__ .call (this);
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .clearTexture ();
    },
-   loadNow: function ()
+   loadData: function ()
    {
       delete this .gif;
       this .setMedia (null);
@@ -188,12 +188,12 @@ MovieTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
    },
    setTimeout: function (event)
    {
-      setTimeout (function ()
+      setTimeout (() =>
       {
          if (this .checkLoadState () === X3DConstants .IN_PROGRESS_STATE)
             this .setError (event);
-      }
-      .bind (this), 3000);
+      },
+      3000);
    },
    setError: function (event)
    {

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

@@ -100,7 +100,7 @@ ImageTexture3D .prototype = Object .assign (Object .create (X3DTexture3DNode .pr
       X3DTexture3DNode .prototype .initialize .call (this);
       X3DUrlObject     .prototype .initialize .call (this);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getInternalType: function (components)
    {
@@ -118,11 +118,11 @@ ImageTexture3D .prototype = Object .assign (Object .create (X3DTexture3DNode .pr
             return gl .RGBA;
       }
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .clearTexture ();
    },
-   loadNow: function ()
+   loadData: function ()
    {
       new FileLoader (this) .loadDocument (this ._url,
       function (data)

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/Scene.js

@@ -49,7 +49,7 @@ import Fields   from "../Fields.js";
 import X3DScene from "./X3DScene.js";
 
 const
-   _browser        = Symbol .for ("X3DEventObject.browser"),
+   _browser        = Symbol .for ("X_ITE.X3DEventObject.browser"),
    _loadingObjects = Symbol ();
 
 function Scene (browser)