x_ite 8.6.20 → 8.6.22

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/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 = {

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -165,7 +165,7 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
    },
    setError: function (error)
    {
-      console .error ("Error loading extern prototype:", error);
+      console .error (`Error loading extern prototype '${this .getName ()}':`, error);
 
       this [_scene] = this .getBrowser () .getPrivateScene ();
 
@@ -267,7 +267,7 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
          generator .string += "name='";
          generator .string += generator .XMLEncode (field .getName ());
          generator .string += "'";
-         generator .string += "/>";
+         generator .string += generator .closingTags ? "></field>" : "/>";
          generator .string += generator .TidyBreak ();
       }
 
@@ -412,36 +412,30 @@ Object .defineProperty (X3DExternProtoDeclaration .prototype, "name",
 {
    get: X3DExternProtoDeclaration .prototype .getName,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "fields",
 {
    get: X3DExternProtoDeclaration .prototype .getFieldDefinitions,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "isExternProto",
 {
    value: true,
-   writable: false,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "urls",
 {
    get: function () { return this ._url; },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "loadState",
 {
    get: X3DExternProtoDeclaration .prototype .checkLoadState,
    enumerable: true,
-   configurable: false
 });
 
 export default X3DExternProtoDeclaration;

package/src/x_ite/Prototype/X3DProtoDeclaration.js

@@ -222,7 +222,7 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
 
             if (field .isDefaultValue ())
             {
-               generator .string += "/>";
+               generator .string += generator .closingTags ? "></field>" : "/>";
                generator .string += generator .TidyBreak ();
             }
             else
@@ -259,7 +259,7 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
                      field .toXMLStream (generator);
 
                      generator .string += "'";
-                     generator .string += "/>";
+                     generator .string += generator .closingTags ? "></field>" : "/>";
                      generator .string += generator .TidyBreak ();
                      break;
                   }
@@ -546,22 +546,18 @@ Object .defineProperty (X3DProtoDeclaration .prototype, "name",
 {
    get: X3DProtoDeclaration .prototype .getName,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DProtoDeclaration .prototype, "fields",
 {
    get: X3DProtoDeclaration .prototype .getFieldDefinitions,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DProtoDeclaration .prototype, "isExternProto",
 {
    value: false,
-   writable: false,
    enumerable: true,
-   configurable: false
 });
 
 export default X3DProtoDeclaration;

package/src/x_ite/Routing/X3DRoute.js

@@ -170,7 +170,7 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       generator .string += generator .XMLEncode (this [_destinationField] .getName ());
       generator .string += "'";
-      generator .string += "/>";
+      generator .string += generator .closingTags ? "></ROUTE>" : "/>";
    },
    toJSONStream: function (generator)
    {
@@ -267,7 +267,6 @@ Object .defineProperty (X3DRoute .prototype, "sourceNode",
       return SFNodeCache .get (this [_sourceNode]);
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DRoute .prototype, "sourceField",
@@ -277,7 +276,6 @@ Object .defineProperty (X3DRoute .prototype, "sourceField",
       return this [_sourceField] .getName ();
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DRoute .prototype, "destinationNode",
@@ -287,7 +285,6 @@ Object .defineProperty (X3DRoute .prototype, "destinationNode",
       return SFNodeCache .get (this [_destinationNode]);
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DRoute .prototype, "destinationField",
@@ -297,7 +294,6 @@ Object .defineProperty (X3DRoute .prototype, "destinationField",
       return this [_destinationField] .getName ();
    },
    enumerable: true,
-   configurable: false
 });
 
 export default X3DRoute;

package/src/x_ite/X3DCanvasElement.js

@@ -91,6 +91,8 @@ class X3DCanvasElement extends HTMLElement
    {
       return [
          "antialiased",
+         "baseURL",
+         "baseurl",
          "cache",
          "contentScale",
          "contentscale",

package/src/x_ite.css

@@ -166,10 +166,14 @@ X3DCanvas > :not(.x_ite-private-browser, .x_ite-private-menu) {
   padding-right: 10px;
 }
 
-.x_ite-private-browser-timings tr.x_ite-private-more td {
+.x_ite-private-browser-timings table.more tr.x_ite-private-more td {
   padding-bottom: 5px;
 }
 
+.x_ite-private-browser-timings table.less tr.x_ite-private-more ~ tr {
+  display: none;
+}
+
 .x_ite-private-browser-timings td {
   padding-bottom: 2px;
 }

package/src/x_ite.html

@@ -149,39 +149,7 @@ X3D (function ()
       }
    });
 
-   function sleep (duration)
-   {
-      return new Promise (function (resolve, reject)
-      {
-         setTimeout (resolve, duration);
-      });
-   }
-
-   $("#bug") .on ("click", async () =>
-   {
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/CubeMapTexturing/GeneratedCubeMapTexture/GeneratedCubeMapTexture.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Lighting/DirectionalLight/DirectionalLight.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Lighting/Shadows/Shadows.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Navigation/NavigationInfo/NavigationInfo.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/ParticleSystems/ParticleSystem/ParticleSystem.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/RigidBodyPhysics/CollidableShape/CollidableShape.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/RigidBodyPhysics/RigidBody/RigidBody.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/RigidBodyPhysics/RigidBodyCollection/RigidBodyCollection.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/TextureProjector/TextureProjector/TextureProjector.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Texturing/MultiTexture/MultiTexture.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/X3D/NYC/NYC.x3d"));
-      await sleep (1000);
-   });
+   $("#website") .attr ("href", location .origin + ":4000/x_ite/")
 });
       </script>
       <style>
@@ -434,7 +402,7 @@ main.color-management #browser {
       <main>
          <div>
             <form action="javascript:alert('form submitted')">
-               <x3d-canvas id="browser" splashScreen="true" contextMenu="true" cache="false" debug="true" preserveDrawingBuffer="false" onload="$('#file') .addClass ('loaded')" x-url='"tests/empty.x3dv"'>
+               <x3d-canvas id="browser" splashScreen="true" contextMenu="true" cache="false" debug="true" preserveDrawingBuffer="false" onload="$('#file') .addClass ('loaded')" x-baseURL="tests/" x-src="lines.x3d">
                   <p class="fallback">
                      Sorry,<br/>
                      it wasn't me!<br/>
@@ -450,10 +418,10 @@ main.color-management #browser {
                <button id="location-go" type="button">Load URL</button>
             </div>
             <div id="buttons">
-               <a href="#" id="view-all">▣</a><a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="../dist/example.html">example page</a><a href="tests/d3-x3d/">d3-x3d</a><a href="tests/dom-integration/">dom-integration</a><a href="tests/legacy/">legacy</a><a href="#" id="bug">▣</a>
+               <a href="#" id="view-all">▣</a><a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="../dist/example.html">example page</a><a href="tests/d3-x3d/">d3-x3d</a><a href="tests/dom-integration/">dom-integration</a><a href="tests/legacy/">legacy</a>
             </div>
             <div id="links">
-               <a href="../x_ite.min.html">x_ite.min.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a>
+               <a href="../x_ite.min.html">x_ite.min.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a><a id="website" target="_blank">website</a>
             </div>
             <div id="examples-box"></div>
          </div>

package/x_ite.min.html

@@ -130,39 +130,7 @@ X3D (function ()
       }
    });
 
-   function sleep (duration)
-   {
-      return new Promise (function (resolve, reject)
-      {
-         setTimeout (resolve, duration);
-      });
-   }
-
-   $("#bug") .on ("click", async () =>
-   {
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/CubeMapTexturing/GeneratedCubeMapTexture/GeneratedCubeMapTexture.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Lighting/DirectionalLight/DirectionalLight.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Lighting/Shadows/Shadows.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Navigation/NavigationInfo/NavigationInfo.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/ParticleSystems/ParticleSystem/ParticleSystem.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/RigidBodyPhysics/CollidableShape/CollidableShape.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/RigidBodyPhysics/RigidBody/RigidBody.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/RigidBodyPhysics/RigidBodyCollection/RigidBodyCollection.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/TextureProjector/TextureProjector/TextureProjector.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/Texturing/MultiTexture/MultiTexture.x3d"));
-      await sleep (1000);
-      await Browser .loadURL (new X3D .MFString ("https://create3000.github.io/media/examples/X3D/NYC/NYC.x3d"));
-      await sleep (1000);
-   });
+   $("#website") .attr ("href", location .origin + ":4000/x_ite/")
 });
       </script>
       <style>
@@ -415,7 +383,7 @@ main.color-management #browser {
       <main>
          <div>
             <form action="javascript:alert('form submitted')">
-               <x3d-canvas id="browser" splashScreen="true" contextMenu="true" cache="false" debug="true" preserveDrawingBuffer="false" onload="$('#file') .addClass ('loaded')" x-url='"src/tests/empty.x3dv"'>
+               <x3d-canvas id="browser" splashScreen="true" contextMenu="true" cache="false" debug="true" preserveDrawingBuffer="false" onload="$('#file') .addClass ('loaded')" x-baseURL="src/tests/" x-src="lines.x3d">
                   <p class="fallback">
                      Sorry,<br/>
                      it wasn't me!<br/>
@@ -431,10 +399,10 @@ main.color-management #browser {
                <button id="location-go" type="button">Load URL</button>
             </div>
             <div id="buttons">
-               <a href="#" id="view-all">▣</a><a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="dist/example.html">example page</a><a href="src/tests/d3-x3d/">d3-x3d</a><a href="src/tests/dom-integration/">dom-integration</a><a href="src/tests/legacy/">legacy</a><a href="#" id="bug">▣</a>
+               <a href="#" id="view-all">▣</a><a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="dist/example.html">example page</a><a href="src/tests/d3-x3d/">d3-x3d</a><a href="src/tests/dom-integration/">dom-integration</a><a href="src/tests/legacy/">legacy</a>
             </div>
             <div id="links" class="min-links">
-               <a href="src/x_ite.html">src/x_ite.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a>
+               <a href="src/x_ite.html">src/x_ite.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a><a id="website" target="_blank">website</a>
             </div>
             <div id="examples-box"></div>
          </div>