x_ite 8.7.8 → 8.8.0

package/src/x_ite/Parser/GoldenGate.js

@@ -63,10 +63,9 @@ function GoldenGate (scene)
    this .inputs = new Map ();
 }
 
-GoldenGate .prototype = Object .assign (Object .create (X3DParser .prototype),
+Object .assign (Object .setPrototypeOf (GoldenGate .prototype, X3DParser .prototype),
 {
-   constructor: GoldenGate,
-   parseIntoScene: function (x3dSyntax, success, error)
+   parseIntoScene (x3dSyntax, resolve, reject)
    {
       for (const Parser of GoldenGate .Parser)
       {
@@ -85,16 +84,15 @@ GoldenGate .prototype = Object .assign (Object .create (X3DParser .prototype),
                continue;
 
             parser .pushExecutionContext (this .getExecutionContext ());
-            parser .parseIntoScene (success, error);
-            parser .popExecutionContext ();
+            parser .parseIntoScene (resolve, reject);
             return;
          }
-         catch (exception)
+         catch (error)
          {
-            if (error)
-               error (exception);
+            if (reject)
+               reject (error);
             else
-               throw exception;
+               throw error;
 
             return;
          }
@@ -103,9 +101,9 @@ GoldenGate .prototype = Object .assign (Object .create (X3DParser .prototype),
       if (this .getScene () .worldURL .startsWith ("data:"))
          throw new Error ("Couldn't parse X3D. No suitable file handler found for 'data:' URL.");
       else
-         throw new Error ("Couldn't parse X3D. No suitable file handler found for '" + this .getScene () .worldURL + "'.");
+         throw new Error (`Couldn't parse X3D. No suitable file handler found for '${this .getScene () .worldURL}'.`);
    },
-   getInput: function (encoding, x3dSyntax)
+   getInput (encoding, x3dSyntax)
    {
       if (this .inputs .has (encoding))
          return this .inputs .get (encoding);
@@ -116,7 +114,7 @@ GoldenGate .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return input;
    },
-   createInput: function (encoding, x3dSyntax)
+   createInput (encoding, x3dSyntax)
    {
       try
       {
@@ -132,7 +130,7 @@ GoldenGate .prototype = Object .assign (Object .create (X3DParser .prototype),
                return x3dSyntax instanceof ArrayBuffer ? x3dSyntax : undefined;
          }
       }
-      catch (error)
+      catch
       {
          return undefined;
       }

package/src/x_ite/Parser/HTMLSupport.js

@@ -30,7 +30,7 @@
  *
  ******************************************************************************/
 
-// Maps are set when component is registered.
+import X3DConstants from "../Base/X3DConstants.js";
 
 const
    nodeTypeNames = new Map (), // (TYPENAME -> TypeName)
@@ -38,21 +38,31 @@ const
 
 const HTMLSupport =
 {
-   addNodeTypeName: function (typeName)
+   addConcreteNode ({ typeName, fieldDefinitions })
+   {
+      this .addNodeTypeName (typeName);
+
+      for (const { name, accessType } of fieldDefinitions)
+      {
+         if (accessType & X3DConstants .initializeOnly)
+            this .addFieldName (name)
+      }
+   },
+   addNodeTypeName (typeName)
    {
       nodeTypeNames .set (typeName,                 typeName);
       nodeTypeNames .set (typeName .toUpperCase (), typeName);
    },
-   getNodeTypeName: function (typeName)
+   getNodeTypeName (typeName)
    {
       return nodeTypeNames .get (typeName);
    },
-   addFieldName: function (name)
+   addFieldName (name)
    {
       fieldNames .set (name,                 name);
       fieldNames .set (name .toLowerCase (), name);
    },
-   getFieldName: function (name)
+   getFieldName (name)
    {
       return fieldNames .get (name);
    },

package/src/x_ite/Parser/JSONParser.js

@@ -57,18 +57,13 @@ function JSONParser (scene)
    this .namespace = "http://www.web3d.org/specifications/x3d-namespace";
 }
 
-JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
+Object .assign (Object .setPrototypeOf (JSONParser .prototype, X3DParser .prototype),
 {
-   constructor: JSONParser,
-   getEncoding: function ()
+   getEncoding ()
    {
       return "JSON";
    },
-   isValid: function ()
-   {
-      return this .input instanceof Object;
-   },
-   setInput: function (json)
+   setInput (json)
    {
       try
       {
@@ -77,12 +72,16 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
          this .input = json;
       }
-      catch (error)
+      catch
       {
          this .input = undefined;
       }
    },
-   parseIntoScene: function (success, error)
+   isValid ()
+   {
+      return this .input instanceof Object;
+   },
+   parseIntoScene (resolve, reject)
    {
       /**
        * Load X3D JSON into an element.
@@ -98,11 +97,11 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       const parser = new XMLParser (this .getScene ());
 
       parser .setInput (child);
-      parser .parseIntoScene (success, error);
+      parser .parseIntoScene (resolve, reject);
 
       this .getScene () .setEncoding ("JSON");
    },
-   elementSetAttribute: function (element, key, value)
+   elementSetAttribute (element, key, value)
    {
       /**
        * Yet another way to set an attribute on an element.  does not allow you to
@@ -130,7 +129,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          }
       }
    },
-   convertChildren: function (parentkey, object, element)
+   convertChildren (parentkey, object, element)
    {
       /**
        * converts children of object to DOM.
@@ -148,7 +147,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          }
       }
    },
-   createElement: function (key, containerField)
+   createElement (key, containerField)
    {
       /**
        * a method to create and element with tagnam key to DOM in a namespace.  If
@@ -176,7 +175,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return child;
    },
-   createCDATA: function (document, element, str)
+   createCDATA (document, element, str)
    {
       const
          docu  = new DOMParser () .parseFromString ("<xml></xml>", "application/xml"),
@@ -184,7 +183,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       element .appendChild (cdata);
    },
-   convertObject: function (key, object, element, containerField)
+   convertObject (key, object, element, containerField)
    {
       /**
        * convert the object at object[key] to DOM.
@@ -243,7 +242,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          }
       }
    },
-   commentStringToXML: function (str)
+   commentStringToXML (str)
    {
       /**
        * convert a comment string in JavaScript to XML.  Pass the string
@@ -251,7 +250,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return str .replace (/\\\\/g, "\\");
    },
-   SFStringToXML: function (str)
+   SFStringToXML (str)
    {
       /**
        * convert an SFString to XML.
@@ -259,7 +258,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return str .replace (/([\\"])/g, "\\$1");
    },
-   JSONStringToXML: function (str)
+   JSONStringToXML (str)
    {
       /**
        * convert a JSON String to XML.
@@ -270,7 +269,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return str;
    },
-   convertToDOM: function(object, parentkey, element, containerField)
+   convertToDOM(object, parentkey, element, containerField)
    {
       /**
        * main routine for converting a JavaScript object to DOM.
@@ -326,7 +325,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                }
                default:
                {
-                  console .error ("Unknown type found in array " + typeof object [key]);
+                  console .error (`Unknown type found in array ${typeof object [key]}`);
                }
             }
          }
@@ -378,7 +377,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                }
                default:
                {
-                  console .error ("Unknown type found in object " + typeof object [key]);
+                  console .error (`Unknown type found in object ${typeof object [key]}`);
                   console .error (object);
                }
             }

package/src/x_ite/Parser/OBJParser.js

@@ -51,7 +51,7 @@ import Expressions  from "./Expressions.js";
 import Vector2      from "../../standard/Math/Numbers/Vector2.js";
 import Vector3      from "../../standard/Math/Numbers/Vector3.js";
 import Color3       from "../../standard/Math/Numbers/Color3.js";
-import DEBUG        from "../DEBUG.js";
+import DEVELOPMENT  from "../DEVELOPMENT.js";
 
 // http://paulbourke.net/dataformats/obj/
 // https://people.sc.fsu.edu/~jburkardt/data/obj/obj.html
@@ -123,35 +123,34 @@ function OBJParser (scene)
    this .lastIndex       = 0;
 }
 
-OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
+Object .assign (Object .setPrototypeOf (OBJParser .prototype, X3DParser .prototype),
    X3DOptimizer .prototype,
 {
-   constructor: OBJParser,
    CONSTANTS: new Map ([
       ["NAN", NaN],
       ["INF", Infinity],
       ["INFINITY", Infinity],
    ]),
-   getEncoding: function ()
+   getEncoding ()
    {
       return "STRING";
    },
-   isValid: function ()
+   setInput (string)
+   {
+      this .input = string;
+   },
+   isValid ()
    {
       if (!(typeof this .input === "string"))
          return false;
 
       return !! this .input .match (/^(?:[\x20\n\t\r]+|#.*?[\r\n])*\b(?:mtllib|usemtl|o|g|s|vt|vn|v|f)\b/);
    },
-   setInput: function (string)
-   {
-      this .input = string;
-   },
-   parseIntoScene: function (success, error)
+   parseIntoScene (resolve, reject)
    {
       this .obj ()
-         .then (success)
-         .catch (error);
+         .then (resolve)
+         .catch (reject);
    },
    obj: async function ()
    {
@@ -187,12 +186,12 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return this .getScene ();
    },
-   comments: function ()
+   comments ()
    {
       while (this .comment ())
          ;
    },
-   comment: function ()
+   comment ()
    {
       this .whitespaces ();
 
@@ -201,11 +200,11 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   whitespaces: function ()
+   whitespaces ()
    {
       Grammar .whitespaces .parse (this);
    },
-   whitespacesNoLineTerminator: function ()
+   whitespacesNoLineTerminator ()
    {
       Grammar .whitespacesNoLineTerminator .parse (this);
    },
@@ -315,7 +314,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          console .warn (error);
       }
    },
-   usemtl: function ()
+   usemtl ()
    {
       this .comments ();
 
@@ -341,7 +340,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   o: function ()
+   o ()
    {
       this .comments ();
 
@@ -376,7 +375,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   g: function ()
+   g ()
    {
       this .comments ();
 
@@ -422,7 +421,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   s: function ()
+   s ()
    {
       this .comments ();
 
@@ -447,7 +446,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   vts: function ()
+   vts ()
    {
       const point = this .texCoord .point;
 
@@ -458,7 +457,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return result;
    },
-   vt: function (point)
+   vt (point)
    {
       this .comments ();
 
@@ -476,7 +475,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   vns: function ()
+   vns ()
    {
       const vector = this .normal .vector;
 
@@ -487,7 +486,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return result;
    },
-   vn: function (vector)
+   vn (vector)
    {
       this .comments ();
 
@@ -505,7 +504,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   vs: function ()
+   vs ()
    {
       const point = this .coord .point;
 
@@ -516,7 +515,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return result;
    },
-   v: function (point)
+   v (point)
    {
       this .comments ();
 
@@ -534,7 +533,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   fs: function ()
+   fs ()
    {
       this .comments ();
 
@@ -545,7 +544,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             this .shape    = this .smoothingGroups .get (this .group .getNodeName ()) .get (this .smoothingGroup);
             this .geometry = this .shape .geometry;
          }
-         catch (error)
+         catch
          {
             const
                scene      = this .getExecutionContext (),
@@ -584,7 +583,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   f: function ()
+   f ()
    {
       this .comments ();
 
@@ -617,7 +616,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   indices: function (texCoordIndex, normalIndex, coordIndex, numTexCoords, numNormals, numCoords)
+   indices (texCoordIndex, normalIndex, coordIndex, numTexCoords, numNormals, numCoords)
    {
       if (this .int32 ())
       {
@@ -644,7 +643,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   index: function (index, length)
+   index (index, length)
    {
       if (index === 0)
          throw new Error ("Invalid index.");
@@ -654,7 +653,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return index - 1;
    },
-   int32: function ()
+   int32 ()
    {
       this .whitespaces ();
 
@@ -667,7 +666,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   double: function ()
+   double ()
    {
       this .whitespaces ();
 
@@ -690,7 +689,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   vec2: function ()
+   vec2 ()
    {
       if (this .double ())
       {
@@ -706,7 +705,7 @@ OBJParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   vec3: function ()
+   vec3 ()
    {
       if (this .double ())
       {
@@ -740,14 +739,14 @@ function MaterialParser (scene, input)
    this .id               = "";
 }
 
-MaterialParser .prototype =
+Object .assign (MaterialParser .prototype,
 {
    CONSTANTS: new Map ([
       ["NAN", NaN],
       ["INF", Infinity],
       ["INFINITY", Infinity],
    ]),
-   parse: function ()
+   parse ()
    {
       try
       {
@@ -755,16 +754,16 @@ MaterialParser .prototype =
       }
       catch (error)
       {
-         if (DEBUG)
+         if (DEVELOPMENT)
             console .log (error);
       }
    },
-   comments: function ()
+   comments ()
    {
       while (this .comment ())
          ;
    },
-   comment: function ()
+   comment ()
    {
       this .whitespaces ();
 
@@ -773,20 +772,20 @@ MaterialParser .prototype =
 
       return false;
    },
-   whitespaces: function ()
+   whitespaces ()
    {
       Grammar .whitespaces .parse (this);
    },
-   whitespacesNoLineTerminator: function ()
+   whitespacesNoLineTerminator ()
    {
       Grammar .whitespacesNoLineTerminator .parse (this);
    },
-   statements: function ()
+   statements ()
    {
       while (this .statement ())
 		   ;
    },
-   statement: function ()
+   statement ()
    {
       if (this .newmtl ())
          return true;
@@ -822,7 +821,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   newmtl: function ()
+   newmtl ()
    {
       this .comments ();
 
@@ -850,7 +849,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   Ka: function ()
+   Ka ()
    {
       this .comments ();
 
@@ -872,7 +871,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   Kd: function ()
+   Kd ()
    {
       this .comments ();
 
@@ -892,7 +891,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   Ks: function ()
+   Ks ()
    {
       this .comments ();
 
@@ -912,7 +911,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   Ns: function ()
+   Ns ()
    {
       this .comments ();
 
@@ -932,7 +931,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   d: function ()
+   d ()
    {
       this .comments ();
 
@@ -952,7 +951,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   Tr: function ()
+   Tr ()
    {
       this .comments ();
 
@@ -972,7 +971,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   illum: function ()
+   illum ()
    {
       this .comments ();
 
@@ -991,7 +990,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   map_Kd: function ()
+   map_Kd ()
    {
       this .comments ();
 
@@ -1030,7 +1029,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   int32: function ()
+   int32 ()
    {
       this .whitespaces ();
 
@@ -1043,7 +1042,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   double: function ()
+   double ()
    {
       this .whitespaces ();
 
@@ -1066,7 +1065,7 @@ MaterialParser .prototype =
 
       return false;
    },
-   col3: function ()
+   col3 ()
    {
       if (this .double ())
       {
@@ -1087,6 +1086,6 @@ MaterialParser .prototype =
 
       return false;
    },
-};
+});
 
 export default OBJParser;