x_ite 8.6.17 → 8.6.19

package/src/x_ite/Browser/VolumeRendering/X3DVolumeRenderingContext.js

@@ -59,9 +59,9 @@ function X3DVolumeRenderingContext () { }
 
 X3DVolumeRenderingContext .prototype =
 {
-   getDefaultVoxels: function (executionContext)
+   getDefaultVoxels: function ()
    {
-      this [_defaultVoxelsNode] = executionContext .createNode ("PixelTexture3D", { setup: false, warn: false });
+      this [_defaultVoxelsNode] = this .getPrivateScene () .createNode ("PixelTexture3D", false);
       this [_defaultVoxelsNode] ._image = [1, 1, 1, 1, 255];
       this [_defaultVoxelsNode] .repeatS = true;
       this [_defaultVoxelsNode] .repeatT = true;

package/src/x_ite/Browser/X3DBrowser.js

@@ -87,7 +87,6 @@ function X3DBrowser (element)
 
    X3DBrowserContext .call (this, element);
 
-   this [_reject]           = Function .prototype;
    this [_browserCallbacks] = new Map ();
    this [_console]          = document .getElementsByClassName ("x_ite-console");
 
@@ -244,6 +243,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          if (argument instanceof ComponentInfo)
             return this .loadComponents ([argument .name]);
 
+         // Load array of component names.
          return loadComponents (this, [... argument], new Set ());
       };
    })(),
@@ -285,11 +285,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    {
       return new Promise ((resolve, reject) =>
       {
-         this [_reject] ("Replacing world aborted.");
-
-         if (this [_fileLoader])
-            this [_fileLoader] .abort ();
+         this [_fileLoader] ?.abort ();
 
+         this [_reject] ?.("Replacing world aborted.");
          this [_reject] = reject;
 
          // Remove world.
@@ -475,84 +473,74 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          if (!(parameter instanceof Fields .MFString))
             throw new Error ("Browser.loadURL: parameter must be of type MFString.");
 
-         // Cancel any loading.
-
-         this ._loadCount       .removeInterest ("checkLoadCount",    this);
-         this .prepareEvents () .removeInterest ("updateInitialized", this);
-
-         if (this [_fileLoader])
-            this [_fileLoader] .abort ();
-
          // Start loading.
 
-         this .setBrowserLoading (true);
-         this .addLoadingObject (this);
-
-         const fileLoader = this [_fileLoader] = new FileLoader (this .getWorld ());
+         const fileLoader = new FileLoader (this .getWorld ());
 
          fileLoader .createX3DFromURL (url, parameter, (scene) =>
          {
-            if (fileLoader !== this [_fileLoader])
+            if (this [_fileLoader] !== fileLoader)
             {
                reject (new Error ("Loading of X3D file aborted."));
-               return;
-            }
-
-            if (!this .getBrowserOption ("SplashScreen"))
-               this .getCanvas () .show ();
-
-            if (scene)
-            {
-               this .replaceWorld (scene) .then (resolve) .catch (reject);
-               this .removeLoadingObject (this);
             }
             else
             {
-               this .callBrowserCallbacks (X3DConstants .CONNECTION_ERROR);
-               this .callBrowserEventHandler ("error");
+               if (!this .getBrowserOption ("SplashScreen"))
+                  this .getCanvas () .show ();
 
-               setTimeout (() =>
+               if (scene)
+               {
+                  this .addLoadingObject (this); // Prevent resetLoadCount.
+                  this .replaceWorld (scene) .then (resolve) .catch (reject);
+                  this .removeLoadingObject (this);
+                  this .removeLoadingObject (fileLoader);
+               }
+               else
                {
-                  this .getSplashScreen ()
-                     .find (".x_ite-private-spinner-text")
-                     .text (_ ("Failed loading world."));
-               });
+                  this .callBrowserCallbacks (X3DConstants .CONNECTION_ERROR);
+                  this .callBrowserEventHandler ("error");
 
-               reject (new Error ("Couldn't load X3D file."));
+                  setTimeout (() =>
+                  {
+                     this .getSplashScreen ()
+                        .find (".x_ite-private-spinner-text")
+                        .text (_ ("Failed loading world."));
+                  });
+
+                  reject (new Error ("Couldn't load X3D file."));
+               }
             }
          },
          (fragment) =>
          {
-            if (fileLoader !== this [_fileLoader])
-            {
-               reject (new Error ("Change viewpoint aborted."));
-               return;
-            }
+            fileLoader .ready = true;
 
             this .changeViewpoint (fragment);
-            this .removeLoadingObject (this);
-            this .setBrowserLoading (false);
+            this .removeLoadingObject (fileLoader);
 
             resolve ();
          },
          (url, target) =>
          {
-            if (fileLoader !== this [_fileLoader])
-            {
-               reject (new Error ("Loading of file aborted."));
-               return;
-            }
+            fileLoader .ready = true;
 
             if (target)
                window .open (url, target);
             else
                location = url;
 
-            this .removeLoadingObject (this);
-            this .setBrowserLoading (false);
+            this .removeLoadingObject (fileLoader);
 
             resolve ();
          });
+
+         if (!fileLoader .ready)
+         {
+            this [_fileLoader] ?.abort ();
+
+            this .setBrowserLoading (true);
+            this .addLoadingObject (this [_fileLoader] = fileLoader);
+         }
       });
    },
    addBrowserListener: function (callback, object)
@@ -648,10 +636,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    viewAll: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -660,13 +645,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    firstViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
-
-      if (!layerNode)
-         return;
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       const viewpoints = layerNode .getUserViewpoints ();
 
@@ -675,10 +654,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    previousViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -707,10 +683,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    nextViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -739,10 +712,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    lastViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -760,10 +730,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          layerNode = this .getActiveLayer ();
       }
 
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -91,8 +91,8 @@ function X3DBrowserContext (element)
 {
    X3DBaseNode                    .call (this, this);
    X3DRoutingContext              .call (this);
-   X3DCoreContext                 .call (this, element);
    X3DScriptingContext            .call (this);
+   X3DCoreContext                 .call (this, element);
    X3DNetworkingContext           .call (this);
    X3DTexturingContext            .call (this);
    X3DShadersContext              .call (this);
@@ -157,8 +157,8 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
    {
       X3DBaseNode                    .prototype .initialize ?.call (this);
       X3DRoutingContext              .prototype .initialize ?.call (this);
-      X3DCoreContext                 .prototype .initialize ?.call (this);
       X3DScriptingContext            .prototype .initialize ?.call (this);
+      X3DCoreContext                 .prototype .initialize ?.call (this);
       X3DNetworkingContext           .prototype .initialize ?.call (this);
       X3DTexturingContext            .prototype .initialize ?.call (this);
       X3DShadersContext              .prototype .initialize ?.call (this);
@@ -365,8 +365,8 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
       X3DShadersContext              .prototype .dispose ?.call (this);
       X3DTexturingContext            .prototype .dispose ?.call (this);
       X3DNetworkingContext           .prototype .dispose ?.call (this);
-      X3DScriptingContext            .prototype .dispose ?.call (this);
       X3DCoreContext                 .prototype .dispose ?.call (this);
+      X3DScriptingContext            .prototype .dispose ?.call (this);
       X3DRoutingContext              .prototype .dispose ?.call (this);
       X3DBaseNode                    .prototype .dispose ?.call (this);
    },

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

@@ -208,9 +208,9 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       return false;
    },
-   getFieldsAreEnumerable: function ()
+   getSourceText: function ()
    {
-      return true;
+      return null;
    },
    traverse: function () { },
    toStream: function (generator)

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

@@ -276,11 +276,6 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       protoNode ._name_changed .addFieldInterest (this ._typeName_changed);
 
-      const outerNode = this .getExecutionContext () .getOuterNode ();
-
-      if (outerNode ?.getType () .includes (X3DConstants .X3DProtoDeclaration))
-         return;
-
       if (protoNode .isExternProto)
       {
          if (this [_protoNode] .checkLoadState () === X3DConstants .COMPLETE_STATE)
@@ -290,7 +285,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
          else
          {
             protoNode ._updateInstances .addInterest ("construct", this);
-            protoNode .requestImmediateLoad ();
+            protoNode .requestImmediateLoad () .catch (Function .prototype);
          }
       }
       else
@@ -1017,11 +1012,11 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
    },
    dispose: function ()
    {
+      this [_protoNode] ._name_changed .removeFieldInterest (this ._typeName_changed);
       this [_protoNode] ._updateInstances .removeInterest ("construct", this);
       this [_protoNode] ._updateInstances .removeInterest ("update",    this);
 
-      if (this [_body])
-         this [_body] .dispose ();
+      this [_body] ?.dispose ();
 
       X3DNode .prototype .dispose .call (this);
    },

package/src/x_ite/Components/CubeMapTexturing/ImageCubeMapTexture.js

@@ -127,13 +127,13 @@ ImageCubeMapTexture .prototype = Object .assign (Object .create (X3DEnvironmentT
       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/DIS/DISEntityTypeMapping.js

@@ -99,14 +99,6 @@ DISEntityTypeMapping .prototype = Object .assign (Object .create (X3DInfoNode .p
       X3DInfoNode  .prototype .initialize .call (this);
       X3DUrlObject .prototype .initialize .call (this);
    },
-   requestImmediateLoad: function (cache = true)
-   { },
-   requestUnload: function ()
-   { },
-   set_load__: function ()
-   { },
-   set_url__: function ()
-   { },
    dispose: function ()
    {
       X3DUrlObject .prototype .dispose .call (this);

package/src/x_ite/Components/EnvironmentalSensor/ProximitySensor.js

@@ -70,7 +70,7 @@ function ProximitySensor (executionContext)
 
    this .min           = new Vector3 (0, 0, 0);
    this .max           = new Vector3 (0, 0, 0);
-   this .viewpointNode = null;
+   this .layerNode     = null;
    this .modelMatrix   = new Matrix4 ();
    this .inside        = false;
 }
@@ -156,15 +156,17 @@ ProximitySensor .prototype = Object .assign (Object .create (X3DEnvironmentalSen
       {
          if (this .inside && this .getTraversed ())
          {
-            if (this .viewpointNode)
+            if (this .layerNode)
             {
-               const modelMatrix = this .modelMatrix;
+               const
+                  viewpointNode = this .layerNode .getViewpoint (),
+                  modelMatrix   = this .modelMatrix;
 
-               centerOfRotationMatrix .assign (this .viewpointNode .getModelMatrix ());
-               centerOfRotationMatrix .translate (this .viewpointNode .getUserCenterOfRotation ());
+               centerOfRotationMatrix .assign (viewpointNode .getModelMatrix ());
+               centerOfRotationMatrix .translate (viewpointNode .getUserCenterOfRotation ());
                centerOfRotationMatrix .multRight (invModelMatrix .assign (modelMatrix) .inverse ());
 
-               modelMatrix .multRight (this .viewpointNode .getViewMatrix ());
+               modelMatrix .multRight (viewpointNode .getViewMatrix ());
                modelMatrix .get (null, orientation);
                modelMatrix .inverse ();
 
@@ -176,13 +178,13 @@ ProximitySensor .prototype = Object .assign (Object .create (X3DEnvironmentalSen
 
                if (this ._isActive .getValue ())
                {
-                  if (! this ._position_changed .getValue () .equals (position))
+                  if (!this ._position_changed .getValue () .equals (position))
                      this ._position_changed = position;
 
-                  if (! this ._orientation_changed .getValue () .equals (orientation))
+                  if (!this ._orientation_changed .getValue () .equals (orientation))
                      this ._orientation_changed = orientation;
 
-                  if (! this ._centerOfRotation_changed .getValue () .equals (centerOfRotation))
+                  if (!this ._centerOfRotation_changed .getValue () .equals (centerOfRotation))
                      this ._centerOfRotation_changed = centerOfRotation;
                }
                else
@@ -204,8 +206,8 @@ ProximitySensor .prototype = Object .assign (Object .create (X3DEnvironmentalSen
             }
          }
 
-         this .inside        = false;
-         this .viewpointNode = null;
+         this .inside    = false;
+         this .layerNode = null;
 
          this .setTraversed (false);
       };
@@ -222,7 +224,7 @@ ProximitySensor .prototype = Object .assign (Object .create (X3DEnvironmentalSen
          {
             case TraverseType .CAMERA:
             {
-               this .viewpointNode = renderObject .getViewpoint ();
+               this .layerNode = renderObject .getLayer ();
                this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
                return;
             }

package/src/x_ite/Components/EnvironmentalSensor/TransformSensor.js

@@ -127,7 +127,7 @@ TransformSensor .prototype = Object .assign (Object .create (X3DEnvironmentalSen
    { },
    set_enabled__: function ()
    {
-      if (this .getLive () .getValue () && this .targetObjectNode && this ._enabled .getValue () && ! this ._size. getValue () .equals (Vector3 .Zero))
+      if (this .getLive () .getValue () && this .targetObjectNode && this ._enabled .getValue () && !this ._size. getValue () .equals (Vector3 .Zero))
       {
          this .setPickableObject (true);
          this .getBrowser () .addTransformSensor (this);
@@ -228,10 +228,10 @@ TransformSensor .prototype = Object .assign (Object .create (X3DEnvironmentalSen
 
             if (this ._isActive .getValue ())
             {
-               if (! this ._position_changed .getValue () .equals (position))
+               if (!this ._position_changed .getValue () .equals (position))
                   this ._position_changed = position;
 
-               if (! this ._orientation_changed .getValue () .equals (orientation))
+               if (!this ._orientation_changed .getValue () .equals (orientation))
                   this ._orientation_changed = orientation;
             }
             else

package/src/x_ite/Components/EnvironmentalSensor/VisibilitySensor.js

@@ -112,7 +112,7 @@ VisibilitySensor .prototype = Object .assign (Object .create (X3DEnvironmentalSe
    {
       if (this .visible && this .getTraversed ())
       {
-         if (! this ._isActive .getValue ())
+         if (!this ._isActive .getValue ())
          {
             this ._isActive  = true;
             this ._enterTime = this .getBrowser () .getCurrentTime ();

package/src/x_ite/Components/EnvironmentalSensor/X3DEnvironmentalSensorNode.js

@@ -82,7 +82,7 @@ X3DEnvironmentalSensorNode .prototype = Object .assign (Object .create (X3DSenso
    },
    set_live__: function ()
    {
-      if (this ._traversed .getValue () && this .getLive () .getValue () && this ._enabled .getValue () && ! (this .zeroTest && this ._size. getValue () .equals (Vector3 .Zero)))
+      if (this ._traversed .getValue () && this .getLive () .getValue () && this ._enabled .getValue () && !(this .zeroTest && this ._size. getValue () .equals (Vector3 .Zero)))
       {
          this .getBrowser () .sensorEvents () .addInterest ("update", this);
       }

package/src/x_ite/Components/Geospatial/GeoMetadata.js

@@ -96,12 +96,6 @@ GeoMetadata .prototype = Object .assign (Object .create (X3DInfoNode .prototype)
    },
    requestImmediateLoad: function (cache = true)
    { },
-   requestUnload: function ()
-   { },
-   set_load__: function ()
-   { },
-   set_url__: function ()
-   { },
    dispose: function ()
    {
       X3DUrlObject .prototype .dispose .call (this);

package/src/x_ite/Components/Networking/Anchor.js

@@ -114,18 +114,15 @@ Anchor .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
       this .touchSensorNode ._enabled     = this ._load;
       this .touchSensorNode .setup ();
 
-      // Modify set_active__ to get immediate response to user action (click event), otherwise links are not opened in this window.
+      // Modify set_active__ to get immediate response to user action (click event),
+      // otherwise links are not opened in this window.
 
-      const
-         anchor       = this,
-         set_active__ = this .touchSensorNode .set_active__;
-
-      this .touchSensorNode .set_active__ = function (active, hit)
+      this .touchSensorNode .set_active__ = (active, hit) =>
       {
-         set_active__ .call (this, active, hit);
+         TouchSensor .prototype .set_active__ .call (this .touchSensorNode, active, hit);
 
-         if (this ._isOver .getValue () && ! active)
-            anchor .requestImmediateLoad ();
+         if (this .touchSensorNode ._isOver .getValue () && !active)
+            this .requestImmediateLoad () .catch (Function .prototype);
       };
    },
    set_load__: function ()
@@ -137,34 +134,40 @@ Anchor .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
       this .setCache (cache);
       this .setLoadState (X3DConstants .IN_PROGRESS_STATE, false);
 
-      new FileLoader (this) .createX3DFromURL (this ._url, this ._parameter,
-      function (scene)
+      return new Promise ((resolve, reject) =>
       {
-         if (scene)
+         new FileLoader (this) .createX3DFromURL (this ._url, this ._parameter,
+         (scene) =>
+         {
+            if (scene)
+            {
+               this .getBrowser () .replaceWorld (scene);
+               this .setLoadState (X3DConstants .COMPLETE_STATE, false);
+               resolve ();
+            }
+            else
+            {
+               this .setLoadState (X3DConstants .FAILED_STATE, false);
+               reject ();
+            }
+         },
+         (viewpointName) =>
          {
-            this .getBrowser () .replaceWorld (scene);
+            this .getBrowser () .changeViewpoint (viewpointName);
             this .setLoadState (X3DConstants .COMPLETE_STATE, false);
-         }
-         else
-            this .setLoadState (X3DConstants .FAILED_STATE, false);
-      }
-      .bind (this),
-      function (viewpointName)
-      {
-         this .getBrowser () .changeViewpoint (viewpointName);
-         this .setLoadState (X3DConstants .COMPLETE_STATE, false);
-      }
-      .bind (this),
-      function (url, target)
-      {
-         if (target)
-            window .open (url, target);
-         else
-            location = url;
+            resolve ();
+         },
+         (url, target) =>
+         {
+            if (target)
+               window .open (url, target);
+            else
+               location = url;
 
-         this .setLoadState (X3DConstants .COMPLETE_STATE, false);
-      }
-      .bind (this));
+            this .setLoadState (X3DConstants .COMPLETE_STATE, false);
+            resolve ();
+         });
+      });
    },
    requestUnload ()
    { },

package/src/x_ite/Components/Networking/Inline.js

@@ -119,7 +119,7 @@ Inline .prototype = Object .assign (Object .create (X3DChildNode .prototype),
       this .groupNode ._isCameraObject   .addFieldInterest (this ._isCameraObject);
       this .groupNode ._isPickableObject .addFieldInterest (this ._isPickableObject);
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getBBox: function (bbox, shadows)
    {
@@ -137,12 +137,12 @@ Inline .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 
       this .scene .setLive (this .getLive () .getValue ());
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .abortLoading ();
       this .setInternalScene (this .getBrowser () .getDefaultScene ());
    },
-   loadNow: function ()
+   loadData: function ()
    {
       this .abortLoading ();
       this .fileLoader = new FileLoader (this) .createX3DFromURL (this ._url, null, this .setInternalSceneAsync .bind (this));