x_ite 8.7.4 → 8.7.6

package/src/x_ite/Execution/X3DScene.js

@@ -61,6 +61,7 @@ import SFNodeCache         from "../Fields/SFNodeCache.js";
 SupportedNodes .addAbstractType ("X3DScene", X3DScene);
 
 const
+   _browser              = Symbol .for ("X_ITE.X3DEventObject.browser"),
    _specificationVersion = Symbol (),
    _encoding             = Symbol (),
    _profile              = Symbol (),
@@ -68,13 +69,16 @@ const
    _worldURL             = Symbol (),
    _units                = Symbol (),
    _metadata             = Symbol (),
-   _exportedNodes        = Symbol ();
+   _exportedNodes        = Symbol (),
+   _loadingObjects       = Symbol ();
 
-const LATEST_VERSION = "4.0";
+const X3D_LATEST_VERSION = "4.0";
 
-function X3DScene (executionContext)
+function X3DScene (browser)
 {
-   X3DExecutionContext .call (this, executionContext);
+   this [_browser] = browser;
+
+   X3DExecutionContext .call (this, this);
 
    this .addType (X3DConstants .X3DScene)
 
@@ -82,9 +86,11 @@ function X3DScene (executionContext)
                           "components_changed",    new Fields .SFTime (),
                           "units_changed",         new Fields .SFTime (),
                           "metadata_changed",      new Fields .SFTime (),
-                          "exportedNodes_changed", new Fields .SFTime ())
+                          "exportedNodes_changed", new Fields .SFTime (),
+                          "initLoadCount",         new Fields .SFInt32 (),
+                          "loadCount",             new Fields .SFInt32 ())
 
-   this [_specificationVersion] = LATEST_VERSION;
+   this [_specificationVersion] = X3D_LATEST_VERSION;
    this [_encoding]             = "SCRIPTED";
    this [_profile]              = null;
    this [_components]           = new ComponentInfoArray ([ ]);
@@ -96,8 +102,9 @@ function X3DScene (executionContext)
    this [_units] .add ("length", new UnitInfo ("length", "metre",    1));
    this [_units] .add ("mass",   new UnitInfo ("mass",   "kilogram", 1));
 
-   this [_metadata]      = new Map ();
-   this [_exportedNodes] = new ExportedNodesArray ();
+   this [_metadata]       = new Map ();
+   this [_exportedNodes]  = new ExportedNodesArray ();
+   this [_loadingObjects] = new Set ();
 
    this .getRootNodes () .setAccessType (X3DConstants .inputOutput);
 
@@ -255,7 +262,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       if (!name .length)
          throw new Error ("Couldn't add metadata: name is empty.");
 
-      if (! Array .isArray (values))
+      if (!Array .isArray (values))
          values = [String (values)];
 
       if (!values .length)
@@ -398,7 +405,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    {
       generator .string += generator .Indent ();
       generator .string += "#X3D V";
-      generator .string += LATEST_VERSION;
+      generator .string += X3D_LATEST_VERSION;
       generator .string += generator .Space ();
       generator .string += "utf8";
       generator .string += generator .Space ();
@@ -490,9 +497,9 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
          generator .string += generator .TidyBreak ();
          generator .string += generator .Indent ();
          generator .string += "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D ";
-         generator .string += LATEST_VERSION;
+         generator .string += X3D_LATEST_VERSION;
          generator .string += "//EN\" \"http://www.web3d.org/specifications/x3d-";
-         generator .string += LATEST_VERSION;
+         generator .string += X3D_LATEST_VERSION;
          generator .string += ".dtd\">";
          generator .string += generator .TidyBreak ();
       }
@@ -505,13 +512,13 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += "'";
       generator .string += generator .Space ();
       generator .string += "version='";
-      generator .string += LATEST_VERSION;
+      generator .string += X3D_LATEST_VERSION;
       generator .string += "'";
       generator .string += generator .Space ();
       generator .string += "xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance'";
       generator .string += generator .Space ();
       generator .string += "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-";
-      generator .string += LATEST_VERSION;
+      generator .string += X3D_LATEST_VERSION;
       generator .string += ".xsd'>";
       generator .string += generator .TidyBreak ();
 
@@ -671,7 +678,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += ':';
       generator .string += generator .TidySpace ();
       generator .string += '"';
-      generator .string += LATEST_VERSION;
+      generator .string += X3D_LATEST_VERSION;
       generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();
@@ -687,7 +694,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += generator .TidySpace ();
       generator .string += '"';
       generator .string += "http://www.web3d.org/specifications/x3d-";
-      generator .string += LATEST_VERSION;
+      generator .string += X3D_LATEST_VERSION;
       generator .string += ".xsd";
       generator .string += '"';
       generator .string += ',';
@@ -704,7 +711,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += generator .TidySpace ();
       generator .string += '"';
       generator .string += "http://www.web3d.org/specifications/x3d-";
-      generator .string += LATEST_VERSION;
+      generator .string += X3D_LATEST_VERSION;
       generator .string += "-JSONSchema.json";
       generator .string += '"';
       generator .string += ',';
@@ -958,52 +965,121 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += generator .Indent ();
       generator .string += '}';
    },
-});
+},
+{
+   setExecutionContext: function (value)
+   {
+      if (!this .isMainScene ())
+      {
+         const scene = this .getScene ();
 
-for (const key of Reflect .ownKeys (X3DScene .prototype))
-   Object .defineProperty (X3DScene .prototype, key, { enumerable: false });
+         for (const object of this [_loadingObjects])
+            scene .removeLoadingObject (object);
+      }
 
-Object .defineProperty (X3DScene .prototype, "specificationVersion",
-{
-   get: X3DScene .prototype .getSpecificationVersion,
-   enumerable: true,
-});
+      X3DExecutionContext .prototype .setExecutionContext .call (this, value);
 
-Object .defineProperty (X3DScene .prototype, "encoding",
-{
-   get: X3DScene .prototype .getEncoding,
-   enumerable: true,
-});
+      if (!this .isMainScene ())
+      {
+         const scene = this .getScene ();
 
-Object .defineProperty (X3DScene .prototype, "profile",
-{
-   get: X3DScene .prototype .getProfile,
-   enumerable: true,
-});
+         for (const object of this [_loadingObjects])
+            scene .addLoadingObject (object);
+      }
+   },
+   addInitLoadCount: function (node)
+   {
+      this ._initLoadCount = this ._initLoadCount .getValue () + 1;
+   },
+   removeInitLoadCount: function (node)
+   {
+      this ._initLoadCount = this ._initLoadCount .getValue () - 1;
+   },
+   getLoadingObjects: function ()
+   {
+      return this [_loadingObjects];
+   },
+   addLoadingObject: function (node)
+   {
+      if (this [_loadingObjects] .has (node))
+         return;
 
-Object .defineProperty (X3DScene .prototype, "components",
-{
-   get: X3DScene .prototype .getComponents,
-   enumerable: true,
-});
+      this [_loadingObjects] .add (node);
 
-Object .defineProperty (X3DScene .prototype, "worldURL",
-{
-   get: X3DScene .prototype .getWorldURL,
-   enumerable: true,
-});
+      this ._loadCount = this [_loadingObjects] .size;
 
-Object .defineProperty (X3DScene .prototype, "units",
-{
-   get: X3DScene .prototype .getUnits,
-   enumerable: true,
+      const
+         browser = this .getBrowser (),
+         scene   = this .getScene ();
+
+      if (this === browser .getExecutionContext () || this .loader === browser .loader)
+         browser .addLoadingObject (node);
+
+      if (!this .isMainScene ())
+         scene .addLoadingObject (node);
+   },
+   removeLoadingObject: function (node)
+   {
+      if (!this [_loadingObjects] .has (node))
+         return;
+
+      this [_loadingObjects] .delete (node);
+
+      this ._loadCount = this [_loadingObjects] .size;
+
+      const
+         browser = this .getBrowser (),
+         scene   = this .getScene ();
+
+      if (this === browser .getExecutionContext () || this .loader === browser .loader)
+         browser .removeLoadingObject (node);
+
+      if (!this .isMainScene ())
+         scene .removeLoadingObject (node);
+   },
 });
 
-Object .defineProperty (X3DScene .prototype, "rootNodes",
+for (const key of Reflect .ownKeys (X3DScene .prototype))
+   Object .defineProperty (X3DScene .prototype, key, { enumerable: false });
+
+Object .defineProperties (X3DScene .prototype,
 {
-   get: X3DScene .prototype .getRootNodes,
-   set: X3DScene .prototype .setRootNodes,
-   enumerable: true,
+   specificationVersion:
+   {
+      get: X3DScene .prototype .getSpecificationVersion,
+      enumerable: true,
+   },
+   encoding:
+   {
+      get: X3DScene .prototype .getEncoding,
+      enumerable: true,
+   },
+   profile:
+   {
+      get: X3DScene .prototype .getProfile,
+      enumerable: true,
+   },
+   components:
+   {
+      get: X3DScene .prototype .getComponents,
+      enumerable: true,
+   },
+   worldURL:
+   {
+      get: X3DScene .prototype .getWorldURL,
+      enumerable: true,
+   },
+   units:
+   {
+      get: X3DScene .prototype .getUnits,
+      enumerable: true,
+   },
+   rootNodes:
+   {
+      get: X3DScene .prototype .getRootNodes,
+      set: X3DScene .prototype .setRootNodes,
+      enumerable: true,
+   },
 });
 
 export default X3DScene;

package/src/x_ite/Fields/ArrayFields.js

@@ -409,7 +409,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    {
       const target = this .getTarget ();
 
-      target .resize (0, undefined, true);
+      target .resize (0, undefined, false);
       target .processInterests ();
 
       X3DObjectArrayField .prototype .dispose .call (target);

package/src/x_ite/Fields/SFColor.js

@@ -121,7 +121,7 @@ SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
          destination .getValue () .getHSV (d),
          Color3 .lerp (s, d, t, r),
 
-         result .setHSV (r [0], r [1], r [2], r [3]);
+         result .setHSV (r [0], r [1], r [2]);
 
          return result;
       };
@@ -188,7 +188,6 @@ const r = {
       this .getValue () .r = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const g = {
@@ -201,7 +200,6 @@ const g = {
       this .getValue () .g = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const b = {
@@ -214,19 +212,16 @@ const b = {
       this .getValue () .b = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
-Object .defineProperty (SFColor .prototype, "r", r);
-Object .defineProperty (SFColor .prototype, "g", g);
-Object .defineProperty (SFColor .prototype, "b", b);
-
-r .enumerable = false;
-g .enumerable = false;
-b .enumerable = false;
-
-Object .defineProperty (SFColor .prototype, "0", r);
-Object .defineProperty (SFColor .prototype, "1", g);
-Object .defineProperty (SFColor .prototype, "2", b);
+Object .defineProperties (SFColor .prototype,
+{
+   0: r,
+   1: g,
+   2: b,
+   r: Object .assign ({ enumerable: true }, r),
+   g: Object .assign ({ enumerable: true }, g),
+   b: Object .assign ({ enumerable: true }, b),
+});
 
 export default SFColor;

package/src/x_ite/Fields/SFColorRGBA.js

@@ -141,7 +141,6 @@ const r = {
       this .getValue () .r = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const g = {
@@ -154,7 +153,6 @@ const g = {
       this .getValue () .g = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const b = {
@@ -167,7 +165,6 @@ const b = {
       this .getValue () .b = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const a = {
@@ -180,22 +177,18 @@ const a = {
       this .getValue () .a = +value;
       this .addEvent ();
    },
-   enumerable: true,
 };
 
-Object .defineProperty (SFColorRGBA .prototype, "r", r);
-Object .defineProperty (SFColorRGBA .prototype, "g", g);
-Object .defineProperty (SFColorRGBA .prototype, "b", b);
-Object .defineProperty (SFColorRGBA .prototype, "a", a);
-
-r .enumerable = false;
-g .enumerable = false;
-b .enumerable = false;
-a .enumerable = false;
-
-Object .defineProperty (SFColorRGBA .prototype, "0", r);
-Object .defineProperty (SFColorRGBA .prototype, "1", g);
-Object .defineProperty (SFColorRGBA .prototype, "2", b);
-Object .defineProperty (SFColorRGBA .prototype, "3", a);
+Object .defineProperties (SFColorRGBA .prototype,
+{
+   0: r,
+   1: g,
+   2: b,
+   3: a,
+   r: Object .assign ({ enumerable: true }, r),
+   g: Object .assign ({ enumerable: true }, g),
+   b: Object .assign ({ enumerable: true }, b),
+   a: Object .assign ({ enumerable: true }, a),
+});
 
 export default SFColorRGBA;

package/src/x_ite/Fields/SFImage.js

@@ -48,6 +48,9 @@
 import X3DField     from "../Base/X3DField.js";
 import ArrayFields  from "./ArrayFields.js";
 import X3DConstants from "../Base/X3DConstants.js";
+import Algorithm    from "../../standard/Math/Algorithm.js";
+
+const MFInt32 = ArrayFields .MFInt32;
 
 /*
  *  Image
@@ -55,11 +58,9 @@ import X3DConstants from "../Base/X3DConstants.js";
 
 function Image (width, height, comp, array)
 {
-   const MFInt32 = ArrayFields .MFInt32;
-
-   this .width  = width|0;
-   this .height = height|0;
-   this .comp   = comp|0;
+   this .width  = Math .max (width|0, 0);
+   this .height = Math .max (height|0, 0);
+   this .comp   = Algorithm .clamp (comp|0, 0, 4);
    this .array  = new MFInt32 ();
    this .array .setValue (array);
    this .array .length = this .width * this .height;
@@ -95,8 +96,8 @@ Image .prototype =
    },
    setWidth: function (value)
    {
-      this .width = value|0;
-      this .array .length = this .width  * this .height;
+      this .width = Math .max (value|0, 0);
+      this .array .length = this .width * this .height;
    },
    getWidth: function ()
    {
@@ -104,8 +105,8 @@ Image .prototype =
    },
    setHeight: function (value)
    {
-      this .height = value|0;
-      this .array .length = this .width  * this .height;
+      this .height = Math .max (value|0, 0);
+      this .array .length = this .width * this .height;
    },
    getHeight: function ()
    {
@@ -113,7 +114,7 @@ Image .prototype =
    },
    setComp: function (value)
    {
-      this .comp = value|0;
+      this .comp = Algorithm .clamp (value|0, 0, 4);
    },
    getComp: function ()
    {
@@ -122,7 +123,7 @@ Image .prototype =
    setArray: function (value)
    {
       this .array .setValue (value);
-      this .array .length = this .width  * this .height;
+      this .array .length = this .width * this .height;
    },
    getArray: function ()
    {
@@ -138,14 +139,23 @@ const _set_size = Symbol ();
 
 function SFImage (width, height, comp, array)
 {
-   const MFInt32 = ArrayFields .MFInt32;
-
-   if (arguments [0] instanceof Image)
-      X3DField .call (this, arguments [0]);
-   else if (arguments .length === 4)
-      X3DField .call (this, new Image (width, height, comp, array));
-   else
-      X3DField .call (this, new Image (0, 0, 0, new MFInt32 ()));
+   switch (arguments .length)
+   {
+      case 0:
+         X3DField .call (this, new Image (0, 0, 0, new MFInt32 ()));
+         break;
+      case 1:
+         X3DField .call (this, arguments [0]);
+         break;
+      case 3:
+         X3DField .call (this, new Image (width, height, comp, new MFInt32 ()));
+         break;
+      case 4:
+         X3DField .call (this, new Image (width, height, comp, array));
+         break;
+      default:
+         throw new Error ("Invalid arguments.");
+   }
 
    this .getValue () .getArray () .addParent (this);
    this .addInterest (_set_size, this);
@@ -307,7 +317,6 @@ const width = {
       this .getValue () .setWidth (value);
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const height = {
@@ -320,7 +329,6 @@ const height = {
       this .getValue () .setHeight (value);
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const comp = {
@@ -333,7 +341,6 @@ const comp = {
       this .getValue () .setComp (value);
       this .addEvent ();
    },
-   enumerable: true,
 };
 
 const array = {
@@ -346,18 +353,16 @@ const array = {
       this .getValue () .setArray (value);
       this .addEvent ();
    },
-   enumerable: true,
 };
 
-Object .defineProperty (SFImage .prototype, "width",  width);
-Object .defineProperty (SFImage .prototype, "height", height);
-Object .defineProperty (SFImage .prototype, "comp",   comp);
-Object .defineProperty (SFImage .prototype, "array",  array);
-
-width  .enumerable = false;
-height .enumerable = false;
-
-Object .defineProperty (SFImage .prototype, "x", width);
-Object .defineProperty (SFImage .prototype, "y", height);
+Object .defineProperties (SFImage .prototype,
+{
+   x: width,
+   y: height,
+   width:  Object .assign ({ enumerable: true }, width),
+   height: Object .assign ({ enumerable: true }, height),
+   comp:   Object .assign ({ enumerable: true }, comp),
+   array:  Object .assign ({ enumerable: true }, array),
+});
 
 export default SFImage;

package/src/x_ite/Fields/SFMatrix3.js

@@ -85,10 +85,8 @@ function SFMatrix3Template (TypeName, Type, SFVec2, double)
       throw new Error ("Invalid arguments.");
    }
 
-   SFMatrix3 .prototype = Object .assign (Object .create (X3DField .prototype),
-      SFMatrixPrototypeTemplate (TypeName, Type, Matrix3, SFVec2, double),
+   SFMatrix3 .prototype = Object .assign (SFMatrixPrototypeTemplate (SFMatrix3, TypeName, Type, Matrix3, SFVec2, double),
    {
-      constructor: SFMatrix3,
       setTransform: function (translation, rotation, scale, scaleOrientation, center)
       {
          translation      = translation      ? translation      .getValue () : null;

package/src/x_ite/Fields/SFMatrix4.js

@@ -89,11 +89,7 @@ function SFMatrix4Template (TypeName, Type, SFVec3, double)
       throw new Error ("Invalid arguments.");
    }
 
-   SFMatrix4 .prototype = Object .assign (Object .create (X3DField .prototype),
-      SFMatrixPrototypeTemplate (TypeName, Type, Matrix4, SFVec3, double),
-   {
-      constructor: SFMatrix4,
-   });
+   SFMatrix4 .prototype = SFMatrixPrototypeTemplate (SFMatrix4, TypeName, Type, Matrix4, SFVec3, double);
 
    for (const key of Reflect .ownKeys (SFMatrix4 .prototype))
       Object .defineProperty (SFMatrix4 .prototype, key, { enumerable: false });

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -47,12 +47,13 @@
 
 import X3DField from "../Base/X3DField.js";
 
-function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
+function SFMatrixPrototypeTemplate (Constructor, TypeName, Type, Matrix, SFVec, double)
 {
    const _formatter = double ? "DoubleFormat" : "FloatFormat";
 
    return Object .assign (Object .create (X3DField .prototype),
    {
+      constructor: Constructor,
       [Symbol .iterator]: function* ()
       {
          yield* this .getValue ();
@@ -107,19 +108,19 @@ function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
       },
       transpose: function ()
       {
-         return new (this .constructor) (Matrix .transpose (this .getValue ()));
+         return new (this .constructor) (this .getValue () .copy () .transpose ());
       },
       inverse: function ()
       {
-         return new (this .constructor) (Matrix .inverse (this .getValue ()));
+         return new (this .constructor) (this .getValue () .copy () .inverse ());
       },
       multLeft: function (matrix)
       {
-         return new (this .constructor) (Matrix .multLeft (this .getValue (), matrix .getValue ()));
+         return new (this .constructor) (this .getValue () .copy () .multLeft (matrix .getValue ()));
       },
       multRight: function (matrix)
       {
-         return new (this .constructor) (Matrix .multRight (this .getValue (), matrix .getValue ()));
+         return new (this .constructor) (this .getValue () .copy () .multRight (matrix .getValue ()));
       },
       multVecMatrix: function (vector)
       {

package/src/x_ite/Fields/SFNodeCache.js

@@ -81,11 +81,11 @@ function dispose ()
       target = this [_target],
       value  = target .getValue ();
 
-   cache .delete (value);
+   X3DField .prototype .dispose .call (target);
 
    value ?.dispose ();
 
-   X3DField .prototype .dispose .call (target);
+   cache .delete (value);
 }
 
 export default SFNodeCache;