x_ite 8.7.1 → 8.7.3

package/src/x_ite/Configuration/ComponentInfo.js

@@ -56,10 +56,9 @@ function ComponentInfo ({ name, level, title, providerUrl, external = false, dep
       level: { value: level, enumerable: true },
       title: { value: title, enumerable: true },
       providerUrl: { value: providerUrl || URLs .getProviderUrl (external && name), enumerable: true },
+      external: { value: external },
+      dependencies: { value: dependencies },
    });
-
-   $.data (this, "external",     external)
-   $.data (this, "dependencies", dependencies)
 }
 
 ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype),

package/src/x_ite/Execution/X3DScene.js

@@ -671,7 +671,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += ':';
       generator .string += generator .TidySpace ();
       generator .string += '"';
-      generator .string += this .getSpecificationVersion ();
+      generator .string += LATEST_VERSION;
       generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();

package/src/x_ite/Fields/ArrayFields.js

@@ -83,9 +83,9 @@ const
 
 const _cloneCount = Symbol ();
 
-function MFNode (value)
+function MFNode (... args)
 {
-   return X3DObjectArrayField .call (this, arguments);
+   return X3DObjectArrayField .call (this, args);
 }
 
 MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -419,9 +419,9 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 for (const key of Reflect .ownKeys (MFNode .prototype))
    Object .defineProperty (MFNode .prototype, key, { enumerable: false });
 
-function MFString (value)
+function MFString (... args)
 {
-   return X3DObjectArrayField .call (this, arguments);
+   return X3DObjectArrayField .call (this, args);
 }
 
 MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -480,11 +480,15 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
 for (const key of Reflect .ownKeys (MFString .prototype))
    Object .defineProperty (MFString .prototype, key, { enumerable: false });
 
+/**
+ * MFImage
+ */
+
 function MFImageTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
 {
-   function ArrayField (value)
+   function ArrayField (... args)
    {
-      return X3DObjectArrayField .call (this, arguments);
+      return X3DObjectArrayField .call (this, args);
    }
 
    ArrayField .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -524,9 +528,9 @@ function MFImageTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Comp
 
 function TypedArrayTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
 {
-   function ArrayField (value)
+   function ArrayField (... args)
    {
-      return X3DTypedArrayField .call (this, arguments);
+      return X3DTypedArrayField .call (this, args);
    }
 
    ArrayField .prototype = Object .assign (Object .create (X3DTypedArrayField .prototype),
@@ -564,7 +568,7 @@ function TypedArrayTemplate (TypeName, Type, SingleType, ValueType, ArrayType, C
    return ArrayField;
 }
 
-function Value (value) { return value; }
+const Value = (value) => value;
 
 const ArrayFields =
 {

package/src/x_ite/Fields/SFColor.js

@@ -134,11 +134,11 @@ SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
 
       for (let i = 0; i < last; ++ i)
       {
-         generator .string += generator .Precision (value [i]);
+         generator .string += generator .FloatFormat (value [i]);
          generator .string += generator .TidySpace ();
       }
 
-      generator .string += generator .Precision (value [last]);
+      generator .string += generator .FloatFormat (value [last]);
    },
    toVRMLStream: function (generator)
    {
@@ -166,12 +166,12 @@ SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
 
       for (let i = 0; i < last; ++ i)
       {
-         generator .string += generator .JSONNumber (generator .Precision (value [i]));
+         generator .string += generator .JSONNumber (generator .FloatFormat (value [i]));
          generator .string += ',';
          generator .string += generator .TidySpace ();
       }
 
-      generator .string += generator .JSONNumber (generator .Precision (value [last]));
+      generator .string += generator .JSONNumber (generator .FloatFormat (value [last]));
    },
 });
 

package/src/x_ite/Fields/SFDouble.js

@@ -81,7 +81,7 @@ SFDouble .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .DoublePrecision (generator .ToUnit (category, this .getValue ()));
+      generator .string += generator .DoubleFormat (generator .ToUnit (category, this .getValue ()));
    },
    toVRMLStream: function (generator)
    {
@@ -99,7 +99,7 @@ SFDouble .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .JSONNumber (generator .DoublePrecision (generator .ToUnit (category, this .getValue ())));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (generator .ToUnit (category, this .getValue ())));
    },
 });
 

package/src/x_ite/Fields/SFFloat.js

@@ -81,7 +81,7 @@ SFFloat .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .Precision (generator .ToUnit (category, this .getValue ()));
+      generator .string += generator .FloatFormat (generator .ToUnit (category, this .getValue ()));
    },
    toVRMLStream: function (generator)
    {
@@ -99,7 +99,7 @@ SFFloat .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .JSONNumber (generator .Precision (generator .ToUnit (category, this .getValue ())));
+      generator .string += generator .JSONNumber (generator .FloatFormat (generator .ToUnit (category, this .getValue ())));
    },
 });
 

package/src/x_ite/Fields/SFImage.js

@@ -134,6 +134,8 @@ Image .prototype =
  *  SFImage
  */
 
+const _set_size = Symbol ();
+
 function SFImage (width, height, comp, array)
 {
    const MFInt32 = ArrayFields .MFInt32;
@@ -146,16 +148,23 @@ function SFImage (width, height, comp, array)
       X3DField .call (this, new Image (0, 0, 0, new MFInt32 ()));
 
    this .getValue () .getArray () .addParent (this);
-   this .addInterest ("set_size__", this);
+   this .addInterest (_set_size, this);
 }
 
 SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
 {
    constructor: SFImage,
-   set_size__: function ()
+   [_set_size]: function ()
    {
       this .getValue () .getArray () .length = this .width * this .height;
    },
+   [Symbol .iterator]: function* ()
+   {
+      yield this .width;
+      yield this .height;
+      yield this .comp;
+      yield this .array;
+   },
    copy: function ()
    {
       return new SFImage (this .getValue () .copy ());

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -49,7 +49,7 @@ import X3DField from "../Base/X3DField.js";
 
 function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
 {
-   const _formatter = double ? "DoublePrecision" : "Precision";
+   const _formatter = double ? "DoubleFormat" : "FloatFormat";
 
    return Object .assign (Object .create (X3DField .prototype),
    {

package/src/x_ite/Fields/SFNode.js

@@ -369,6 +369,10 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       this [_target] .getValue () .setUserData (key, value);
    },
+   removeNodeUserData: function (key)
+   {
+      this [_target] .getValue () .removeUserData (key);
+   },
    valueOf: function ()
    {
       const

package/src/x_ite/Fields/SFRotation.js

@@ -155,13 +155,13 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const rotation = this .getValue ();
 
-      generator .string += generator .DoublePrecision (rotation .x);
+      generator .string += generator .DoubleFormat (rotation .x);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (rotation .y);
+      generator .string += generator .DoubleFormat (rotation .y);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (rotation .z);
+      generator .string += generator .DoubleFormat (rotation .z);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle));
+      generator .string += generator .DoubleFormat (generator .ToUnit ("angle", rotation .angle));
    },
    toVRMLStream: function (generator)
    {
@@ -185,16 +185,16 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const rotation = this .getValue ();
 
-      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .x));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .x));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .y));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .y));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .z));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .z));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle)));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (generator .ToUnit ("angle", rotation .angle)));
    },
 });
 

package/src/x_ite/Fields/SFTime.js

@@ -95,7 +95,7 @@ SFTime .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    toJSONStreamValue: function (generator)
    {
-      generator .string += generator .JSONNumber (generator .DoublePrecision (this .getValue ()));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (this .getValue ()));
    },
 });
 

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -49,7 +49,7 @@ import X3DField  from "../Base/X3DField.js";
 
 function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
 {
-   const _formatter = double ? "DoublePrecision" : "Precision";
+   const _formatter = double ? "DoubleFormat" : "FloatFormat";
 
    return Object .assign (Object .create (X3DField .prototype),
    {

package/src/x_ite/InputOutput/FileLoader.js

@@ -243,7 +243,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
             if (result [3] === "base64")
                data = atob (data);
             else
-               data = decodeURIComponent (data);
+               data = unescape (data); // Don't use decodeURIComponent!
 
             this .callback (data);
             return;

package/src/x_ite/InputOutput/Generator.js

@@ -231,23 +231,23 @@ Generator .prototype =
 
       return "";
    },
-   Precision: function  (value)
+   FloatFormat: function  (value)
    {
       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 .floatFormat (value);
 
-         return this .floatExponentialFormat (Math .fround (value)) .toLowerCase ();
+         return this .floatExponentialFormat (value) .toLowerCase ();
       }
       else
       {
          return String (value);
       }
    },
-   DoublePrecision: function  (value)
+   DoubleFormat: function  (value)
    {
       if (Number .isFinite (value))
       {
@@ -267,13 +267,13 @@ Generator .prototype =
    {
       this .executionContextStack .push (executionContext);
 
-      if (! this .names .has (executionContext))
+      if (!this .names .has (executionContext))
          this .names .set (executionContext, Object .assign (new Set (), { index: 0 }));
 
-      if (! this .importedNodesIndex .has (executionContext))
+      if (!this .importedNodesIndex .has (executionContext))
          this .importedNodesIndex .set (executionContext, new Set ());
 
-      if (! this .exportedNodesIndex .has (executionContext))
+      if (!this .exportedNodesIndex .has (executionContext))
          this .exportedNodesIndex .set (executionContext, new Set ());
    },
    PopExecutionContext: function ()

package/src/x_ite/Parser/JSONParser.js

@@ -167,7 +167,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          {
             console .error ("Trouble creating element for", key);
 
-            child = document .createElement(key);
+            child = document .createElement (key);
          }
       }
 
@@ -178,28 +178,9 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
    },
    createCDATA: function (document, element, str)
    {
-      /**
-       * a way to create a CDATA function or script in HTML, by using a DOM parser.
-       */
-
-      let y = str .trim ()
-         .replace (/\\"/g, "\\\"")
-         .replace (/&lt;/g, "<")
-         .replace (/&gt;/g, ">")
-         .replace (/&amp;/g, "&");
-
-      do
-      {
-         str = y;
-         y   = str .replace (/'([^'\r\n]*)\n([^']*)'/g, "'$1\\n$2'");
-      }
-      while (y !== str);
-
       const
-         domParser = new DOMParser(),
-         cdataStr  = "<script> <![CDATA[ " + y + " ]]> </script>", // has to be wrapped into an element
-         scriptDoc = domParser .parseFromString (cdataStr, "application/xml"),
-         cdata     = scriptDoc .children [0] .childNodes [1]; // space after script is childNode[0]
+         docu  = new DOMParser () .parseFromString ("<xml></xml>", "application/xml"),
+         cdata = docu .createCDATASection (str);
 
       element .appendChild (cdata);
    },
@@ -230,7 +211,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          }
          else if (key === "#sourceCode" || key === "@sourceCode" || key === "#sourceText")
          {
-            this .createCDATA (document, element, object [key] .join ("\r\n") + "\r\n");
+            this .createCDATA (document, element, object [key] .join ("\n"));
          }
          else
          {

package/src/x_ite/Parser/XMLParser.js

@@ -47,6 +47,7 @@
 
 import X3DField                  from "../Base/X3DField.js";
 import X3DBaseNode               from "../Base/X3DBaseNode.js";
+import X3DNode                   from "../Components/Core/X3DNode.js";
 import X3DPrototypeInstance      from "../Components/Core/X3DPrototypeInstance.js";
 import Fields                    from "../Fields.js";
 import X3DParser                 from "./X3DParser.js";
@@ -667,7 +668,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             node  = this .getParent (),
             proto = this .getPrototype ();
 
-         if (! (node instanceof X3DBaseNode))
+         if (! (node instanceof X3DNode))
             return;
 
          var
@@ -932,17 +933,10 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       if (this .getParents () .length === 0)
          return;
 
-      var node = this .getParent ();
-
-      if (node instanceof X3DBaseNode)
-      {
-         var field = node .getSourceText ();
+      const node = this .getParent ();
 
-         if (field)
-         {
-            field .push (xmlElement .data);
-         }
-      }
+      if (node instanceof X3DNode)
+         node .getSourceText () ?.push (xmlElement .data);
    },
    useAttribute: function (xmlElement)
    {

package/src/x_ite/X3D.js

@@ -163,7 +163,7 @@ Object .assign (X3D,
    })(),
    getBrowser: function (element)
    {
-      return $(element || "x3d-canvas, X3DCanvas") .data ("browser");
+      return $(element || "x3d-canvas, X3DCanvas") .prop ("browser");
    },
    createBrowser: function (url, parameter)
    {

package/src/x_ite/X3DCanvasElement.js

@@ -46,36 +46,13 @@
  ******************************************************************************/
 
 import X3DBrowser from "./Browser/X3DBrowser.js";
-import URLs       from "./Browser/Networking/URLs.js";
 
 class X3DCanvasElement extends HTMLElement
 {
-   static define ()
-   {
-      customElements .define ("x3d-canvas", X3DCanvasElement);
-   }
-
    constructor ()
    {
       super ();
 
-      const
-         shadow = this .attachShadow ({ mode: "open", delegatesFocus: true }),
-         link   = document .createElement ("link");
-
-      $(this) .data ("shadow", $(shadow));
-      $(this) .data ("loaded", new Promise (function (resolve, reject)
-      {
-         link .onload  = resolve;
-         link .onerror = reject;
-      }));
-
-      link .setAttribute ("rel", "stylesheet");
-      link .setAttribute ("type", "text/css");
-      link .setAttribute ("href", new URL ("x_ite.css", URLs .getScriptUrl ()) .href);
-
-      shadow .appendChild (link);
-
       new X3DBrowser (this)
    }
 
@@ -98,7 +75,6 @@ class X3DCanvasElement extends HTMLElement
          "debug",
          "multisampling",
          "notifications",
-         "onerror",
          "oninitialized",
          "onshutdown",
          "splashScreen",

package/src/x_ite.js

@@ -53,7 +53,7 @@ import shim             from "./shim.js";
 
 window [Symbol .for ("X_ITE.X3D")] = X3D;
 
-X3DCanvasElement .define ();
+customElements .define ("x3d-canvas", X3DCanvasElement);
 
 X3D ();