x_ite 8.6.17 → 8.6.18

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));

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

@@ -45,8 +45,9 @@
  *
  ******************************************************************************/
 
-import Fields       from "../../Fields.js";
-import X3DConstants from "../../Base/X3DConstants.js";
+import Fields              from "../../Fields.js";
+import X3DConstants        from "../../Base/X3DConstants.js";
+import X3DProtoDeclaration from "../../Prototype/X3DProtoDeclaration.js";
 
 const
    _cache                   = Symbol (),
@@ -59,7 +60,7 @@ function X3DUrlObject (executionContext)
    this .addType (X3DConstants .X3DUrlObject);
 
    this .addChildObjects ("loadState", new Fields .SFInt32 (X3DConstants .NOT_STARTED_STATE),
-                          "loadNow",   new Fields .SFTime ());
+                          "loadData",  new Fields .SFTime ());
 
    this [_cache]                = true;
    this [_autoRefreshStartTime] = Date .now ();
@@ -74,7 +75,7 @@ X3DUrlObject .prototype =
 
       this ._load                 .addInterest ("set_load__",        this);
       this ._url                  .addInterest ("set_url__",         this);
-      this ._loadNow              .addInterest ("loadNow",           this);
+      this ._loadData             .addInterest ("loadData",          this);
       this ._autoRefresh          .addInterest ("set_autoRefresh__", this);
       this ._autoRefreshTimeLimit .addInterest ("set_autoRefresh__", this);
    },
@@ -126,27 +127,73 @@ X3DUrlObject .prototype =
    },
    requestImmediateLoad: function (cache = true)
    {
-      const loadState = this .checkLoadState ();
+      return new Promise ((resolve, reject) =>
+      {
+         const loading = () =>
+         {
+            const _loading = Symbol ();
 
-      if (loadState === X3DConstants .COMPLETE_STATE || loadState === X3DConstants .IN_PROGRESS_STATE)
-         return;
+            this ._loadState .addFieldCallback (_loading, () =>
+            {
+               switch (this .checkLoadState ())
+               {
+                  case X3DConstants .COMPLETE_STATE:
+                     this ._loadState .removeFieldCallback (_loading);
+                     resolve ();
+                     break;
+                  case X3DConstants .FAILED_STATE:
+                     this ._loadState .removeFieldCallback (_loading);
+                     reject ();
+                     break;
+               }
+            })
+         };
 
-      if (!this ._load .getValue ())
-         return;
+         const loadState = this .checkLoadState ();
 
-      if (this ._url .length === 0)
-         return;
+         if (loadState === X3DConstants .COMPLETE_STATE)
+         {
+            resolve ();
+            return;
+         }
 
-      this .setCache (cache);
-      this .setLoadState (X3DConstants .IN_PROGRESS_STATE);
+         if (loadState === X3DConstants .IN_PROGRESS_STATE)
+         {
+            loading ();
+            return;
+         }
 
-      if (this .isInitialized ())
-         // Buffer prevents double load of the scene if load and url field are set at the same time.
-         this ._loadNow = this .getBrowser () .getCurrentTime ();
-      else
-         this .loadNow ();
+         if (!this ._load .getValue ())
+         {
+            reject ();
+            return;
+         }
+
+         if (this ._url .length === 0)
+         {
+            resolve ();
+            return;
+         }
+
+         this .setCache (cache);
+         this .setLoadState (X3DConstants .IN_PROGRESS_STATE);
+
+         if (this .isInitialized ())
+            // Buffer prevents double load of the scene if load and url field are set at the same time.
+            this ._loadData = this .getBrowser () .getCurrentTime ();
+         else
+            this .loadData ();
+
+         loading ();
+      });
    },
    loadNow: function ()
+   {
+      this .setLoadState (X3DConstants .NOT_STARTED_STATE);
+
+      return this .requestImmediateLoad ();
+   },
+   loadData: function ()
    { },
    requestUnload: function ()
    {
@@ -156,9 +203,13 @@ X3DUrlObject .prototype =
          return;
 
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
-      this .unLoadNow ();
+      this .unloadData ();
+   },
+   unloadNow: function ()
+   {
+      this .requestUnload ();
    },
-   unLoadNow: function ()
+   unloadData: function ()
    { },
    setAutoRefreshTimer: function (autoRefreshInterval)
    {
@@ -180,7 +231,7 @@ X3DUrlObject .prototype =
    performAutoRefresh: function ()
    {
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
-      this .requestImmediateLoad (false);
+      this .requestImmediateLoad (false) .catch (Function .prototype);
    },
    set_live__: function ()
    {
@@ -192,7 +243,7 @@ X3DUrlObject .prototype =
    set_load__: function ()
    {
       if (this ._load .getValue ())
-         this .requestImmediateLoad ();
+         this .requestImmediateLoad () .catch (Function .prototype);
       else
          this .requestUnload ();
    },
@@ -202,7 +253,7 @@ X3DUrlObject .prototype =
          return;
 
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    set_autoRefresh__: function ()
    {

package/src/x_ite/Components/Picking/X3DPickSensorNode.js

@@ -124,18 +124,19 @@ X3DPickSensorNode .prototype = Object .assign (Object .create (X3DSensorNode .pr
    },
    getPickShape: (function ()
    {
-      var pickShapes = new WeakMap ();
+      const pickShapes = new WeakMap ();
 
       return function (geometryNode)
       {
-         var pickShape = pickShapes .get (geometryNode);
+         const pickShape = pickShapes .get (geometryNode);
 
          if (pickShape !== undefined)
             return pickShape;
 
-         var
-            shapeNode           = this .getExecutionContext () .createNode ("Shape",           { setup: false, warn: false }),
-            collidableShapeNode = this .getExecutionContext () .createNode ("CollidableShape", { setup: false, warn: false });
+         const
+            browser             = this .getBrowser (),
+            shapeNode           = browser .getPrivateScene () .createNode ("Shape",           false),
+            collidableShapeNode = browser .getPrivateScene () .createNode ("CollidableShape", false);
 
          shapeNode .setPrivate (true);
          collidableShapeNode .setPrivate (true);

package/src/x_ite/Components/RigidBodyPhysics/CollisionSensor.js

@@ -259,12 +259,12 @@ CollisionSensor .prototype = Object .assign (Object .create (X3DSensorNode .prot
    })(),
    getContact: function (index)
    {
-      var contactNode = this .contactCache [index];
+      const contactNode = this .contactCache [index];
 
       if (contactNode)
          return contactNode;
 
-      contactNode = this .contactCache [index] = this .getExecutionContext () .createNode ("Contact", { setup: false });
+      contactNode = this .contactCache [index] = this .getExecutionContext () .createNode ("Contact", false);
 
       contactNode .setup ();