x_ite 8.4.3 → 8.5.3

package/src/x_ite/Execution/BindableList.js

@@ -71,32 +71,16 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
    },
    getBound: function (name)
    {
-      if (this .array .length > 1)
-      {
-         const
-            enableInlineBindables = false,
-            mainScene             = this .getMainScene ();
-
-         if (name && name .length)
-         {
-            // Return first viewpoint with @name.
+      if (this .array .length === 1)
+         return this .array [0]; // Return default viewpoint.
 
-            for (let i = 1, length = this .array .length; i < length; ++ i)
-            {
-               const
-                  node      = this .array [i],
-                  outerNode = node .getExecutionContext () .getOuterNode (),
-                  scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
-
-               if (!enableInlineBindables && scene !== mainScene)
-                  continue;
-
-               if (node .getName () == name)
-                  return node;
-            }
-         }
+      const
+         enableInlineBindables = false,
+         mainScene             = this .getMainScene ();
 
-         // Return first bound viewpoint in scene.
+      if (name)
+      {
+         // Return first viewpoint with @name.
 
          for (let i = 1, length = this .array .length; i < length; ++ i)
          {
@@ -108,29 +92,43 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
             if (!enableInlineBindables && scene !== mainScene)
                continue;
 
-            if (node ._isBound .getValue ())
+            if (node .getName () == name)
                return node;
          }
+      }
 
-         // Return first viewpoint in scene.
+      // Return first bound viewpoint in scene.
 
-         for (let i = 1, length = this .array .length; i < length; ++ i)
-         {
-            const
-               node      = this .array [i],
-               outerNode = node .getExecutionContext () .getOuterNode (),
-               scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
+      for (let i = 1, length = this .array .length; i < length; ++ i)
+      {
+         const
+            node      = this .array [i],
+            outerNode = node .getExecutionContext () .getOuterNode (),
+            scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
 
-            if (!enableInlineBindables && scene !== mainScene)
-               continue;
+         if (!enableInlineBindables && scene !== mainScene)
+            continue;
 
+         if (node ._isBound .getValue ())
             return node;
-         }
       }
 
-      // Return default viewpoint.
+      // Return first viewpoint in scene.
+
+      for (let i = 1, length = this .array .length; i < length; ++ i)
+      {
+         const
+            node      = this .array [i],
+            outerNode = node .getExecutionContext () .getOuterNode (),
+            scene     = outerNode instanceof X3DPrototypeInstance ? outerNode .getScene () : node .getScene ();
+
+         if (!enableInlineBindables && scene !== mainScene)
+            continue;
+
+         return node;
+      }
 
-      return this .array [0];
+      return this .array [0]; // Return default viewpoint.
    },
    push: function (node)
    {

package/src/x_ite/Execution/BindableStack.js

@@ -152,22 +152,40 @@ BindableStack .prototype = Object .assign (Object .create (X3DBaseNode .prototyp
 
       // Do transition, use transition node for multiple layers support.
 
-      this .transitionNode = top .create (this .getExecutionContext ());
+      this .transitionNode .dispose ();
 
-      this .transitionNode .setup ();
-      this .transitionNode .transitionStart (layerNode, fromNode, top);
+      const transitionNode = this .transitionNode = top .create (this .getExecutionContext ());
 
-      if (this .transitionNode ._transitionActive .getValue ())
-         this .transitionNode ._transitionActive .addInterest ("set_transitionActive__", this);
+      transitionNode .setup ();
+      transitionNode .transitionStart (layerNode, fromNode, top);
+
+      if (transitionNode ._transitionActive .getValue ())
+      {
+         top ._position         .addFieldInterest (transitionNode ._position);
+         top ._orientation      .addFieldInterest (transitionNode ._orientation);
+         top ._centerOfRotation .addFieldInterest (transitionNode ._centerOfRotation);
+         top ._fieldOfView      .addFieldInterest (transitionNode ._fieldOfView);
+         top ._nearDistance     .addFieldInterest (transitionNode ._nearDistance);
+         top ._farDistance      .addFieldInterest (transitionNode ._farDistance);
+
+         transitionNode ._transitionActive .addInterest ("set_transitionActive__", this, top, transitionNode);
+      }
 
       this .addNodeEvent ();
    },
-   set_transitionActive__: function (transitionActive)
+   set_transitionActive__: function (top, transitionNode, transitionActive)
    {
       if (transitionActive .getValue ())
          return;
 
-      this .transitionNode ._transitionActive .removeInterest ("set_transitionActive__", this);
+      top ._position         .removeFieldInterest (transitionNode ._position);
+      top ._orientation      .removeFieldInterest (transitionNode ._orientation);
+      top ._centerOfRotation .removeFieldInterest (transitionNode ._centerOfRotation);
+      top ._fieldOfView      .removeFieldInterest (transitionNode ._fieldOfView);
+      top ._nearDistance     .removeFieldInterest (transitionNode ._nearDistance);
+      top ._farDistance      .removeFieldInterest (transitionNode ._farDistance);
+
+      transitionNode ._transitionActive .removeInterest ("set_transitionActive__", this);
 
       this .addNodeEvent ();
    },

package/src/x_ite/Execution/X3DScene.js

@@ -299,7 +299,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    },
    getMetaDatas: function ()
    {
-      return this [_metadata];
+      return new Map (this [_metadata]);
    },
    addExportedNode: function (exportedName, node)
    {
@@ -918,7 +918,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
       this .getExportedNodes () .toJSONStream (generator, true);
 
-      generator .string = generator .string .replace (/,(\s*)$/s, "$1");
+      generator .JSONRemoveComma ();
 
       generator .LeaveScope ();
       generator .PopExecutionContext ();

package/src/x_ite/Execution/X3DWorld.js

@@ -96,7 +96,7 @@ X3DWorld .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
    },
    getCache: function ()
    {
-      return true;
+      return this .getBrowser () .getBrowserOption ("Cache");
    },
    getLayerSet: function ()
    {

package/src/x_ite/Fields/SFRotation.js

@@ -49,6 +49,7 @@ import X3DField     from "../Base/X3DField.js";
 import SFVec3       from "./SFVec3.js";
 import SFMatrix3    from "./SFMatrix3.js";
 import X3DConstants from "../Base/X3DConstants.js";
+import Vector3      from "../../standard/Math/Numbers/Vector3.js";
 import Rotation4    from "../../standard/Math/Numbers/Rotation4.js";
 import Matrix3      from "../../standard/Math/Numbers/Matrix3.js";
 
@@ -125,7 +126,7 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    getAxis: function ()
    {
-      return new SFVec3f (this .getValue () .getAxis () .copy ());
+      return new SFVec3f (this .getValue () .getAxis (new Vector3 (0, 0, 0)));
    },
    setMatrix: function (matrix)
    {

package/src/x_ite/Fields/SFString.js

@@ -49,7 +49,7 @@ import X3DField     from "../Base/X3DField.js";
 import X3DConstants from "../Base/X3DConstants.js";
 
 const
-   unescape = /\\(.)/g,
+   unescape = /\\([\\"])/g,
    escape   = /([\\"])/g;
 
 function SFString (value)

package/src/x_ite/InputOutput/FileLoader.js

@@ -45,19 +45,15 @@
  *
  ******************************************************************************/
 
-import X3DObject       from "../Base/X3DObject.js";
-import Fields          from "../Fields.js";
-import GoldenGate      from "../Parser/GoldenGate.js";
-import X3DWorld        from "../Execution/X3DWorld.js";
-import BinaryTransport from "../../standard/Networking/BinaryTransport.js";
-import DEBUG           from "../DEBUG.js";
-
-BinaryTransport ($);
+import X3DObject  from "../Base/X3DObject.js";
+import Fields     from "../Fields.js";
+import GoldenGate from "../Parser/GoldenGate.js";
+import X3DWorld   from "../Execution/X3DWorld.js";
+import DEBUG      from "../DEBUG.js";
 
 const
-   ECMAScript    = /^\s*(?:vrmlscript|javascript|ecmascript)\:(.*)$/s,
-   dataURL       = /^data:(.*?)(?:;charset=(.*?))?(?:;(base64))?,(.*)$/s,
-   contentTypeRx = /^(?:(.*?);(.*?)$)/;
+   ECMAScript = /^\s*(?:vrmlscript|javascript|ecmascript)\:(.*)$/s,
+   dataURL    = /^data:(.*?)(?:;charset=(.*?))?(?:;(base64))?,(.*)$/s;
 
 const foreignExtensions = new RegExp ("\.(?:html|xhtml)$");
 
@@ -81,7 +77,6 @@ function FileLoader (node, external)
    this .url              = [ ];
    this .URL              = new URL (this .getReferer (), this .getReferer ());
    this .fileReader       = new FileReader ();
-   this .text             = true;
 }
 
 FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
@@ -101,6 +96,31 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    {
       return this .URL;
    },
+   getReferer: function ()
+   {
+      if (this .node .getTypeName () === "X3DWorld")
+      {
+         if (this .external)
+            return this .browser .getLocation ();
+      }
+
+      return this .executionContext .getWorldURL ();
+   },
+   getTarget: function (parameters)
+   {
+      for (const parameter of parameters)
+      {
+         const pair = parameter .split ("=");
+
+         if (pair .length !== 2)
+            continue;
+
+         if (pair [0] === "target")
+            return pair [1];
+      }
+
+      return "";
+   },
    createX3DFromString: function (worldURL, string = "", success, error)
    {
       try
@@ -167,10 +187,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       this .foreign       = foreign;
       this .target        = this .getTarget (parameter || defaultParameter);
 
-      if (callback)
-         return this .loadDocument (url, this .createX3DFromURLAsync .bind (this, callback));
-
-      return this .createX3DFromURLSync (url);
+      return this .loadDocument (url, this .createX3DFromURLAsync .bind (this, callback));
    },
    createX3DFromURLAsync: function (callback, data)
    {
@@ -179,242 +196,111 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       else
          this .createX3DFromString (this .URL, data, callback, this .loadDocumentError .bind (this));
    },
-   createX3DFromURLSync: function (urls)
-   {
-      if (urls .length === 0)
-         throw new Error ("No URL given.");
-
-      let
-         scene   = null,
-         success = false;
-
-      for (const url of urls)
-      {
-         this .URL = new URL (url, this .getReferer ());
-
-         $.ajax ({
-            url: decodeURI (this .URL .href),
-            dataType: "text",
-            async: false,
-            cache: this .browser .getBrowserOptions () .getCache () && this .node .getCache (),
-            //timeout: 15000,
-            global: false,
-            context: this,
-            success: function (data)
-            {
-               try
-               {
-                  scene   = this .createX3DFromString (this .URL, data);
-                  success = true;
-               }
-               catch (exception)
-               {
-                  this .error (exception);
-               }
-            },
-            error: function (jqXHR, textStatus, errorThrown)
-            {
-               //console .warn ("Couldn't load URL '" + this .URL .href + "': " + errorThrown + ".");
-            },
-         });
-
-         if (success)
-            return scene;
-      }
-
-      throw new Error ("Couldn't load any url of '" + Array .prototype .join .call (urls, ", ") + "'.");
-   },
-   loadScript: function (url, callback)
-   {
-      this .script = true;
-
-      this .loadDocument (url, callback);
-   },
    loadDocument: function (url, callback)
    {
-      this .url       = url .copy ();
-      this .callback  = callback;
+      this .url      = url .copy ();
+      this .callback = callback;
 
       if (url .length === 0)
          return this .loadDocumentError (new Error ("No URL given."));
 
-      this .loadDocumentAsync (this .url .shift ());
+      this .loadDocumentAsync (this .url .shift ())
+         .catch (this .loadDocumentError .bind (this));
    },
-   loadBinaryDocument: function (url, callback)
+   loadDocumentAsync: async function (url)
    {
-      this .url       = url .copy ();
-      this .callback  = callback;
-      this .text      = false;
-
       if (url .length === 0)
-         return this .loadDocumentError (new Error ("No URL given."));
-
-      this .loadDocumentAsync (this .url .shift ());
-   },
-   getTarget: function (parameters)
-   {
-      for (const parameter of parameters)
       {
-         const pair = parameter .split ("=");
-
-         if (pair .length !== 2)
-            continue;
-
-         if (pair [0] === "target")
-            return pair [1];
+         this .loadDocumentError (new Error ("URL is empty."));
+         return;
       }
 
-      return "";
-   },
-   loadDocumentAsync: function (url)
-   {
-      try
+      // Script
       {
-         if (url .length === 0)
+         const result = ECMAScript .exec (url);
+
+         if (result)
          {
-            this .loadDocumentError (new Error ("URL is empty."));
+            this .callback (result [1]);
             return;
          }
+      }
 
-         // Script
+      // Data URL
+      {
+         const result = dataURL .exec (url);
 
-         if (this .script)
+         if (result)
          {
-            const result = ECMAScript .exec (url);
-
-            if (result)
-            {
-               this .callback (result [1]);
-               return;
-            }
-         }
+            //const mimeType = result [1];
 
-         // Test for data URL here.
+            // ??? If called from loadURL and mime type is text/html do a window.open or window.location=URL and return; ???
 
-         {
-            const result = dataURL .exec (url);
+            let data = result [4];
 
-            if (result)
-            {
-               //const mimeType = result [1];
+            if (result [3] === "base64")
+               data = atob (data);
+            else
+               data = unescape (data);
 
-               // ??? If called from loadURL and mime type is text/html do a window.open or window.location=URL and return; ???
+            this .callback (data);
+            return;
+         }
+      }
 
-               let data = result [4];
+      this .URL = new URL (url, this .getReferer ());
 
-               if (result [3] === "base64")
-                  data = atob (data);
-               else
-                  data = unescape (data);
+      if (this .bindViewpoint)
+      {
+			const referer = new URL (this .getReferer ());
 
-               this .callback (data);
-               return;
-            }
+         if (this .URL .protocol === referer .protocol &&
+				 this .URL .hostname === referer .hostname &&
+				 this .URL .port === referer .port &&
+				 this .URL .pathname === referer .pathname &&
+             this .URL .hash)
+         {
+            this .bindViewpoint (decodeURIComponent (this .URL .hash .substr (1)));
+            return;
          }
+      }
 
-         this .URL = new URL (url, this .getReferer ());
+      if (this .foreign)
+      {
+         // Handle target
 
-         if (this .bindViewpoint)
-         {
-            if (this .URL .href .substr (0, this .getReferer () .length) === this .getReferer ())
-            {
-               this .bindViewpoint (decodeURIComponent (this .URL .hash .substr (1)));
-               return;
-            }
-         }
+         if (this .target .length && this .target !== "_self")
+            return this .foreign (this .URL .href, this .target);
 
-         if (this .foreign)
-         {
-            // Handle target
+         // Handle well known foreign content depending on extension or if path looks like directory.
 
-            if (this .target .length && this .target !== "_self")
-               return this .foreign (this .URL .href, this .target);
+         if (this .URL .href .match (foreignExtensions))
+            return this .foreign (this .URL .href, this .target);
+      }
 
-            // Handle well known foreign content depending on extension or if path looks like directory.
+      // Load URL async
 
-            if (this .URL .href .match (foreignExtensions))
-               return this .foreign (this .URL .href, this .target);
-         }
+      const
+         options     = { cache: this .node .getCache () ? "default" : "reload" },
+         response    = this .handleErrors (await fetch (decodeURI (this .URL .href), options)),
+         contentType = response .headers .get ("content-type");
 
-         // Load URL async
-
-         $.ajax ({
-            url: decodeURI (this .URL .href),
-            dataType: "binary",
-            async: true,
-            cache: this .browser .getBrowserOptions () .getCache () && this .node .getCache (),
-            //timeout: 15000,
-            global: false,
-            context: this,
-            success: function (blob, status, xhr)
-            {
-               if (this .foreign)
-               {
-                  //console .log (this .getContentType (xhr));
-
-                  if (foreign [this .getContentType (xhr)])
-                     return this .foreign (this .URL .href, this .target);
-               }
-
-               if (this .text)
-               {
-                  this .fileReader .onload = this .readAsArrayBuffer .bind (this, blob);
-
-                  this .fileReader .readAsArrayBuffer (blob);
-               }
-               else
-               {
-                  this .fileReader .onload = this .readAsBinaryString .bind (this);
-
-                  this .fileReader .readAsBinaryString (blob);
-               }
-            },
-            error: function (xhr, textStatus, exception)
-            {
-               this .loadDocumentError (new Error (exception));
-            },
-         });
-      }
-      catch (exception)
-      {
-         this .loadDocumentError (exception);
-         return;
-      }
-   },
-   readAsArrayBuffer: function (blob)
-   {
-      try
-      {
-         this .callback (pako .ungzip (this .fileReader .result, { to: "string" }), this .URL);
-      }
-      catch (exception)
+      if (this .foreign)
       {
-         this .fileReader .onload = this .readAsText .bind (this, blob);
+         //console .log (contentType);
 
-         this .fileReader .readAsText (blob);
-      }
-   },
-   readAsText: function (blob)
-   {
-      try
-      {
-         this .callback (this .fileReader .result, this .URL);
-      }
-      catch (exception)
-      {
-         this .loadDocumentError (exception);
+         if (foreign [contentType])
+            return this .foreign (this .URL .href, this .target);
       }
+
+      this .callback ($.ungzip (await response .arrayBuffer ()), this .URL);
    },
-   readAsBinaryString: function ()
+   handleErrors: function (response)
    {
-      try
-      {
-         this .callback (this .fileReader .result, this .URL);
-      }
-      catch (exception)
-      {
-         this .loadDocumentError (exception);
-      }
+      if (!response .ok)
+         throw Error (response .statusText || response .status);
+
+      return response;
    },
    loadDocumentError: function (exception)
    {
@@ -425,10 +311,14 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       // Try to load next URL.
 
       if (this .url .length)
-         this .loadDocumentAsync (this .url .shift ());
-
+      {
+         this .loadDocumentAsync (this .url .shift ())
+            .catch (this .loadDocumentError .bind (this));
+      }
       else
+      {
          this .callback (null);
+      }
    },
    error: function (exception)
    {
@@ -440,27 +330,6 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       if (DEBUG)
          console .error (exception);
    },
-   getReferer: function ()
-   {
-      if (this .node .getTypeName () === "X3DWorld")
-      {
-         if (this .external)
-            return this .browser .getLocation ();
-      }
-
-      return this .executionContext .getWorldURL ();
-   },
-   getContentType: function (xhr)
-   {
-      const
-         contentType = xhr .getResponseHeader ("Content-Type"),
-         result      = contentTypeRx .exec (contentType);
-
-      if (result)
-         return result [1];
-
-      return "";
-   },
 });
 
 for (const key of Reflect .ownKeys (FileLoader .prototype))

package/src/x_ite/InputOutput/Generator.js

@@ -199,13 +199,6 @@ Generator .prototype =
 
       return "";
    },
-   PadRight: function (string, pad)
-   {
-      for (let i = 0, length = pad - string .length; i < length; ++ i)
-         string += " ";
-
-      return string;
-   },
    Precision: function (value)
    {
       return Math .fround (value) .toPrecision (this .precision) .replace (this .removeTrailingZeros, "$1");
@@ -510,7 +503,7 @@ Generator .prototype =
    {
       return string
          .replace (/&/g, "&amp;")
-         .replace (/\\/g, "&#92;")
+         .replace (/\\/g, "\\\\")
          .replace (/\t/g, "&#x9;")
          .replace (/\n/g, "&#xA;")
          .replace (/\r/g, "&#xD;")
@@ -580,6 +573,17 @@ Generator .prototype =
             return value;
       }
    },
+   JSONRemoveComma: function ()
+   {
+      // this .string = this .string .replace (/,(\s*)$/s, "$1");
+
+      this .string = this .string .trimEnd ();
+
+      if (this .string .endsWith (','))
+         this .string = this .string .slice (0, -1);
+
+      this .string += this .TidyBreak ();
+   },
 };
 
 for (const key of Reflect .ownKeys (Generator .prototype))