x_ite 8.7.8 → 8.8.0

package/src/x_ite/InputOutput/FileLoader.js

@@ -45,11 +45,11 @@
  *
  ******************************************************************************/
 
-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";
+import X3DObject   from "../Base/X3DObject.js";
+import Fields      from "../Fields.js";
+import GoldenGate  from "../Parser/GoldenGate.js";
+import X3DWorld    from "../Execution/X3DWorld.js";
+import DEVELOPMENT from "../DEVELOPMENT.js";
 
 const
    ECMAScript = /^\s*(?:vrmlscript|javascript|ecmascript)\:(.*)$/s,
@@ -78,20 +78,19 @@ function FileLoader (node)
    this .controller       = new AbortController ();
 }
 
-FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
+Object .assign (Object .setPrototypeOf (FileLoader .prototype, X3DObject .prototype),
 {
-   constructor: FileLoader,
-   abort: function ()
+   abort ()
    {
       this .url .length = 0;
 
       this .controller .abort ();
    },
-   getURL: function ()
+   getURL ()
    {
       return this .URL;
    },
-   getReferer: function ()
+   getReferer ()
    {
       if (this .node instanceof X3DWorld)
       {
@@ -101,7 +100,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       return this .executionContext .getWorldURL ();
    },
-   getTarget: function (parameters)
+   getTarget (parameters)
    {
       for (const parameter of parameters)
       {
@@ -116,7 +115,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       return "";
    },
-   createX3DFromString: function (worldURL, string = "", success, error)
+   createX3DFromString (worldURL, string = "", resolve, reject)
    {
       try
       {
@@ -129,27 +128,27 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
          scene .setWorldURL (new URL (worldURL, this .getReferer ()) .href);
 
-         if (success)
-            success = this .setScene .bind (this, scene, success, error);
+         if (resolve)
+            resolve = this .setScene .bind (this, scene, resolve, reject);
 
-         new GoldenGate (scene) .parseIntoScene (string, success, error);
+         new GoldenGate (scene) .parseIntoScene (string, resolve, reject);
 
          return scene;
       }
-      catch (exception)
+      catch (error)
       {
-         if (error)
-            error (exception);
+         if (reject)
+            reject (error);
          else
             throw error;
       }
    },
-   setScene: function (scene, success, error)
+   setScene (scene, resolve, reject)
    {
-      scene ._initLoadCount .addInterest ("set_initLoadCount__", this, scene, success, error);
+      scene ._initLoadCount .addInterest ("set_initLoadCount__", this, scene, resolve, reject);
       scene ._initLoadCount .addEvent ();
    },
-   set_initLoadCount__: function (scene, success, error, field)
+   set_initLoadCount__ (scene, resolve, reject, field)
    {
       // Wait for extern protos to be loaded.
 
@@ -166,24 +165,24 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       {
          try
          {
-            success (scene);
+            resolve (scene);
          }
-         catch (exception)
+         catch (error)
          {
-            if (error)
-               error (exception);
+            if (reject)
+               reject (error);
             else
-               throw exception;
+               throw error;
          }
       });
 
-      if (DEBUG)
+      if (DEVELOPMENT)
       {
          if (this .URL .protocol !== "data:")
             console .info (`Done loading scene '${decodeURI (this .URL .href)}'`);
       }
    },
-   createX3DFromURL: function (url, parameter, callback, bindViewpoint, foreign)
+   createX3DFromURL (url, parameter, callback, bindViewpoint, foreign)
    {
       this .bindViewpoint = bindViewpoint;
       this .foreign       = foreign;
@@ -191,14 +190,14 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       return this .loadDocument (url, this .createX3DFromURLAsync .bind (this, callback));
    },
-   createX3DFromURLAsync: function (callback, data)
+   createX3DFromURLAsync (callback, data)
    {
       if (data === null)
          callback (null);
       else
          this .createX3DFromString (this .URL, data, callback, this .loadDocumentError .bind (this));
    },
-   loadDocument: function (url, callback)
+   loadDocument (url, callback)
    {
       this .url      = url .copy ();
       this .callback = callback;
@@ -297,18 +296,18 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       this .callback ($.ungzip (await response .arrayBuffer ()), this .URL);
    },
-   handleErrors: function (response)
+   handleErrors (response)
    {
       if (response .ok)
          return response;
 
       throw Error (response .statusText || response .status);
    },
-   loadDocumentError: function (exception)
+   loadDocumentError (error)
    {
-      // Output exception.
+      // Output error.
 
-      this .error (exception);
+      this .setError (error);
 
       // Try to load next URL.
 
@@ -322,15 +321,12 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
          this .callback (null);
       }
    },
-   error: function (exception)
+   setError (error)
    {
       if (this .URL .protocol === "data:")
-         console .warn (`Couldn't load data URL: ${exception .message}`);
+         console .error (`Couldn't load data URL.`, error);
       else
-         console .warn (`Couldn't load URL '${decodeURI (this .URL .href)}': ${exception .message}`);
-
-      if (DEBUG)
-         console .error (exception);
+         console .error (`Couldn't load URL '${decodeURI (this .URL .href)}'.`, error);
    },
 });
 

package/src/x_ite/InputOutput/Generator.js

@@ -101,10 +101,9 @@ function Generator ({ style = "TIDY", indent = "", precision = 7, doublePrecisio
    this .names .set (null, Object .assign (new Set (), { index: 0 }));
 }
 
-Generator .prototype =
+Object .assign (Generator .prototype,
 {
-   constructor: Generator,
-   Style: function (style)
+   Style (style)
    {
       switch (style)
       {
@@ -169,69 +168,69 @@ Generator .prototype =
          }
       }
    },
-   Comma: function ()
+   Comma ()
    {
       return this .comma;
    },
-   Break: function ()
+   Break ()
    {
       return this .break;
    },
-   TidyBreak: function ()
+   TidyBreak ()
    {
       return this .tidyBreak;
    },
-   ForceBreak: function ()
+   ForceBreak ()
    {
       return "\n";
    },
-   Space: function ()
+   Space ()
    {
       return " ";
    },
-   TidySpace: function ()
+   TidySpace ()
    {
       return this .tidySpace;
    },
-   ListStart: function ()
+   ListStart ()
    {
       return this .listEnclosure;
    },
-   ListEnd: function ()
+   ListEnd ()
    {
       return this .listEnclosure;
    },
-   ListBreak: function ()
+   ListBreak ()
    {
       return this .listBreak;
    },
-   AttribBreak: function ()
+   AttribBreak ()
    {
       return this .attribBreak;
    },
-   Indent: function ()
+   Indent ()
    {
       return this .indent;
    },
-   ListIndent: function ()
+   ListIndent ()
    {
       return this .listIndent;
    },
-   IncIndent: function ()
+   IncIndent ()
    {
       this .indent     += this .indentChar;
       this .listIndent += this .listIndentChar;
 
       return "";
    },
-   DecIndent: function ()
+   DecIndent ()
    {
       this .indent     = this .indent     .slice (0, this .indent     .length - this .indentChar     .length);
       this .listIndent = this .listIndent .slice (0, this .listIndent .length - this .listIndentChar .length);
 
       return "";
    },
-   FloatFormat: function  (value)
+   FloatFormat  (value)
    {
       if (Number .isFinite (value))
       {
@@ -247,7 +246,7 @@ Generator .prototype =
          return String (value);
       }
    },
-   DoubleFormat: function  (value)
+   DoubleFormat  (value)
    {
       if (Number .isFinite (value))
       {
@@ -263,7 +262,7 @@ Generator .prototype =
          return String (value);
       }
    },
-   PushExecutionContext: function (executionContext)
+   PushExecutionContext (executionContext)
    {
       this .executionContextStack .push (executionContext);
 
@@ -276,7 +275,7 @@ Generator .prototype =
       if (!this .exportedNodesIndex .has (executionContext))
          this .exportedNodesIndex .set (executionContext, new Set ());
    },
-   PopExecutionContext: function ()
+   PopExecutionContext ()
    {
       this .executionContextStack .pop ();
 
@@ -286,15 +285,15 @@ Generator .prototype =
       this .importedNodesIndex .clear ();
       this .exportedNodesIndex .clear ();
    },
-   ExecutionContext: function ()
+   ExecutionContext ()
    {
       return this .executionContextStack .at (-1);
    },
-   EnterScope: function ()
+   EnterScope ()
    {
       ++ this .level;
    },
-   LeaveScope: function ()
+   LeaveScope ()
    {
       -- this .level;
 
@@ -305,7 +304,7 @@ Generator .prototype =
          this .importedNames .clear ();
       }
    },
-   ExportedNodes: function (exportedNodes)
+   ExportedNodes (exportedNodes)
    {
       const index = this .exportedNodesIndex .get (this .ExecutionContext ());
 
@@ -315,11 +314,11 @@ Generator .prototype =
          {
             index .add (exportedNode .getLocalNode ())
          }
-         catch (error)
+         catch
          { }
       });
    },
-   ImportedNodes: function (importedNodes)
+   ImportedNodes (importedNodes)
    {
       const index = this .importedNodesIndex .get (this .ExecutionContext ());
 
@@ -329,37 +328,37 @@ Generator .prototype =
          {
             index .add (importedNode .getInlineNode ());
          }
-         catch (error)
+         catch
          { }
       });
    },
-   AddImportedNode: function (exportedNode, importedName)
+   AddImportedNode (exportedNode, importedName)
    {
       this .importedNames .set (exportedNode, importedName);
    },
-   AddRouteNode: function (routeNode)
+   AddRouteNode (routeNode)
    {
       this .routeNodes .add (routeNode);
    },
-   ExistsRouteNode: function (routeNode)
+   ExistsRouteNode (routeNode)
    {
       return this .routeNodes .has (routeNode);
    },
-   IsSharedNode: function (baseNode)
+   IsSharedNode (baseNode)
    {
       return this .ExecutionContext () !== baseNode .getExecutionContext ();
    },
-   AddNode: function (baseNode)
+   AddNode (baseNode)
    {
       this .nodes .add (baseNode);
 
       this .AddRouteNode (baseNode);
    },
-   ExistsNode: function (baseNode)
+   ExistsNode (baseNode)
    {
       return this .nodes .has (baseNode);
    },
-   Name: function (baseNode)
+   Name (baseNode)
    {
       // Is the node already in index.
 
@@ -400,7 +399,7 @@ Generator .prototype =
          return newName;
       }
    },
-   NeedsName: function (baseNode)
+   NeedsName (baseNode)
    {
       if (baseNode .getCloneCount () > 1)
          return true;
@@ -430,7 +429,7 @@ Generator .prototype =
          return false;
       }
    },
-   LocalName: function (baseNode)
+   LocalName (baseNode)
    {
       const importedName = this .importedNames .get (baseNode);
 
@@ -440,24 +439,24 @@ Generator .prototype =
       if (this .ExistsNode (baseNode))
          return this .Name (baseNode);
 
-      throw new Error ("Couldn't get local name for node '" + baseNode .getTypeName () + "'.");
+      throw new Error (`Couldn't get local name for node '${baseNode .getTypeName ()}'.`);
    },
-   PushContainerField: function (field)
+   PushContainerField (field)
    {
       this .containerFields .push (field);
    },
-   PopContainerField: function ()
+   PopContainerField ()
    {
       this .containerFields .pop ();
    },
-   ContainerField: function ()
+   ContainerField ()
    {
       if (this .containerFields .length)
          return this .containerFields [this .containerFields .length - 1];
 
       return null;
    },
-   AccessType: function (accessType)
+   AccessType (accessType)
    {
       switch (accessType)
       {
@@ -471,30 +470,30 @@ Generator .prototype =
             return "inputOutput";
       }
    },
-   SetUnits: function (value)
+   SetUnits (value)
    {
       this .units = value;
    },
-   GetUnits: function ()
+   GetUnits ()
    {
       return this .units;
    },
-   PushUnitCategory: function (category)
+   PushUnitCategory (category)
    {
       this .unitCategories .push (category);
    },
-   PopUnitCategory: function ()
+   PopUnitCategory ()
    {
       this .unitCategories .pop ();
    },
-   Unit: function (category)
+   Unit (category)
    {
       if (this .unitCategories .length == 0)
          return category;
 
       return this .unitCategories .at (-1);
    },
-   ToUnit: function (category, value)
+   ToUnit (category, value)
    {
       if (this .units)
       {
@@ -562,7 +561,7 @@ Generator .prototype =
          return string .replace (regex, char => map [char]);
       };
    })(),
-   JSONNumber: function (value)
+   JSONNumber (value)
    {
       switch (value)
       {
@@ -574,7 +573,7 @@ Generator .prototype =
             return value;
       }
    },
-   JSONRemoveComma: function ()
+   JSONRemoveComma ()
    {
       // this .string = this .string .replace (/,(\s*)$/s, "$1");
 
@@ -585,7 +584,7 @@ Generator .prototype =
 
       this .string += this .TidyBreak ();
    },
-};
+});
 
 for (const key of Reflect .ownKeys (Generator .prototype))
    Object .defineProperty (Generator .prototype, key, { enumerable: false });

package/src/x_ite/Parser/GLB2Parser.js

@@ -56,14 +56,18 @@ function GLB2Parser (scene)
    this .buffers = [ ];
 }
 
-GLB2Parser .prototype = Object .assign (Object .create (X3DParser .prototype),
+Object .assign (Object .setPrototypeOf (GLB2Parser .prototype, X3DParser .prototype),
 {
-   constructor: GLB2Parser,
-   getEncoding: function ()
+   getEncoding ()
    {
       return "ARRAY_BUFFER";
    },
-   isValid: function ()
+   setInput (input)
+   {
+      this .arrayBuffer = input;
+      this .dataView    = new DataView (input);
+   },
+   isValid ()
    {
       if (!(this .arrayBuffer instanceof ArrayBuffer))
          return false;
@@ -82,16 +86,11 @@ GLB2Parser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return true;
    },
-   setInput: function (input)
-   {
-      this .arrayBuffer = input;
-      this .dataView    = new DataView (input);
-   },
-   parseIntoScene: function (success, error)
+   parseIntoScene (resolve, reject)
    {
       this .glb ()
-         .then (success)
-         .catch (error);
+         .then (resolve)
+         .catch (reject);
    },
    glb: async function ()
    {
@@ -113,7 +112,7 @@ GLB2Parser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return this .getScene ();
    },
-   chunks: function ()
+   chunks ()
    {
       for (let i = 12; i < this .dataView .byteLength;)
       {