x_ite 8.6.18 → 8.6.20

package/src/x_ite/Browser/X3DBrowser.js

@@ -473,74 +473,56 @@ 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);
-
-         this [_fileLoader] ?.abort ();
-
          // Start loading.
 
-         const fileLoader = this [_fileLoader] = new FileLoader (this .getWorld ());
-
-         this .setBrowserLoading (true);
-         this .addLoadingObject (fileLoader);
+         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 .addLoadingObject (this); // Prevent resetLoadCount.
-               this .replaceWorld (scene) .then (resolve) .catch (reject);
-               this .removeLoadingObject (this);
-               this .removeLoadingObject (fileLoader);
             }
             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 (fileLoader);
-            this .setBrowserLoading (false);
 
             resolve ();
          },
          (url, target) =>
          {
-            if (fileLoader !== this [_fileLoader])
-            {
-               reject (new Error ("Loading of file aborted."));
-               return;
-            }
+            fileLoader .ready = true;
 
             if (target)
                window .open (url, target);
@@ -548,10 +530,17 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
                location = url;
 
             this .removeLoadingObject (fileLoader);
-            this .setBrowserLoading (false);
 
             resolve ();
          });
+
+         if (!fileLoader .ready)
+         {
+            this [_fileLoader] ?.abort ();
+
+            this .setBrowserLoading (true);
+            this .addLoadingObject (this [_fileLoader] = fileLoader);
+         }
       });
    },
    addBrowserListener: function (callback, object)
@@ -837,49 +826,51 @@ for (const key of Reflect .ownKeys (X3DBrowser .prototype))
 
 Object .defineProperty (X3DBrowser .prototype, "name",
 {
-   get: function () { return this .getName (); },
+   get: X3DBrowser .prototype .getName,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "version",
 {
-   get: function () { return this .getVersion (); },
+   get: X3DBrowser .prototype .getVersion,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "providerUrl",
 {
-   get: function () { return this .getProviderUrl (); },
+   get: X3DBrowser .prototype .getProviderUrl,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentFrameRate",
 {
-   get: function () { return this .getCurrentFrameRate (); },
+   get: X3DBrowser .prototype .getCurrentFrameRate,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentSpeed",
 {
-   get: function () { return this .getCurrentSpeed (); },
+   get: X3DBrowser .prototype .getCurrentSpeed,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "description",
 {
-   get: function ()
-   {
-      return this .getDescription ();
-   },
-   set: function (value)
-   {
-      this .setDescription (value);
-   },
+   get: X3DBrowser .prototype .getDescription,
+   set: X3DBrowser .prototype .setDescription,
+   enumerable: true,
+   configurable: false
+});
+
+Object .defineProperty (X3DBrowser .prototype, "baseURL",
+{
+   get: X3DBrowser .prototype .getBaseURL,
+   set: X3DBrowser .prototype .setBaseURL,
    enumerable: true,
    configurable: false
 });

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/Scripting/Script.js

@@ -152,8 +152,7 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
    },
    loadData: function ()
    {
-      new FileLoader (this) .loadDocument (this ._url,
-      (data) =>
+      new FileLoader (this) .loadDocument (this ._url, (data) =>
       {
          if (data === null)
          {
@@ -162,9 +161,8 @@ Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
          }
          else
          {
-            this .setLoadState (X3DConstants .COMPLETE_STATE);
-
             this .initialize__ ($.decodeText (data));
+            this .setLoadState (X3DConstants .COMPLETE_STATE);
          }
       });
    },

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

@@ -49,7 +49,7 @@ 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

@@ -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/Texturing/MovieTexture.js

@@ -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/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)

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -942,71 +942,71 @@ for (const key of Reflect .ownKeys (X3DExecutionContext .prototype))
 
 Object .defineProperty (X3DExecutionContext .prototype, "specificationVersion",
 {
-   get: function () { return this .getSpecificationVersion (); },
+   get: X3DExecutionContext .prototype .getSpecificationVersion,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "encoding",
 {
-   get: function () { return this .getEncoding (); },
+   get: X3DExecutionContext .prototype .getEncoding,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "profile",
 {
-   get: function () { return this .getProfile (); },
+   get: X3DExecutionContext .prototype .getProfile,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "components",
 {
-   get: function () { return this .getComponents (); },
+   get: X3DExecutionContext .prototype .getComponents,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "worldURL",
 {
-   get: function () { return this .getWorldURL (); },
+   get: X3DExecutionContext .prototype .getWorldURL,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "units",
 {
-   get: function () { return this .getUnits (); },
+   get: X3DExecutionContext .prototype .getUnits,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "rootNodes",
 {
-   get: function () { return this .getRootNodes (); },
-   set: function (value) { this .setRootNodes (value); },
+   get: X3DExecutionContext .prototype .getRootNodes,
+   set: X3DExecutionContext .prototype .setRootNodes,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "protos",
 {
-   get: function () { return this .getProtoDeclarations (); },
+   get: X3DExecutionContext .prototype .getProtoDeclarations,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "externprotos",
 {
-   get: function () { return this .getExternProtoDeclarations (); },
+   get: X3DExecutionContext .prototype .getExternProtoDeclarations,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "routes",
 {
-   get: function () { return this .getRoutes (); },
+   get: X3DExecutionContext .prototype .getRoutes,
    enumerable: true,
    configurable: false
 });

package/src/x_ite/Fields/SFNode.js

@@ -67,7 +67,8 @@ const handler =
             return value;
 
          const
-            field      = target .getValue () .getField (key),
+            node       = target .getValue (),
+            field      = node .getField (key),
             accessType = field .getAccessType ();
 
          // Specification conform would be: accessType & X3DConstants .outputOnly.
@@ -93,13 +94,14 @@ const handler =
       try
       {
          const
-            field      = target .getValue () .getField (key),
+            node       = target .getValue (),
+            field      = node .getField (key),
             accessType = field .getAccessType ();
 
          if (accessType !== X3DConstants .outputOnly)
             field .setValue (value);
 
-          return true;
+         return true;
       }
       catch (error)
       {

package/src/x_ite/Fields/SFRotation.js

@@ -49,9 +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";
 
 const
    SFVec3f    = SFVec3 .SFVec3f,
@@ -126,7 +124,7 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    getAxis: function ()
    {
-      return new SFVec3f (this .getValue () .getAxis (new Vector3 (0, 0, 0)));
+      return new SFVec3f (this .getValue () .getAxis ());
    },
    setMatrix: function (matrix)
    {
@@ -135,7 +133,7 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    getMatrix: function ()
    {
-      return new SFMatrix3f (this .getValue () .getMatrix (new Matrix3 ()));
+      return new SFMatrix3f (this .getValue () .getMatrix ());
    },
    inverse: function ()
    {

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -181,9 +181,9 @@ function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
       toJSONStreamValue: function (generator)
       {
          const
-            value = this .getValue (),
-            last  = value .length - 1,
-            category  = generator .Unit (this .getUnit ());
+            value    = this .getValue (),
+            last     = value .length - 1,
+            category = generator .Unit (this .getUnit ());
 
          for (let i = 0; i < last; ++ i)
          {

package/src/x_ite/InputOutput/FileLoader.js

@@ -55,7 +55,7 @@ const
    ECMAScript = /^\s*(?:vrmlscript|javascript|ecmascript)\:(.*)$/s,
    dataURL    = /^data:(.*?)(?:;charset=(.*?))?(?:;(base64))?,(.*)$/s;
 
-const foreignExtensions = new RegExp ("\.(?:html|xhtml)$");
+const foreignExtensions = new RegExp ("\.(?:html|htm|xhtml)$");
 
 const foreign = {
    "text/html":             true,
@@ -72,11 +72,10 @@ function FileLoader (node, external)
    this .browser          = node .getBrowser ();
    this .external         = external === undefined ? this .browser .isExternal () : external;
    this .executionContext = this .external ? node .getExecutionContext () : this .browser .currentScene;
-   this .userAgent        = this .browser .getName () + "/" + this .browser .getVersion () + " (X3D Browser; +" + this .browser .getProviderUrl () + ")";
    this .target           = "";
    this .url              = [ ];
    this .URL              = new URL (this .getReferer (), this .getReferer ());
-   this .fileReader       = new FileReader ();
+   this .controller       = new AbortController ();
 }
 
 FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
@@ -84,24 +83,20 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    constructor: FileLoader,
    abort: function ()
    {
-      this .callback      = Function .prototype;
-      this .bindViewpoint = Function .prototype;
-      this .foreign       = Function .prototype;
-   },
-   isPrivate: function ()
-   {
-      return true;
+      this .url .length = 0;
+
+      this .controller .abort ();
    },
-   getWorldURL: function ()
+   getURL: function ()
    {
       return this .URL;
    },
    getReferer: function ()
    {
-      if (this .node .getTypeName () === "X3DWorld")
+      if (this .node instanceof X3DWorld)
       {
          if (this .external)
-            return this .browser .getLocation ();
+            return this .browser .getBaseURL ();
       }
 
       return this .executionContext .getWorldURL ();
@@ -167,7 +162,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       // Wait for instances to be created.
 
-      setTimeout (function ()
+      setTimeout (() =>
       {
          try
          {
@@ -180,8 +175,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
             else
                throw exception;
          }
-      },
-      0);
+      });
 
       if (DEBUG)
       {
@@ -200,7 +194,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    createX3DFromURLAsync: function (callback, data)
    {
       if (data === null)
-         callback (null, this .URL);
+         callback (null);
       else
          this .createX3DFromString (this .URL, data, callback, this .loadDocumentError .bind (this));
    },
@@ -249,7 +243,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
             if (result [3] === "base64")
                data = atob (data);
             else
-               data = unescape (data);
+               data = decodeURIComponent (data);
 
             this .callback (data);
             return;
@@ -289,7 +283,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       // Load URL async
 
       const
-         options     = { cache: this .node .getCache () ? "default" : "reload" },
+         options     = { cache: this .node .getCache () ? "default" : "reload", signal: this .controller .signal },
          response    = this .handleErrors (await fetch (this .URL .href, options)),
          contentType = response .headers .get ("content-type") ?.replace (/;.*$/, "");
 
@@ -305,10 +299,10 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    },
    handleErrors: function (response)
    {
-      if (!response .ok)
-         throw Error (response .statusText || response .status);
+      if (response .ok)
+         return response;
 
-      return response;
+      throw Error (response .statusText || response .status);
    },
    loadDocumentError: function (exception)
    {

package/src/x_ite/InputOutput/Generator.js

@@ -72,7 +72,7 @@ function Generator ({ style = "TIDY", precision = 7, doublePrecision = 15 })
    this .units                 = true;
    this .unitCategories        = [ ];
 
-   this .names .set (null, new Set ());
+   this .names .set (null, Object .assign (new Set (), { index: 0 }));
 }
 
 Generator .prototype =

package/src/x_ite/Parser/X3DParser.js

@@ -54,14 +54,14 @@ function X3DParser (scene)
 
 X3DParser .prototype = {
    constructor: X3DParser,
-   getScene: function ()
-   {
-      return this .scene;
-   },
    getBrowser: function ()
    {
       return this .scene .getBrowser ();
    },
+   getScene: function ()
+   {
+      return this .scene;
+   },
    getExecutionContext: function ()
    {
       return this .executionContexts .at (-1);