x_ite 8.6.17 → 8.6.19

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

package/src/x_ite/Components/Scripting/Script.js

@@ -75,8 +75,6 @@ function Script (executionContext)
    X3DScriptNode .call (this, executionContext);
 
    this .addType (X3DConstants .Script);
-
-   this .pauseTime = 0;
 }
 
 Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
@@ -112,10 +110,7 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
    {
       X3DScriptNode .prototype .initialize .call (this);
 
-      for (const field of this .getUserDefinedFields ())
-         field .setModificationTime (0);
-
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getExtendedEventHandling: function ()
    {
@@ -129,36 +124,35 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
    {
       X3DScriptNode .prototype .addUserDefinedField .call (this, accessType, name, field);
 
-      if (! this .isInitialized ())
+      if (!this .isInitialized ())
          return;
 
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    removeUserDefinedField: function (name)
    {
+      this .getUserDefinedFields () .get (name) ?.removeInterest ("set_field__", this);
+
       X3DScriptNode .prototype .removeUserDefinedField .call (this, name);
 
-      if (! this .isInitialized ())
+      if (!this .isInitialized ())
          return;
 
       this .setLoadState (X3DConstants .NOT_STARTED_STATE);
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
    getSourceText: function ()
    {
       return this ._url;
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .initialize__ ("");
    },
-   loadNow: function ()
+   loadData: function ()
    {
-      this .initialized = false;
-
-      new FileLoader (this) .loadDocument (this ._url,
-      function (data)
+      new FileLoader (this) .loadDocument (this ._url, (data) =>
       {
          if (data === null)
          {
@@ -167,13 +161,12 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
          }
          else
          {
-            this .setLoadState (X3DConstants .COMPLETE_STATE);
             this .initialize__ ($.decodeText (data));
+            this .setLoadState (X3DConstants .COMPLETE_STATE);
          }
-      }
-      .bind (this));
+      });
    },
-   getContext: function (text)
+   getContext: function (sourceText)
    {
       try
       {
@@ -192,20 +185,20 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
             }
          }
 
-         text += "\nreturn [" + callbacks .map (function (c)
+         sourceText += "\nreturn [" + callbacks .map (function (c)
          {
             return `typeof ${c} !== "undefined" ? ${c} : undefined`;
          })
          .join (",") + "];";
 
-         this .global = this .getGlobal ();
+         this .globalObject = this .getGlobalObject ();
 
          const
-            result  = evaluate (this .global, text),
-            context = { };
+            result  = evaluate (this .globalObject, sourceText),
+            context = new Map ();
 
          for (let i = 0; i < callbacks .length; ++ i)
-            context [callbacks [i]] = result [i];
+            context .set (callbacks [i], result [i]);
 
          return context;
       }
@@ -213,14 +206,14 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
       {
          this .setError ("while evaluating script source", error);
 
-         return { };
+         return new Map ();
       }
    },
-   evaluate: function (text)
+   evaluate: function (sourceText)
    {
-      return evaluate (this .global, `return (${text})`);
+      return evaluate (this .globalObject, `return (${sourceText})`);
    },
-   getGlobal: function ()
+   getGlobalObject: function ()
    {
       const
          browser          = this .getBrowser (),
@@ -249,7 +242,7 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
 
       SFNode .prototype = Fields .SFNode .prototype;
 
-      const global =
+      const globalObject =
       {
          NULL:  { value: null },
          FALSE: { value: false },
@@ -329,9 +322,9 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
          if (field .getAccessType () === X3DConstants .inputOnly)
             continue;
 
-         if (! (name in global))
+         if (!(name in globalObject))
          {
-            global [name] =
+            globalObject [name] =
             {
                get: field .valueOf .bind (field),
                set: field .setValue .bind (field),
@@ -340,7 +333,7 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
 
          if (field .getAccessType () === X3DConstants .inputOutput)
          {
-            global [name + "_changed"] =
+            globalObject [name + "_changed"] =
             {
                get: field .valueOf  .bind (field),
                set: field .setValue .bind (field),
@@ -348,138 +341,74 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
          }
       }
 
-      return Object .create (Object .prototype, global);
+      return Object .create (Object .prototype, globalObject);
    },
-   processOutstandingEvents: function ()
+   initialize__: function (sourceText)
    {
-      for (const field of this .getUserDefinedFields ())
-      {
-         if (field .getModificationTime () <= this .pauseTime)
-            continue;
+      this .disconnect ();
 
-         switch (field .getAccessType ())
-         {
-            case X3DConstants .inputOnly:
-            {
-               const callback = this .context [field .getName ()];
+      const browser = this .getBrowser ();
 
-               if (typeof callback === "function")
-                  this .set_field__ (callback, field);
+      // Create context.
 
-               break;
-            }
-            case X3DConstants .inputOutput:
-            {
-               const callback = this .context ["set_" + field .getName ()];
+      this .context = this .getContext (sourceText);
 
-               if (typeof callback === "function")
-                  this .set_field__ (callback, field);
+      // Call initialize function.
 
-               break;
-            }
-         }
-      }
-   },
-   initialize__: function (text)
-   {
-      this .context = this .getContext (text);
+      const initialize = this .context .get ("initialize");
 
-      this .set_live__ ();
-   },
-   set_live__: function ()
-   {
-      X3DScriptNode .prototype .set_live__ .call (this);
+      if (typeof initialize === "function")
+         this .call__ (initialize, "initialize");
 
-      if (!this .context)
-         return;
+      // Connect shutdown.
 
-      if (this .getLive () .getValue ())
-      {
-         if (!this .initialized)
-         {
-            this .initialized = true;
+      const shutdown = this .context .get ("shutdown");
 
-            // Call initialize function.
+      if (typeof shutdown === "function")
+         $(window) .on ("unload.Script" + this .getId (), this .call__ .bind (this, shutdown, "shutdown"));
 
-            if (typeof this .context .initialize === "function")
-            {
-               const browser = this .getBrowser ();
+      // Connect prepareEvents.
 
-               browser .getScriptStack () .push (this);
+      const prepareEvents = this .context .get ("prepareEvents");
 
-               try
-               {
-                  this .context .initialize ();
-               }
-               catch (error)
-               {
-                  this .setError ("in function 'initialize'", error);
-               }
+      if (typeof prepareEvents === "function")
+         browser .prepareEvents () .addInterest ("call__", this, prepareEvents, "prepareEvents");
 
-               browser .getScriptStack () .pop ();
-            }
+      // Connect eventsProcessed.
 
-            if (typeof this .context .shutdown === "function")
-               $(window) .on ("unload", this .shutdown__ .bind (this));
-         }
+      const eventsProcessed = this .context .get ("eventsProcessed");
 
-         if (typeof this .context .prepareEvents === "function")
-            this .getBrowser () .prepareEvents () .addInterest ("prepareEvents__", this);
+      if (typeof eventsProcessed === "function")
+         this .addInterest ("call__", this, eventsProcessed, "eventsProcessed");
 
-         if (typeof this .context .eventsProcessed === "function")
-            this .addInterest ("eventsProcessed__", this);
+      // Connect fields.
 
-         for (const field of this .getUserDefinedFields ())
+      for (const field of this .getUserDefinedFields ())
+      {
+         switch (field .getAccessType ())
          {
-            switch (field .getAccessType ())
+            case X3DConstants .inputOnly:
             {
-               case X3DConstants .inputOnly:
-               {
-                  const callback = this .context [field .getName ()];
-
-                  if (typeof callback === "function")
-                     field .addInterest ("set_field__", this, callback);
+               const callback = this .context .get (field .getName ());
 
-                  break;
-               }
-               case X3DConstants .inputOutput:
-               {
-                  const callback = this .context ["set_" + field .getName ()];
-
-                  if (typeof callback === "function")
-                     field .addInterest ("set_field__", this, callback);
+               if (typeof callback === "function")
+                  field .addInterest ("set_field__", this, callback);
 
-                  break;
-               }
+               break;
             }
-         }
-
-         this .processOutstandingEvents ();
-      }
-      else
-      {
-         if (this .context .prepareEvents)
-            this .getBrowser () .prepareEvents () .removeInterest ("prepareEvents__", this);
+            case X3DConstants .inputOutput:
+            {
+               const callback = this .context .get ("set_" + field .getName ());
 
-         if (this .context .eventsProcessed)
-            this .removeInterest ("eventsProcessed__", this);
+               if (typeof callback === "function")
+                  field .addInterest ("set_field__", this, callback);
 
-         for (const field of this .getUserDefinedFields ())
-         {
-            switch (field .getAccessType ())
-            {
-               case X3DConstants .inputOnly:
-               case X3DConstants .inputOutput:
-                  field .removeInterest ("set_field__", this);
-                  break;
+               break;
             }
          }
-
-         if (this .initialized)
-            this .pauseTime = Date .now ();
       }
    },
-   prepareEvents__: function ()
+   call__: function (callback, name)
    {
       const browser = this .getBrowser ();
 
@@ -487,12 +416,11 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
 
       try
       {
-         this .context .prepareEvents (browser .getCurrentTime ());
-         browser .addBrowserEvent ();
+         callback (browser .getCurrentTime ());
       }
       catch (error)
       {
-         this .setError ("in function 'prepareEvents'", error);
+         this .setError (`in function '${name}'`, error);
       }
 
       browser .getScriptStack () .pop ();
@@ -516,44 +444,42 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
       browser .getScriptStack () .pop ();
       field .setTainted (false);
    },
-   eventsProcessed__: function ()
+   setError: function (reason, error)
    {
-      const browser = this .getBrowser ();
+      console .error ("JavaScript Error in Script '" + this .getName () + "', " + reason + "\nworld url is '" + this .getExecutionContext () .getWorldURL () + "':");
+      console .error (error);
+   },
+   disconnect: function ()
+   {
+      // Call shutdown.
 
-      browser .getScriptStack () .push (this);
+      const shutdown = this .context ?.get ("shutdown");
 
-      try
-      {
-         this .context .eventsProcessed ();
-      }
-      catch (error)
-      {
-         this .setError ("in function 'eventsProcessed'", error);
-      }
+      if (typeof shutdown === "function")
+         this .call__ (shutdown, "shutdown");
 
-      browser .getScriptStack () .pop ();
-   },
-   shutdown__: function ()
-   {
-      const browser = this .getBrowser ();
+      // Disconnect shutdown.
 
-      browser .getScriptStack () .push (this);
+      $(window) .off (".Script" + this .getId ());
 
-      try
-      {
-         this .context .shutdown ();
-      }
-      catch (error)
-      {
-         this .setError ("in function 'shutdown'", error);
-      }
+      // Disconnect prepareEvents.
 
-      browser .getScriptStack () .pop ();
+      this .getBrowser () .prepareEvents () .removeInterest ("call__", this);
+
+      // Disconnect eventsProcessed.
+
+      this .removeInterest ("call__", this);
+
+      // Disconnect fields.
+
+      for (const field of this .getUserDefinedFields ())
+         field .removeInterest ("set_field__", this);
    },
-   setError: function (reason, error)
+   dispose: function ()
    {
-      console .error ("JavaScript Error in Script '" + this .getName () + "', " + reason + "\nworld url is '" + this .getExecutionContext () .getWorldURL () + "':");
-      console .error (error);
+      this .disconnect ();
+
+      X3DScriptNode .prototype .dispose .call (this);
    },
 });
 

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

@@ -99,8 +99,6 @@ ComposedShader .prototype = Object .assign (Object .create (X3DShaderNode .proto
       X3DShaderNode               .prototype .initialize .call (this);
       X3DProgrammableShaderObject .prototype .initialize .call (this);
 
-      this .getLive () .addInterest ("set_live__", this);
-
       // https://www.web3d.org/documents/specifications/19775-1/V4.0/Part01/shaders_glsl.html#relinkingprograms
       this ._activate .addInterest ("set_activate__", this);
 
@@ -123,7 +121,7 @@ ComposedShader .prototype = Object .assign (Object .create (X3DShaderNode .proto
    },
    addUserDefinedField: function (accessType, name, field)
    {
-      const shaderFields = this .isInitialized () && this .getLive () .getValue () && this .isValid ();
+      const shaderFields = this .isInitialized () && this .isValid ();
 
       if (shaderFields)
          this .removeShaderFields ();
@@ -135,7 +133,7 @@ ComposedShader .prototype = Object .assign (Object .create (X3DShaderNode .proto
    },
    removeUserDefinedField: function (name)
    {
-      const shaderFields = this .isInitialized () && this .getLive () .getValue () && this .isValid ();
+      const shaderFields = this .isInitialized () && this .isValid ();
 
       if (shaderFields)
          this .removeShaderFields ();
@@ -153,22 +151,9 @@ ComposedShader .prototype = Object .assign (Object .create (X3DShaderNode .proto
    {
       return this .program;
    },
-   set_live__: function ()
-   {
-      if (this .getLive () .getValue ())
-      {
-         if (this .isValid ())
-            this .addShaderFields ();
-      }
-      else
-      {
-         if (this .isValid ())
-            this .removeShaderFields ();
-      }
-   },
    set_activate__: function ()
    {
-      if (! this ._activate .getValue ())
+      if (!this ._activate .getValue ())
          return;
 
       this .set_loaded__ ();

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

@@ -101,8 +101,6 @@ PackagedShader .prototype = Object .assign (Object .create (X3DShaderNode .proto
    },
    requestImmediateLoad: function (cache = true)
    { },
-   requestUnload: function ()
-   { },
    initialize: function ()
    {
       X3DShaderNode               .prototype .initialize .call (this);