x_ite 8.7.9 → 8.8.1

package/src/x_ite/Fields/SFImage.js

@@ -45,10 +45,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";
+import X3DField    from "../Base/X3DField.js";
+import ArrayFields from "./ArrayFields.js";
+import Algorithm   from "../../standard/Math/Algorithm.js";
 
 const MFInt32 = ArrayFields .MFInt32;
 
@@ -66,70 +65,69 @@ function Image (width, height, comp, array)
    this .array .length = this .width * this .height;
 }
 
-Image .prototype =
+Object .assign (Image .prototype,
 {
-   constructor: Image,
-   copy: function ()
+   copy ()
    {
       return new Image (this .width, this .height, this .comp, this .array);
    },
-   equals: function (image)
+   equals (image)
    {
       return this .width  === image .width &&
              this .height === image .height &&
              this .comp   === image .comp &&
              this .array .equals (image .array);
    },
-   assign: function (image)
+   assign (image)
    {
       this .width  = image .width;
       this .height = image .height;
       this .comp   = image .comp;
       this .array .assign (image .array);
    },
-   set: function (width, height, comp, array)
+   set (width, height, comp, array)
    {
       this .width  = width|0;
       this .height = height|0;
       this .comp   = comp|0;
       this .array .assign (array);
    },
-   setWidth: function (value)
+   setWidth (value)
    {
       this .width = Math .max (value|0, 0);
       this .array .length = this .width * this .height;
    },
-   getWidth: function ()
+   getWidth ()
    {
       return this .width;
    },
-   setHeight: function (value)
+   setHeight (value)
    {
       this .height = Math .max (value|0, 0);
       this .array .length = this .width * this .height;
    },
-   getHeight: function ()
+   getHeight ()
    {
       return this .height;
    },
-   setComp: function (value)
+   setComp (value)
    {
       this .comp = Algorithm .clamp (value|0, 0, 4);
    },
-   getComp: function ()
+   getComp ()
    {
       return this .comp;
    },
-   setArray: function (value)
+   setArray (value)
    {
       this .array .setValue (value);
       this .array .length = this .width * this .height;
    },
-   getArray: function ()
+   getArray ()
    {
       return this .array;
    },
-};
+});
 
 /*
  *  SFImage
@@ -144,15 +142,19 @@ function SFImage (width, height, comp, array)
       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.");
    }
@@ -161,48 +163,39 @@ function SFImage (width, height, comp, array)
    this .addInterest (_set_size, this);
 }
 
-SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
+Object .assign (Object .setPrototypeOf (SFImage .prototype, X3DField .prototype),
 {
-   constructor: SFImage,
-   [_set_size]: function ()
+   [_set_size] ()
    {
       this .getValue () .getArray () .length = this .width * this .height;
    },
-   [Symbol .iterator]: function* ()
+   *[Symbol .iterator] ()
    {
       yield this .width;
       yield this .height;
       yield this .comp;
       yield this .array;
    },
-   copy: function ()
+   copy ()
    {
       return new SFImage (this .getValue () .copy ());
    },
-   equals: function (image)
+   equals (image)
    {
       return this .getValue () .equals (image .getValue ());
    },
-   isDefaultValue: function ()
+   isDefaultValue ()
    {
       return (
          this .width  === 0 &&
          this .height === 0 &&
          this .comp   === 0);
    },
-   set: function (image)
+   set (image)
    {
       this .getValue () .assign (image);
    },
-   getTypeName: function ()
-   {
-      return "SFImage";
-   },
-   getType: function ()
-   {
-      return X3DConstants .SFImage;
-   },
-   toStream: function (generator)
+   toStream (generator)
    {
       const array = this .array;
 
@@ -236,15 +229,15 @@ SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
 
       generator .DecIndent ();
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       this .toStream (generator);
    },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       this .toStream (generator);
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       generator .string += '[';
       generator .string += generator .ListBreak ();
@@ -258,7 +251,7 @@ SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
       generator .string += generator .ListIndent ();
       generator .string += ']';
    },
-   toJSONStreamValue: function (generator)
+   toJSONStreamValue (generator)
    {
       const
          array  = this .array,
@@ -308,11 +301,11 @@ for (const key of Reflect .ownKeys (SFImage .prototype))
    Object .defineProperty (SFImage .prototype, key, { enumerable: false });
 
 const width = {
-   get: function ()
+   get ()
    {
       return this .getValue () .getWidth ();
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .setWidth (value);
       this .addEvent ();
@@ -320,11 +313,11 @@ const width = {
 };
 
 const height = {
-   get: function ()
+   get ()
    {
       return this .getValue () .getHeight ();
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .setHeight (value);
       this .addEvent ();
@@ -332,11 +325,11 @@ const height = {
 };
 
 const comp = {
-   get: function ()
+   get ()
    {
       return this .getValue () .getComp ();
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .setComp (value);
       this .addEvent ();
@@ -344,11 +337,11 @@ const comp = {
 };
 
 const array = {
-   get: function ()
+   get ()
    {
       return this .getValue () .getArray ();
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .setArray (value);
       this .addEvent ();
@@ -365,4 +358,13 @@ Object .defineProperties (SFImage .prototype,
    array:  Object .assign ({ enumerable: true }, array),
 });
 
+Object .defineProperties (SFImage,
+{
+   typeName:
+   {
+      value: "SFImage",
+      enumerable: true,
+   },
+});
+
 export default SFImage;

package/src/x_ite/Fields/SFInt32.js

@@ -45,55 +45,45 @@
  *
  ******************************************************************************/
 
-import X3DField     from "../Base/X3DField.js";
-import X3DConstants from "../Base/X3DConstants.js";
+import X3DField from "../Base/X3DField.js";
 
 function SFInt32 (value)
 {
-   return X3DField .call (this, value|0);
+   X3DField .call (this, value|0);
 }
 
-SFInt32 .prototype = Object .assign (Object .create (X3DField .prototype),
+Object .assign (Object .setPrototypeOf (SFInt32 .prototype, X3DField .prototype),
 {
-   constructor: SFInt32,
-   copy: function ()
+   copy ()
    {
       return new SFInt32 (this .getValue ());
    },
-   getTypeName: function ()
-   {
-      return "SFInt32";
-   },
-   getType: function ()
-   {
-      return X3DConstants .SFInt32;
-   },
-   isDefaultValue: function ()
+   isDefaultValue ()
    {
       return this .getValue () === 0;
    },
-   set: function (value)
+   set (value)
    {
       X3DField .prototype .set .call (this, value|0);
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (generator)
+   toStream (generator)
    {
       generator .string += this .getValue () .toString ();
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       this .toStream (generator);
    },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       this .toStream (generator);
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       this .toStream (generator);
    },
-   toJSONStreamValue: function (generator)
+   toJSONStreamValue (generator)
    {
       this .toStream (generator);
    },
@@ -102,4 +92,13 @@ SFInt32 .prototype = Object .assign (Object .create (X3DField .prototype),
 for (const key of Reflect .ownKeys (SFInt32 .prototype))
    Object .defineProperty (SFInt32 .prototype, key, { enumerable: false });
 
+Object .defineProperties (SFInt32,
+{
+   typeName:
+   {
+      value: "SFInt32",
+      enumerable: true,
+   },
+});
+
 export default SFInt32;

package/src/x_ite/Fields/SFMatrix3.js

@@ -48,10 +48,9 @@
 import X3DField                  from "../Base/X3DField.js";
 import SFMatrixPrototypeTemplate from "./SFMatrixPrototypeTemplate.js";
 import SFVec2                    from "./SFVec2.js";
-import X3DConstants              from "../Base/X3DConstants.js";
 import Matrix3                   from "../../standard/Math/Numbers/Matrix3.js";
 
-function SFMatrix3Template (TypeName, Type, SFVec2, double)
+function SFMatrix3Template (TypeName, SFVec2, double)
 {
    function SFMatrix3 (m00, m01, m02,
                        m10, m11, m12,
@@ -60,10 +59,12 @@ function SFMatrix3Template (TypeName, Type, SFVec2, double)
       switch (arguments .length)
       {
          case 0:
-            return X3DField .call (this, new Matrix3 ());
+            X3DField .call (this, new Matrix3 ());
+            break;
 
          case 1:
-            return X3DField .call (this, arguments [0]);
+            X3DField .call (this, arguments [0]);
+            break;
 
          case 3:
          {
@@ -72,22 +73,28 @@ function SFMatrix3Template (TypeName, Type, SFVec2, double)
                r1 = arguments [1],
                r2 = arguments [2];
 
-            return X3DField .call (this, new Matrix3 (r0 .x, r0 .y, r0 .z,
+            X3DField .call (this, new Matrix3 (r0 .x, r0 .y, r0 .z,
                                                       r1 .x, r1 .y, r1 .z,
                                                       r2 .x, r2 .y, r2 .z));
+
+            break;
          }
          case 9:
-            return X3DField .call (this, new Matrix3 (+m00, +m01, +m02,
-                                                      +m10, +m11, +m12,
-                                                      +m20, +m21, +m22));
-      }
+         {
+            X3DField .call (this, new Matrix3 (+m00, +m01, +m02,
+                                               +m10, +m11, +m12,
+                                               +m20, +m21, +m22));
 
-      throw new Error ("Invalid arguments.");
+            break;
+         }
+         default:
+            throw new Error ("Invalid arguments.");
+      }
    }
 
-   SFMatrix3 .prototype = Object .assign (SFMatrixPrototypeTemplate (SFMatrix3, TypeName, Type, Matrix3, SFVec2, double),
+   Object .assign (SFMatrixPrototypeTemplate (SFMatrix3, TypeName, Matrix3, SFVec2, double),
    {
-      setTransform: function (translation, rotation, scale, scaleOrientation, center)
+      setTransform (translation, rotation, scale, scaleOrientation, center)
       {
          translation      = translation      ? translation      .getValue () : null;
          rotation         = rotation         ? rotation                      : 0;
@@ -106,11 +113,11 @@ function SFMatrix3Template (TypeName, Type, SFVec2, double)
    {
       Object .defineProperty (SFMatrix3 .prototype, i,
       {
-         get: function ()
+         get ()
          {
             return this .getValue () [i];
          },
-         set: function (value)
+         set (value)
          {
             this .getValue () [i] = +value;
             this .addEvent ();
@@ -126,8 +133,8 @@ function SFMatrix3Template (TypeName, Type, SFVec2, double)
 }
 
 const SFMatrix3 = {
-   SFMatrix3d: SFMatrix3Template ("SFMatrix3d", X3DConstants .SFMatrix3d, SFVec2 .SFVec2d, true),
-   SFMatrix3f: SFMatrix3Template ("SFMatrix3f", X3DConstants .SFMatrix3f, SFVec2 .SFVec2f, false),
+   SFMatrix3d: SFMatrix3Template ("SFMatrix3d", SFVec2 .SFVec2d, true),
+   SFMatrix3f: SFMatrix3Template ("SFMatrix3f", SFVec2 .SFVec2f, false),
 };
 
 export default SFMatrix3;

package/src/x_ite/Fields/SFMatrix4.js

@@ -48,10 +48,9 @@
 import X3DField                  from "../Base/X3DField.js";
 import SFMatrixPrototypeTemplate from "./SFMatrixPrototypeTemplate.js";
 import SFVec3                    from "./SFVec3.js";
-import X3DConstants              from "../Base/X3DConstants.js";
 import Matrix4                   from "../../standard/Math/Numbers/Matrix4.js";
 
-function SFMatrix4Template (TypeName, Type, SFVec3, double)
+function SFMatrix4Template (TypeName, SFVec3, double)
 {
    function SFMatrix4 (m00, m01, m02, m03,
                        m10, m11, m12, m13,
@@ -61,10 +60,12 @@ function SFMatrix4Template (TypeName, Type, SFVec3, double)
       switch (arguments .length)
       {
          case 0:
-            return X3DField .call (this, new Matrix4 ());
+            X3DField .call (this, new Matrix4 ());
+            break;
 
          case 1:
-            return X3DField .call (this, arguments [0]);
+            X3DField .call (this, arguments [0]);
+            break;
 
          case 4:
          {
@@ -74,22 +75,28 @@ function SFMatrix4Template (TypeName, Type, SFVec3, double)
                r2 = arguments [2],
                r3 = arguments [3];
 
-            return X3DField .call (this, new Matrix4 (r0 .x, r0 .y, r0 .z, r0 .w,
+            X3DField .call (this, new Matrix4 (r0 .x, r0 .y, r0 .z, r0 .w,
                                                       r1 .x, r1 .y, r1 .z, r1 .w,
                                                       r2 .x, r2 .y, r2 .z, r2 .w,
                                                       r3 .x, r3 .y, r3 .z, r3 .w));
+
+            break;
          }
          case 16:
-            return X3DField .call (this, new Matrix4 (+m00, +m01, +m02, +m03,
-                                                      +m10, +m11, +m12, +m13,
-                                                      +m20, +m21, +m22, +m23,
-                                                      +m30, +m31, +m32, +m33));
-      }
+         {
+            X3DField .call (this, new Matrix4 (+m00, +m01, +m02, +m03,
+                                               +m10, +m11, +m12, +m13,
+                                               +m20, +m21, +m22, +m23,
+                                               +m30, +m31, +m32, +m33));
 
-      throw new Error ("Invalid arguments.");
+            break;
+         }
+         default:
+            throw new Error ("Invalid arguments.");
+      }
    }
 
-   SFMatrix4 .prototype = SFMatrixPrototypeTemplate (SFMatrix4, TypeName, Type, Matrix4, SFVec3, double);
+   SFMatrixPrototypeTemplate (SFMatrix4, TypeName, Matrix4, SFVec3, double);
 
    for (const key of Reflect .ownKeys (SFMatrix4 .prototype))
       Object .defineProperty (SFMatrix4 .prototype, key, { enumerable: false });
@@ -98,11 +105,11 @@ function SFMatrix4Template (TypeName, Type, SFVec3, double)
    {
       Object .defineProperty (SFMatrix4 .prototype, i,
       {
-         get: function ()
+         get ()
          {
             return this .getValue () [i];
          },
-         set: function (value)
+         set (value)
          {
             this .getValue () [i] = value;
             this .addEvent ();
@@ -118,9 +125,9 @@ function SFMatrix4Template (TypeName, Type, SFVec3, double)
 }
 
 const SFMatrix4 = {
-   SFMatrix4d: SFMatrix4Template ("SFMatrix4d", X3DConstants .SFMatrix4d, SFVec3 .SFVec3d, true),
-   SFMatrix4f: SFMatrix4Template ("SFMatrix4f", X3DConstants .SFMatrix4f, SFVec3 .SFVec3f, false),
-   VrmlMatrix: SFMatrix4Template ("VrmlMatrix", X3DConstants .VrmlMatrix, SFVec3 .SFVec3f, false),
+   SFMatrix4d: SFMatrix4Template ("SFMatrix4d", SFVec3 .SFVec3d, true),
+   SFMatrix4f: SFMatrix4Template ("SFMatrix4f", SFVec3 .SFVec3f, false),
+   VrmlMatrix: SFMatrix4Template ("VrmlMatrix", SFVec3 .SFVec3f, false),
 };
 
 export default SFMatrix4;

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -47,42 +47,42 @@
 
 import X3DField from "../Base/X3DField.js";
 
-function SFMatrixPrototypeTemplate (Constructor, TypeName, Type, Matrix, SFVec, double)
+function SFMatrixPrototypeTemplate (Constructor, TypeName, Matrix, SFVec, double)
 {
    const _formatter = double ? "DoubleFormat" : "FloatFormat";
 
-   return Object .assign (Object .create (X3DField .prototype),
+   Object .defineProperties (Constructor,
    {
-      constructor: Constructor,
-      [Symbol .iterator]: function* ()
+      typeName:
       {
-         yield* this .getValue ();
-      },
-      getTypeName: function ()
-      {
-         return TypeName;
+         value: TypeName,
+         enumerable: true,
       },
-      getType: function ()
+   });
+
+   return Object .assign (Object .setPrototypeOf (Constructor .prototype, X3DField .prototype),
+   {
+      *[Symbol .iterator] ()
       {
-         return Type;
+         yield* this .getValue ();
       },
-      copy: function ()
+      copy ()
       {
          return new (this .constructor) (this .getValue () .copy ());
       },
-      equals: function (matrix)
+      equals (matrix)
       {
          return this .getValue () .equals (matrix .getValue ());
       },
-      isDefaultValue: function ()
+      isDefaultValue ()
       {
          return this .getValue () .equals (Matrix .Identity);
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .assign (value);
       },
-      setTransform: function (translation, rotation, scale, scaleOrientation, center)
+      setTransform (translation, rotation, scale, scaleOrientation, center)
       {
          translation      = translation      ? translation      .getValue () : null;
          rotation         = rotation         ? rotation         .getValue () : null;
@@ -92,7 +92,7 @@ function SFMatrixPrototypeTemplate (Constructor, TypeName, Type, Matrix, SFVec,
 
          this .getValue () .set (translation, rotation, scale, scaleOrientation, center);
       },
-      getTransform: function (translation, rotation, scale, scaleOrientation, center)
+      getTransform (translation, rotation, scale, scaleOrientation, center)
       {
          translation      = translation      ? translation      .getValue () : null;
          rotation         = rotation         ? rotation         .getValue () : null;
@@ -102,43 +102,43 @@ function SFMatrixPrototypeTemplate (Constructor, TypeName, Type, Matrix, SFVec,
 
          this .getValue () .get (translation, rotation, scale, scaleOrientation, center);
       },
-      determinant: function ()
+      determinant ()
       {
          return this .getValue () .determinant ();
       },
-      transpose: function ()
+      transpose ()
       {
          return new (this .constructor) (this .getValue () .copy () .transpose ());
       },
-      inverse: function ()
+      inverse ()
       {
          return new (this .constructor) (this .getValue () .copy () .inverse ());
       },
-      multLeft: function (matrix)
+      multLeft (matrix)
       {
          return new (this .constructor) (this .getValue () .copy () .multLeft (matrix .getValue ()));
       },
-      multRight: function (matrix)
+      multRight (matrix)
       {
          return new (this .constructor) (this .getValue () .copy () .multRight (matrix .getValue ()));
       },
-      multVecMatrix: function (vector)
+      multVecMatrix (vector)
       {
          return new SFVec (this .getValue () .multVecMatrix (vector .getValue () .copy ()));
       },
-      multMatrixVec: function (vector)
+      multMatrixVec (vector)
       {
          return new SFVec (this .getValue () .multMatrixVec (vector .getValue () .copy ()));
       },
-      multDirMatrix: function (vector)
+      multDirMatrix (vector)
       {
          return new SFVec (this .getValue () .multDirMatrix (vector .getValue () .copy ()));
       },
-      multMatrixDir: function (vector)
+      multMatrixDir (vector)
       {
          return new SFVec (this .getValue () .multMatrixDir (vector .getValue () .copy ()));
       },
-      toStream: function (generator)
+      toStream (generator)
       {
          const
             value = this .getValue (),
@@ -152,15 +152,15 @@ function SFMatrixPrototypeTemplate (Constructor, TypeName, Type, Matrix, SFVec,
 
          generator .string += generator [_formatter] (value [last]);
       },
-      toVRMLStream: function (generator)
+      toVRMLStream (generator)
       {
          this .toStream (generator);
       },
-      toXMLStream: function (generator)
+      toXMLStream (generator)
       {
          this .toStream (generator);
       },
-      toJSONStream: function (generator)
+      toJSONStream (generator)
       {
          generator .string += '[';
          generator .string += generator .TidySpace ();
@@ -170,7 +170,7 @@ function SFMatrixPrototypeTemplate (Constructor, TypeName, Type, Matrix, SFVec,
          generator .string += generator .TidySpace ();
          generator .string += ']';
       },
-      toJSONStreamValue: function (generator)
+      toJSONStreamValue (generator)
       {
          const
             value = this .getValue (),