x_ite 8.7.4 → 8.7.6

package/src/standard/Math/Numbers/Vector2.js

@@ -54,7 +54,6 @@ function Vector2 (x, y)
 Vector2 .prototype =
 {
    constructor: Vector2,
-   length: 2,
    [Symbol .iterator]: function* ()
    {
       yield this .x;
@@ -214,20 +213,19 @@ Vector2 .prototype =
    }
 };
 
-Object .defineProperty (Vector2 .prototype, "0",
+Object .defineProperties (Vector2 .prototype,
 {
-   get: function () { return this .x; },
-   set: function (value) { this .x = value; },
-   enumerable: false,
-   configurable: false
-});
-
-Object .defineProperty (Vector2 .prototype, "1",
-{
-   get: function () { return this .y; },
-   set: function (value) { this .y = value; },
-   enumerable: false,
-   configurable: false
+   length: { value: 2 },
+   0:
+   {
+      get: function () { return this .x; },
+      set: function (value) { this .x = value; },
+   },
+   1:
+   {
+      get: function () { return this .y; },
+      set: function (value) { this .y = value; },
+   },
 });
 
 Object .assign (Vector2,
@@ -236,70 +234,6 @@ Object .assign (Vector2,
    One: new Vector2 (1, 1),
    xAxis: new Vector2 (1, 0),
    yAxis: new Vector2 (0, 1),
-   negate: function (vector)
-   {
-      return vector .copy () .negate ();
-   },
-   inverse: function (vector)
-   {
-      return vector .copy () .inverse ();
-   },
-   add: function (lhs, rhs)
-   {
-      return lhs .copy () .add (rhs);
-   },
-   subtract: function (lhs, rhs)
-   {
-      return lhs .copy () .subtract (rhs);
-   },
-   multiply: function (lhs, rhs)
-   {
-      return lhs .copy () .multiply (rhs);
-   },
-   multVec: function (lhs, rhs)
-   {
-      return lhs .copy () .multVec (rhs);
-   },
-   divide: function (lhs, rhs)
-   {
-      return lhs .copy () .divide (rhs);
-   },
-   divVec: function (lhs, rhs)
-   {
-      return lhs .copy () .divVec (rhs);
-   },
-   normalize: function (vector)
-   {
-      return vector .copy () .normalize ();
-   },
-   dot: function (lhs, rhs)
-   {
-      return lhs .dot (rhs);
-   },
-   magnitude: function (vector)
-   {
-      return vector .magnitude ();
-   },
-   distance: function (lhs, rhs)
-   {
-      return lhs .distance (rhs);
-   },
-   lerp: function (source, destination, t)
-   {
-      return source .copy () .lerp (destination, t);
-   },
-   abs: function (vector)
-   {
-      return vector .copy () .abs ();
-   },
-   min: function (lhs, rhs)
-   {
-      return this .prototype .min .apply (lhs .copy (), arguments);
-   },
-   max: function (lhs, rhs)
-   {
-      return this .prototype .max .apply (lhs .copy (), arguments);
-   },
 });
 
 export default Vector2;

package/src/standard/Math/Numbers/Vector3.js

@@ -57,7 +57,6 @@ function Vector3 (x, y, z)
 Vector3 .prototype =
 {
    constructor: Vector3,
-   length: 3,
    [Symbol .iterator]: function* ()
    {
       yield this .x;
@@ -262,28 +261,24 @@ Vector3 .prototype =
    }
 };
 
-Object .defineProperty (Vector3 .prototype, "0",
+Object .defineProperties (Vector3 .prototype,
 {
-   get: function () { return this .x; },
-   set: function (value) { this .x = value; },
-   enumerable: false,
-   configurable: false
-});
-
-Object .defineProperty (Vector3 .prototype, "1",
-{
-   get: function () { return this .y; },
-   set: function (value) { this .y = value; },
-   enumerable: false,
-   configurable: false
-});
-
-Object .defineProperty (Vector3 .prototype, "2",
-{
-   get: function () { return this .z; },
-   set: function (value) { this .z = value; },
-   enumerable: false,
-   configurable: false
+   length: { value: 3 },
+   0:
+   {
+      get: function () { return this .x; },
+      set: function (value) { this .x = value; },
+   },
+   1:
+   {
+      get: function () { return this .y; },
+      set: function (value) { this .y = value; },
+   },
+   2:
+   {
+      get: function () { return this .z; },
+      set: function (value) { this .z = value; },
+   },
 });
 
 Object .assign (Vector3,
@@ -293,78 +288,6 @@ Object .assign (Vector3,
    xAxis: new Vector3 (1, 0, 0),
    yAxis: new Vector3 (0, 1, 0),
    zAxis: new Vector3 (0, 0, 1),
-   negate: function (vector)
-   {
-      return vector .copy () .negate ();
-   },
-   inverse: function (vector)
-   {
-      return vector .copy () .inverse ();
-   },
-   add: function (lhs, rhs)
-   {
-      return lhs .copy () .add (rhs);
-   },
-   subtract: function (lhs, rhs)
-   {
-      return lhs .copy () .subtract (rhs);
-   },
-   multiply: function (lhs, rhs)
-   {
-      return lhs .copy () .multiply (rhs);
-   },
-   multVec: function (lhs, rhs)
-   {
-      return lhs .copy () .multVec (rhs);
-   },
-   divide: function (lhs, rhs)
-   {
-      return lhs .copy () .divide (rhs);
-   },
-   divVec: function (lhs, rhs)
-   {
-      return lhs .copy () .divVec (rhs);
-   },
-   cross: function (lhs, rhs)
-   {
-      return lhs .copy () .cross (rhs);
-   },
-   normalize: function (vector)
-   {
-      return vector .copy () .normalize ();
-   },
-   dot: function (lhs, rhs)
-   {
-      return lhs .dot (rhs);
-   },
-   magnitude: function (vector)
-   {
-      return vector .magnitude ();
-   },
-   distance: function (lhs, rhs)
-   {
-      return lhs .distance (rhs);
-   },
-   lerp: function (source, destination, t)
-   {
-      return source .copy () .lerp (destination, t);
-   },
-   slerp: function (source, destination, t)
-   {
-      return source .copy () .slerp (destination, t);
-   },
-   abs: function (vector)
-   {
-      return vector .copy () .abs ();
-   },
-   min: function (lhs, rhs)
-   {
-      return this .prototype .min .apply (lhs .copy (), arguments);
-   },
-   max: function (lhs, rhs)
-   {
-      return this .prototype .max .apply (lhs .copy (), arguments);
-   },
 });
 
 export default Vector3;

package/src/standard/Math/Numbers/Vector4.js

@@ -56,7 +56,6 @@ function Vector4 (x, y, z, w)
 Vector4 .prototype =
 {
    constructor: Vector4,
-   length: 4,
    [Symbol .iterator]: function* ()
    {
       yield this .x;
@@ -271,36 +270,29 @@ Vector4 .prototype =
    },
 };
 
-Object .defineProperty (Vector4 .prototype, "0",
+Object .defineProperties (Vector4 .prototype,
 {
-   get: function () { return this .x; },
-   set: function (value) { this .x = value; },
-   enumerable: false,
-   configurable: false
-});
-
-Object .defineProperty (Vector4 .prototype, "1",
-{
-   get: function () { return this .y; },
-   set: function (value) { this .y = value; },
-   enumerable: false,
-   configurable: false
-});
-
-Object .defineProperty (Vector4 .prototype, "2",
-{
-   get: function () { return this .z; },
-   set: function (value) { this .z = value; },
-   enumerable: false,
-   configurable: false
-});
-
-Object .defineProperty (Vector4 .prototype, "3",
-{
-   get: function () { return this .w; },
-   set: function (value) { this .w = value; },
-   enumerable: false,
-   configurable: false
+   length: { value: 4 },
+   0:
+   {
+      get: function () { return this .x; },
+      set: function (value) { this .x = value; },
+   },
+   1:
+   {
+      get: function () { return this .y; },
+      set: function (value) { this .y = value; },
+   },
+   2:
+   {
+      get: function () { return this .z; },
+      set: function (value) { this .z = value; },
+   },
+   3:
+   {
+      get: function () { return this .w; },
+      set: function (value) { this .w = value; },
+   },
 });
 
 Object .assign (Vector4,
@@ -311,70 +303,6 @@ Object .assign (Vector4,
    yAxis: new Vector4 (0, 1, 0, 0),
    zAxis: new Vector4 (0, 0, 1, 0),
    wAxis: new Vector4 (0, 0, 0, 1),
-   negate: function (vector)
-   {
-      return vector .copy () .negate ();
-   },
-   inverse: function (vector)
-   {
-      return vector .copy () .inverse ();
-   },
-   add: function (lhs, rhs)
-   {
-      return lhs .copy () .add (rhs);
-   },
-   subtract: function (lhs, rhs)
-   {
-      return lhs .copy () .subtract (rhs);
-   },
-   multiply: function (lhs, rhs)
-   {
-      return lhs .copy () .multiply (rhs);
-   },
-   multVec: function (lhs, rhs)
-   {
-      return lhs .copy () .multVec (rhs);
-   },
-   divide: function (lhs, rhs)
-   {
-      return lhs .copy () .divide (rhs);
-   },
-   divVec: function (lhs, rhs)
-   {
-      return lhs .copy () .divVec (rhs);
-   },
-   normalize: function (vector)
-   {
-      return vector .copy () .normalize ();
-   },
-   dot: function (lhs, rhs)
-   {
-      return lhs .dot (rhs);
-   },
-   magnitude: function (vector)
-   {
-      return vector .magnitude ();
-   },
-   distance: function (lhs, rhs)
-   {
-      return lhs .distance (rhs);
-   },
-   lerp: function (source, destination, t)
-   {
-      return source .copy () .lerp (destination, t);
-   },
-   abs: function (vector)
-   {
-      return vector .copy () .abs ();
-   },
-   min: function (lhs, rhs)
-   {
-      return this .prototype .min .apply (lhs .copy (), arguments);
-   },
-   max: function (lhs, rhs)
-   {
-      return this .prototype .max .apply (lhs .copy (), arguments);
-   },
 });
 
 export default Vector4;

package/src/x_ite/Base/X3DInfoArray.js

@@ -356,14 +356,16 @@ X3DInfoArray .prototype = {
 for (const key of Reflect .ownKeys (X3DInfoArray .prototype))
    Object .defineProperty (X3DInfoArray .prototype, key, { enumerable: false });
 
-Object .defineProperty (X3DInfoArray .prototype, "length",
+Object .defineProperties (X3DInfoArray .prototype,
 {
-   get: function () { return this [_array] .length; },
-});
-
-Object .defineProperty (X3DInfoArray .prototype, Symbol .toStringTag,
-{
-   get: function () { return this .getTypeName (); },
+   length:
+   {
+      get: function () { return this [_array] .length; },
+   },
+   [Symbol .toStringTag]:
+   {
+      get: function () { return this .getTypeName (); },
+   },
 });
 
 export default X3DInfoArray;

package/src/x_ite/Base/X3DObject.js

@@ -83,16 +83,9 @@ X3DObject .prototype =
    {
       return this [_name];
    },
-   getInterestId: function (callbackName, object)
-   {
-      if (typeof callbackName === "symbol")
-         return X3DObject .getId (object) + ".Symbol(" + SymbolId (callbackName) + ")";
-
-      return X3DObject .getId (object) + "." + String (callbackName);
-   },
    hasInterest: function (callbackName, object)
    {
-      return this [_interests] .has (this .getInterestId (callbackName, object));
+      return this [_interests] .has (X3DObject .getInterestId (callbackName, object));
    },
    addInterest: function (callbackName, object, ... args)
    {
@@ -103,14 +96,14 @@ X3DObject .prototype =
       }
 
       const
-         interestId = this .getInterestId (callbackName, object),
+         interestId = X3DObject .getInterestId (callbackName, object),
          callback   = object [callbackName];
 
       this [_interests] .set (interestId, callback .bind (object, ... args, this));
    },
    removeInterest: function (callbackName, object)
    {
-      this [_interests] .delete (this .getInterestId (callbackName, object));
+      this [_interests] .delete (X3DObject .getInterestId (callbackName, object));
    },
    getInterests: function ()
    {
@@ -185,7 +178,7 @@ X3DObject .prototype =
    },
    toStream: function (generator)
    {
-      generator .string = "[object " + this .getTypeName () + "]";
+      generator .string = `[object ${this .getTypeName ()}]`;
    },
    dispose: function ()
    {
@@ -208,7 +201,7 @@ Object .assign (X3DObject,
    {
       const map = new WeakMap ();
 
-      let counter = 0;
+      let counter = 0; // In the future we can use a bigint here (0n).
 
       return function (object)
       {
@@ -222,26 +215,10 @@ Object .assign (X3DObject,
          return counter;
       };
    })(),
-});
-
-// In the future we can use getId, because WeakMap will accept Symbols as key.
-const SymbolId = (function ()
-{
-   const map = new Map ();
-
-   let counter = 0;
-
-   return function (object)
+   getInterestId: function (callbackName, object)
    {
-      const id = map .get (object);
-
-      if (id !== undefined)
-         return id;
-
-      map .set (object, ++ counter);
-
-      return counter;
-   };
-})();
+      return `${this .getId (object)}.${this .getId (object [callbackName])}`;
+   },
+});
 
 export default X3DObject;

package/src/x_ite/Base/X3DObjectArrayField.js

@@ -50,8 +50,7 @@ import X3DArrayField from "./X3DArrayField.js";
 
 const
    _target = Symbol (),
-   _proxy  = Symbol (),
-   _find   = Symbol ();
+   _proxy  = Symbol ();
 
 const handler =
 {
@@ -193,6 +192,10 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return true;
    },
+   isDefaultValue: function ()
+   {
+      return this .length === 0;
+   },
    set: function (value)
    {
       const target = this [_target];
@@ -204,10 +207,6 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
       for (let i = 0, length = value .length; i < length; ++ i)
          array [i] .set (value [i] instanceof X3DField ? value [i] .getValue () : value [i]);
    },
-   isDefaultValue: function ()
-   {
-      return this .length === 0;
-   },
    setValue: function (value)
    {
       const target = this [_target];
@@ -242,10 +241,14 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       if (array .length)
       {
-         const field = array .shift ();
+         const
+            field  = array .shift (),
+            result = field .valueOf ();
+
          target .removeChildObject (field);
          target .addEvent ();
-         return field .valueOf ();
+
+         return result;
       }
    },
    push: function (value)
@@ -275,10 +278,14 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       if (array .length)
       {
-         const field = array .pop ();
+         const
+            field  = array .pop (),
+            result = field .valueOf ();
+
          target .removeChildObject (field);
          target .addEvent ();
-         return field .valueOf ();
+
+         return result;
       }
    },
    splice: function (index, deleteCount, ... insertValues)
@@ -319,53 +326,28 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       target .addEvent ();
    },
-   [_find]: function (first, last, value)
-   {
-      const
-         target = this [_target],
-         values = target .getValue ();
-
-      if (typeof value === "function")
-      {
-         for (let i = first; i < last; ++ i)
-         {
-            if (value (values [i] .valueOf ()))
-               return i;
-         }
-
-         return last;
-      }
-
-      for (let i = first; i < last; ++ i)
-      {
-         if (values [i] .equals (value))
-            return i;
-      }
-
-      return last;
-   },
    remove: function (first, last, value)
    {
       const
          target = this [_target],
-         values = target .getValue ();
+         array  = target .getValue ();
 
       if (typeof value === "function")
       {
-         first = target [_find] (first, last, value);
+         first = array .findIndex ((current, index) => index >= first && value (current .valueOf ()))
 
-         if (first !== last)
+         if (first !== -1)
          {
             for (let i = first; ++ i < last; )
             {
-               const current = values [i];
+               const current = array [i];
 
                if (!value (current .valueOf ()))
                {
-                  const tmp = values [first];
+                  const tmp = array [first];
 
-                  values [first ++] = current;
-                  values [i]        = tmp;
+                  array [first ++] = current;
+                  array [i]        = tmp;
                }
             }
          }
@@ -376,25 +358,25 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          return first;
       }
 
-      first = target [_find] (first, last, value);
+      first = array .findIndex ((current, index) => index >= first && current .equals (value))
 
-      if (first !== last)
+      if (first !== -1)
       {
          for (let i = first; ++ i < last; )
          {
-            const current = values [i];
+            const current = array [i];
 
             if (!current .equals (value))
             {
-               const tmp = values [first];
+               const tmp = array [first];
 
-               values [first ++] = current;
-               values [i]        = tmp;
+               array [first ++] = current;
+               array [i]        = tmp;
             }
          }
       }
 
-      if (first !== last)
+      if (first !== -1)
          target .addEvent ();
 
       return first;
@@ -403,14 +385,15 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
    {
       const
          target = this [_target],
-         values = target .getValue () .splice (first, last - first);
+         values = target .getValue () .splice (first, last - first),
+         result = new (target .constructor) (values);
 
       for (const value of values)
          target .removeChildObject (value);
 
       target .addEvent ();
 
-      return new (target .constructor) (values);
+      return result;
    },
    resize: function (size, value, silently)
    {
@@ -453,6 +436,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
    removeChildObject: function (value)
    {
       value .removeParent (this [_proxy]);
+      value .dispose ();
    },
    reverse: function ()
    {
@@ -597,19 +581,6 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          generator .string += ']';
       }
    },
-   dispose: function ()
-   {
-      const
-         target = this [_target],
-         array  = target .getValue ();
-
-      for (const value of array)
-         target .removeChildObject (value);
-
-      array .length = 0;
-
-      X3DArrayField .prototype .dispose .call (target);
-   },
 });
 
 for (const key of Reflect .ownKeys (X3DObjectArrayField .prototype))