x_ite 8.6.19 → 8.6.22

package/src/x_ite/Execution/X3DScene.js

@@ -399,6 +399,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    },
    toVRMLStream: function (generator)
    {
+      generator .string += generator .Indent ();
       generator .string += "#X3D V";
       generator .string += LATEST_VERSION;
       generator .string += generator .Space ();
@@ -430,34 +431,29 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
          generator .string += generator .TidyBreak ();
       }
 
-      // Units
-      {
-         let empty = true;
+      const units = this .getUnits () .filter (unit => unit .conversionFactor !== 1);
 
-         for (const unit of this .getUnits ())
+      if (units .length)
+      {
+         for (const unit of units)
          {
-            if (unit .conversionFactor !== 1)
-            {
-               empty = false;
-
-               unit .toVRMLStream (generator);
+            unit .toVRMLStream (generator);
 
-               generator .string += generator .Break ();
-            }
+            generator .string += generator .Break ();
          }
 
-         if (!empty)
-            generator .string += generator .TidyBreak ();
+         generator .string += generator .TidyBreak ();
       }
 
       const metadata = this .getMetaDatas ();
 
       if (metadata .size)
       {
-         for (const [key, values] of metadata .entries ())
+         for (const [key, values] of metadata)
          {
             for (const value of values)
             {
+               generator .string += generator .Indent ();
                generator .string += "META";
                generator .string += generator .Space ();
                generator .string += new Fields .SFString (key) .toString ();
@@ -490,15 +486,21 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    },
    toXMLStream: function (generator)
    {
-      generator .string += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-      generator .string += generator .TidyBreak ();
-      generator .string += "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D ";
-      generator .string += LATEST_VERSION;
-      generator .string += "//EN\" \"http://www.web3d.org/specifications/x3d-";
-      generator .string += LATEST_VERSION;
-      generator .string += ".dtd\">";
-      generator .string += generator .TidyBreak ();
+      if (!generator .html)
+      {
+         generator .string += generator .Indent ();
+         generator .string += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .Indent ();
+         generator .string += "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D ";
+         generator .string += LATEST_VERSION;
+         generator .string += "//EN\" \"http://www.web3d.org/specifications/x3d-";
+         generator .string += LATEST_VERSION;
+         generator .string += ".dtd\">";
+         generator .string += generator .TidyBreak ();
+      }
 
+      generator .string += generator .Indent ();
       generator .string += "<X3D";
       generator .string += generator .Space ();
       generator .string += "profile='";
@@ -542,7 +544,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
             }
          }
 
-         for (const [key, values] of this .getMetaDatas () .entries ())
+         for (const [key, values] of this .getMetaDatas ())
          {
             for (const value of values)
             {
@@ -556,7 +558,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
                generator .string += "content='";
                generator .string += generator .XMLEncode (value);
                generator .string += "'";
-               generator .string += "/>";
+               generator .string += generator .closingTags ? "></meta>" : "/>";
                generator .string += generator .TidyBreak ();
             }
          }
@@ -612,13 +614,14 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
       generator .DecIndent ();
 
+      generator .string += generator .Indent ();
       generator .string += "</X3D>";
-      generator .string += generator .TidyBreak ();
    },
    toJSONStream: function (generator)
    {
       // X3D
 
+      generator .string += generator .Indent ();
       generator .string += '{';
       generator .string += generator .TidySpace ();
       generator .string += '"';
@@ -756,9 +759,9 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
             // Meta data
 
-            for (const [i, [key, values]] of [... this .getMetaDatas ()] .entries ())
+            for (const [i, [key, values]] of [... this .getMetaDatas ()])
             {
-               for (const [j, value] of values .entries ())
+               for (const [j, value] of values)
                {
                   generator .string += generator .Indent ();
                   generator .string += '{';
@@ -957,7 +960,6 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += generator .DecIndent ();
       generator .string += generator .Indent ();
       generator .string += '}';
-      generator .string += generator .TidyBreak ();
    },
 });
 

package/src/x_ite/Fields/ArrayFields.js

@@ -325,7 +325,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
                   generator .string += "'";
                }
 
-               generator .string += "/>";
+               generator .string += generator .closingTags ? "></NULL>" : "/>";
             }
          }
 
@@ -451,7 +451,7 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
    {
       return X3DConstants .MFString;
    },
-   toXMLStream: function (generator)
+   toXMLStream: function (generator, sourceText)
    {
       const
          target = this .getTarget (),
@@ -464,14 +464,14 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
          for (let i = 0, n = length - 1; i < n; ++ i)
          {
             generator .string += "\"";
-            value [i] .toXMLStream (generator);
+            value [i] .toXMLStream (generator, sourceText);
             generator .string += "\"";
             generator .string += generator .Comma ();
             generator .string += generator .TidySpace ();
          }
 
          generator .string += "\"";
-         value .at (-1) .toXMLStream (generator);
+         value .at (-1) .toXMLStream (generator, sourceText);
          generator .string += "\"";
       }
    },

package/src/x_ite/Fields/SFColor.js

@@ -189,7 +189,6 @@ const r = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const g = {
@@ -203,7 +202,6 @@ const g = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const b = {
@@ -217,7 +215,6 @@ const b = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 Object .defineProperty (SFColor .prototype, "r", r);

package/src/x_ite/Fields/SFColorRGBA.js

@@ -142,7 +142,6 @@ const r = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const g = {
@@ -156,7 +155,6 @@ const g = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const b = {
@@ -170,7 +168,6 @@ const b = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const a = {
@@ -184,7 +181,6 @@ const a = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 Object .defineProperty (SFColorRGBA .prototype, "r", r);

package/src/x_ite/Fields/SFImage.js

@@ -299,7 +299,6 @@ const width = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const height = {
@@ -313,7 +312,6 @@ const height = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const comp = {
@@ -327,7 +325,6 @@ const comp = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const array = {
@@ -341,7 +338,6 @@ const array = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 Object .defineProperty (SFImage .prototype, "width",  width);

package/src/x_ite/Fields/SFMatrix3.js

@@ -118,7 +118,6 @@ function SFMatrix3Template (TypeName, Type, SFVec2, double)
             this .addEvent ();
          },
          enumerable: true,
-         configurable: false,
       });
    }
 

package/src/x_ite/Fields/SFMatrix4.js

@@ -112,7 +112,6 @@ function SFMatrix4Template (TypeName, Type, SFVec3, double)
             this .addEvent ();
          },
          enumerable: true,
-         configurable: false,
       });
    }
 

package/src/x_ite/Fields/SFRotation.js

@@ -212,7 +212,6 @@ const x = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const y = {
@@ -226,7 +225,6 @@ const y = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const z = {
@@ -240,7 +238,6 @@ const z = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 const angle = {
@@ -254,7 +251,6 @@ const angle = {
       this .addEvent ();
    },
    enumerable: true,
-   configurable: false
 };
 
 Object .defineProperty (SFRotation .prototype, "x",     x);

package/src/x_ite/Fields/SFString.js

@@ -95,15 +95,19 @@ SFString .prototype = Object .assign (Object .create (X3DField .prototype),
    valueOf: X3DField .prototype .getValue,
    toStream: function (generator)
    {
-      generator .string += '"' + SFString .escape (this .getValue ()) + '"';
+      generator .string += '"';
+      generator .string += SFString .escape (this .getValue ());
+      generator .string += '"';
    },
    toVRMLStream: function (generator)
    {
       this .toStream (generator);
    },
-   toXMLStream: function (generator)
+   toXMLStream: function (generator, sourceText)
    {
-      generator .string += generator .XMLEncode (this .getValue ());
+      generator .string += sourceText
+         ? generator .XMLEncodeSourceText (this .getValue ())
+         : generator .XMLEncode (this .getValue ());
    },
    toJSONStream: function (generator)
    {
@@ -127,7 +131,6 @@ Object .defineProperty (SFString .prototype, "length",
       return this .getValue () .length;
    },
    enumerable: true,
-   configurable: false
 });
 
 export default SFString;

package/src/x_ite/Fields/SFVec2.js

@@ -89,7 +89,6 @@ function SFVec2Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    const y = {
@@ -103,7 +102,6 @@ function SFVec2Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    Object .defineProperty (SFVec2 .prototype, "x", x);

package/src/x_ite/Fields/SFVec3.js

@@ -93,7 +93,6 @@ function SFVec3Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    const y = {
@@ -107,7 +106,6 @@ function SFVec3Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    const z = {
@@ -121,7 +119,6 @@ function SFVec3Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    Object .defineProperty (SFVec3 .prototype, "x", x);

package/src/x_ite/Fields/SFVec4.js

@@ -89,7 +89,6 @@ function SFVec4Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    const y = {
@@ -103,7 +102,6 @@ function SFVec4Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    const z = {
@@ -117,7 +115,6 @@ function SFVec4Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    const w = {
@@ -131,7 +128,6 @@ function SFVec4Template (TypeName, Type, double)
          this .addEvent ();
       },
       enumerable: true,
-      configurable: false
    };
 
    Object .defineProperty (SFVec4 .prototype, "x", x);

package/src/x_ite/InputOutput/FileLoader.js

@@ -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 ();
@@ -199,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));
    },
@@ -248,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;
@@ -288,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 (/;.*$/, "");
 
@@ -304,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

@@ -47,17 +47,43 @@
 
 import X3DConstants      from "../Base/X3DConstants.js";
 import { getUniqueName } from "../Execution/NamedNodesHandling.js";
+import Algorithm         from "../../standard/Math/Algorithm.js";
 
-function Generator ({ style = "TIDY", precision = 7, doublePrecision = 15 })
+function Generator ({ style = "TIDY", indent = "", precision = 7, doublePrecision = 15, html = false, closingTags = false })
 {
-   this .Style (style);
+   this .string           = "";
+   this .indent           = indent;
+   this .listIndent       = indent;
+   this .precision        = Algorithm .clamp (precision, 1, 21);
+   this .doublePrecision  = Algorithm .clamp (doublePrecision, 1, 21);
+   this .html             = html;
+   this .closingTags      = html || closingTags;
+
+   this .floatFormat = new Intl .NumberFormat ("en", {
+      notation: "standard",
+      maximumSignificantDigits: this .precision,
+      useGrouping: false,
+   }) .format;
+
+   this .floatExponentialFormat = new Intl .NumberFormat ("en", {
+      notation: "scientific",
+      maximumSignificantDigits: this .precision,
+      useGrouping: false,
+   }) .format;
+
+   this .doubleFormat = new Intl .NumberFormat ("en", {
+      notation: "standard",
+      maximumSignificantDigits: this .doublePrecision,
+      useGrouping: false,
+   }) .format;
+
+   this .doubleExponentialFormat = new Intl .NumberFormat ("en", {
+      notation: "scientific",
+      maximumSignificantDigits: this .doublePrecision,
+      useGrouping: false,
+   }) .format;
 
-   this .string              = "";
-   this .indent              = "";
-   this .listIndent          = "";
-   this .precision           = precision;
-   this .doublePrecision     = doublePrecision;
-   this .removeTrailingZeros = /(?:\.|(\.[0-9]*?))0*(?=[eE]|$)/;
+   this .Style (style);
 
    this .executionContextStack = [ null ];
    this .importedNodesIndex    = new Map ();
@@ -84,6 +110,8 @@ Generator .prototype =
       {
          case "CLEAN":
          {
+            this .listIndent = "";
+
             this .comma          = " ";
             this .break          = " ";
             this .tidyBreak      = "";
@@ -97,6 +125,8 @@ Generator .prototype =
          }
          case "SMALL":
          {
+            this .listIndent = "";
+
             this .comma          = ",";
             this .break          = "\n";
             this .tidyBreak      = "\n";
@@ -110,6 +140,8 @@ Generator .prototype =
          }
          case "COMPACT":
          {
+            this .listIndent = "";
+
             this .comma          = ",";
             this .break          = "\n";
             this .tidyBreak      = "\n";
@@ -194,18 +226,42 @@ Generator .prototype =
    },
    DecIndent: function ()
    {
-      this .indent = this .indent .slice (0, this .indent .length - this .indentChar .length);
+      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 "";
    },
-   Precision: function (value)
+   Precision: function  (value)
    {
-      return Math .fround (value) .toPrecision (this .precision) .replace (this .removeTrailingZeros, "$1");
+      if (Number .isFinite (value))
+      {
+         const exponent = Math .log10 (Math .abs (value));
+
+         if ((this .precision > exponent && exponent >= -4) || value === 0)
+            return this .floatFormat (Math .fround (value));
+
+         return this .floatExponentialFormat (Math .fround (value)) .toLowerCase ();
+      }
+      else
+      {
+         return String (value);
+      }
    },
-   DoublePrecision: function (value)
+   DoublePrecision: function  (value)
    {
-      return value .toPrecision (this .doublePrecision) .replace (this .removeTrailingZeros, "$1");
+      if (Number .isFinite (value))
+      {
+         const exponent = Math .log10 (Math .abs (value));
+
+         if ((this .doublePrecision > exponent && exponent >= -4) || value === 0)
+            return this .doubleFormat (value);
+
+         return this .doubleExponentialFormat (value) .toLowerCase ();
+      }
+      else
+      {
+         return String (value);
+      }
    },
    PushExecutionContext: function (executionContext)
    {
@@ -471,10 +527,24 @@ Generator .prototype =
          return string .replace (regex, char => map [char]);
       };
    })(),
-   escapeCDATA: function (string)
+   XMLEncodeSourceText: (function ()
    {
-      return string .replace (/\]\]\>/g, "\\]\\]\\>");
-   },
+      const map = {
+         "\\": "\\\\",
+         "\"": "\\\"",
+         "'": "'",
+         "<": "&lt;",
+         ">": "&gt;",
+         "&": "&amp;",
+      };
+
+      const regex = /([\\"'<>&])/g;
+
+      return function (string)
+      {
+         return string .replace (regex, char => map [char]);
+      };
+   })(),
    JSONEncode: (function ()
    {
       const map = {