x_ite 8.7.8 → 8.8.0

package/src/x_ite/Fields/SFString.js

@@ -45,75 +45,53 @@
  *
  ******************************************************************************/
 
-import X3DField     from "../Base/X3DField.js";
-import X3DConstants from "../Base/X3DConstants.js";
+import X3DField from "../Base/X3DField.js";
 
 function SFString (value)
 {
-   return X3DField .call (this, arguments .length ? "" + value : "");
+   X3DField .call (this, arguments .length ? String (value) : "");
 }
 
-Object .assign (SFString,
+Object .assign (Object .setPrototypeOf (SFString .prototype, X3DField .prototype),
 {
-   unescape: function (string)
-   {
-      return string .replace (/\\([\\"])/g, "$1");
-   },
-   escape: function (string)
-   {
-      return string .replace (/([\\"])/g, "\\$1");
-   },
-});
-
-SFString .prototype = Object .assign (Object .create (X3DField .prototype),
-{
-   constructor: SFString,
-   [Symbol .iterator]: function* ()
+   *[Symbol .iterator] ()
    {
       yield* this .getValue ();
    },
-   copy: function ()
+   copy ()
    {
       return new SFString (this .getValue ());
    },
-   getTypeName: function ()
-   {
-      return "SFString";
-   },
-   getType: function ()
-   {
-      return X3DConstants .SFString;
-   },
-   isDefaultValue: function ()
+   isDefaultValue ()
    {
       return this .getValue () === "";
    },
-   set: function (value)
+   set (value)
    {
-      X3DField .prototype .set .call (this, "" + value);
+      X3DField .prototype .set .call (this, String (value));
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (generator)
+   toStream (generator)
    {
       generator .string += '"';
       generator .string += SFString .escape (this .getValue ());
       generator .string += '"';
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       this .toStream (generator);
    },
-   toXMLStream: function (generator, sourceText)
+   toXMLStream (generator, sourceText = false)
    {
       generator .string += sourceText
          ? generator .XMLEncodeSourceText (this .getValue ())
          : generator .XMLEncode (this .getValue ());
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       this .toJSONStreamValue (generator)
    },
-   toJSONStreamValue: function (generator)
+   toJSONStreamValue (generator)
    {
       generator .string += '"';
       generator .string += generator .JSONEncode (this .getValue ());
@@ -126,10 +104,31 @@ for (const key of Reflect .ownKeys (SFString .prototype))
 
 Object .defineProperty (SFString .prototype, "length",
 {
-   get: function ()
+   get ()
    {
       return this .getValue () .length;
    },
 });
 
+Object .defineProperties (SFString,
+{
+   typeName:
+   {
+      value: "SFString",
+      enumerable: true,
+   },
+});
+
+Object .assign (SFString,
+{
+   unescape (string)
+   {
+      return string .replace (/\\([\\"])/g, "$1");
+   },
+   escape (string)
+   {
+      return string .replace (/([\\"])/g, "\\$1");
+   },
+});
+
 export default SFString;

package/src/x_ite/Fields/SFTime.js

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

package/src/x_ite/Fields/SFVec2.js

@@ -47,39 +47,42 @@
 
 import X3DField               from "../Base/X3DField.js";
 import SFVecPrototypeTemplate from "./SFVecPrototypeTemplate.js";
-import X3DConstants           from "../Base/X3DConstants.js";
 import Vector2                from "../../standard/Math/Numbers/Vector2.js";
 
-function SFVec2Template (TypeName, Type, double)
+function SFVec2Template (TypeName, double)
 {
    function SFVec2 (x, y)
    {
       switch (arguments .length)
       {
          case 0:
-            return X3DField .call (this, new Vector2 (0, 0));
+            X3DField .call (this, new Vector2 (0, 0));
+            break;
 
          case 1:
-            return X3DField .call (this, arguments [0]);
+            X3DField .call (this, arguments [0]);
+            break;
 
          case 2:
-            return X3DField .call (this, new Vector2 (+x, +y));
-      }
+            X3DField .call (this, new Vector2 (+x, +y));
+            break;
 
-      throw new Error ("Invalid arguments.");
+         default:
+            throw new Error ("Invalid arguments.");
+      }
    }
 
-   SFVec2 .prototype = SFVecPrototypeTemplate (SFVec2, TypeName, Type, Vector2, double);
+   SFVecPrototypeTemplate (SFVec2, TypeName, Vector2, double);
 
    for (const key of Reflect .ownKeys (SFVec2 .prototype))
       Object .defineProperty (SFVec2 .prototype, key, { enumerable: false });
 
    const x = {
-      get: function ()
+      get ()
       {
          return this .getValue () .x;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .x = +value;
          this .addEvent ();
@@ -87,11 +90,11 @@ function SFVec2Template (TypeName, Type, double)
    };
 
    const y = {
-      get: function ()
+      get ()
       {
          return this .getValue () .y;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .y = +value;
          this .addEvent ();
@@ -110,8 +113,8 @@ function SFVec2Template (TypeName, Type, double)
 }
 
 const SFVec2 = {
-   SFVec2d: SFVec2Template ("SFVec2d", X3DConstants .SFVec2d, true),
-   SFVec2f: SFVec2Template ("SFVec2f", X3DConstants .SFVec2f, false),
+   SFVec2d: SFVec2Template ("SFVec2d", true),
+   SFVec2f: SFVec2Template ("SFVec2f", false),
 };
 
 export default SFVec2;

package/src/x_ite/Fields/SFVec3.js

@@ -47,31 +47,34 @@
 
 import X3DField               from "../Base/X3DField.js";
 import SFVecPrototypeTemplate from "./SFVecPrototypeTemplate.js";
-import X3DConstants           from "../Base/X3DConstants.js";
 import Vector3                from "../../standard/Math/Numbers/Vector3.js";
 
-function SFVec3Template (TypeName, Type, double)
+function SFVec3Template (TypeName, double)
 {
    function SFVec3 (x, y, z)
    {
       switch (arguments .length)
       {
          case 0:
-            return X3DField .call (this, new Vector3 (0, 0, 0));
+            X3DField .call (this, new Vector3 (0, 0, 0));
+            break;
 
          case 1:
-            return X3DField .call (this, arguments [0]);
+            X3DField .call (this, arguments [0]);
+            break;
 
          case 3:
-            return X3DField .call (this, new Vector3 (+x, +y, +z));
-      }
+            X3DField .call (this, new Vector3 (+x, +y, +z));
+            break;
 
-      throw new Error ("Invalid arguments.");
+         default:
+            throw new Error ("Invalid arguments.");
+      }
    }
 
-   SFVec3 .prototype = Object .assign (SFVecPrototypeTemplate (SFVec3, TypeName, Type, Vector3, double),
+   Object .assign (SFVecPrototypeTemplate (SFVec3, TypeName, Vector3, double),
    {
-      cross: function (vector)
+      cross (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .cross (vector .getValue ()));
       },
@@ -81,11 +84,11 @@ function SFVec3Template (TypeName, Type, double)
       Object .defineProperty (SFVec3 .prototype, key, { enumerable: false });
 
    const x = {
-      get: function ()
+      get ()
       {
          return this .getValue () .x;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .x = +value;
          this .addEvent ();
@@ -93,11 +96,11 @@ function SFVec3Template (TypeName, Type, double)
    };
 
    const y = {
-      get: function ()
+      get ()
       {
          return this .getValue () .y;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .y = +value;
          this .addEvent ();
@@ -105,11 +108,11 @@ function SFVec3Template (TypeName, Type, double)
    };
 
    const z = {
-      get: function ()
+      get ()
       {
          return this .getValue () .z;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .z = +value;
          this .addEvent ();
@@ -130,8 +133,8 @@ function SFVec3Template (TypeName, Type, double)
 }
 
 const SFVec3 = {
-   SFVec3d: SFVec3Template ("SFVec3d", X3DConstants .SFVec3d, true),
-   SFVec3f: SFVec3Template ("SFVec3f", X3DConstants .SFVec3f, false),
+   SFVec3d: SFVec3Template ("SFVec3d", true),
+   SFVec3f: SFVec3Template ("SFVec3f", false),
 };
 
 export default SFVec3;

package/src/x_ite/Fields/SFVec4.js

@@ -47,39 +47,42 @@
 
 import X3DField               from "../Base/X3DField.js";
 import SFVecPrototypeTemplate from "./SFVecPrototypeTemplate.js";
-import X3DConstants           from "../Base/X3DConstants.js";
 import Vector4                from "../../standard/Math/Numbers/Vector4.js";
 
-function SFVec4Template (TypeName, Type, double)
+function SFVec4Template (TypeName, double)
 {
    function SFVec4 (x, y, z, w)
    {
       switch (arguments .length)
       {
          case 0:
-            return X3DField .call (this, new Vector4 (0, 0, 0, 0));
+            X3DField .call (this, new Vector4 (0, 0, 0, 0));
+            break;
 
          case 1:
-            return X3DField .call (this, arguments [0]);
+            X3DField .call (this, arguments [0]);
+            break;
 
          case 4:
-            return X3DField .call (this, new Vector4 (+x, +y, +z, +w));
-      }
+            X3DField .call (this, new Vector4 (+x, +y, +z, +w));
+            break;
 
-      throw new Error ("Invalid arguments.");
+         default:
+            throw new Error ("Invalid arguments.");
+      }
    }
 
-   SFVec4 .prototype = SFVecPrototypeTemplate (SFVec4, TypeName, Type, Vector4, double);
+   SFVecPrototypeTemplate (SFVec4, TypeName, Vector4, double);
 
    for (const key of Reflect .ownKeys (SFVec4 .prototype))
       Object .defineProperty (SFVec4 .prototype, key, { enumerable: false });
 
    const x = {
-      get: function ()
+      get ()
       {
          return this .getValue () .x;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .x = +value;
          this .addEvent ();
@@ -87,11 +90,11 @@ function SFVec4Template (TypeName, Type, double)
    };
 
    const y = {
-      get: function ()
+      get ()
       {
          return this .getValue () .y;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .y = +value;
          this .addEvent ();
@@ -99,11 +102,11 @@ function SFVec4Template (TypeName, Type, double)
    };
 
    const z = {
-      get: function ()
+      get ()
       {
          return this .getValue () .z;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .z = +value;
          this .addEvent ();
@@ -111,11 +114,11 @@ function SFVec4Template (TypeName, Type, double)
    };
 
    const w = {
-      get: function ()
+      get ()
       {
          return this .getValue () .w;
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .w = +value;
          this .addEvent ();
@@ -138,8 +141,8 @@ function SFVec4Template (TypeName, Type, double)
 }
 
 const SFVec4 = {
-   SFVec4d: SFVec4Template ("SFVec4d", X3DConstants .SFVec4d, true),
-   SFVec4f: SFVec4Template ("SFVec4f", X3DConstants .SFVec4f, false),
+   SFVec4d: SFVec4Template ("SFVec4d", true),
+   SFVec4f: SFVec4Template ("SFVec4f", false),
 };
 
 export default SFVec4;

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -47,106 +47,106 @@
 
 import X3DField from "../Base/X3DField.js";
 
-function SFVecPrototypeTemplate (Constructor, TypeName, Type, Vector, double)
+function SFVecPrototypeTemplate (Constructor, TypeName, Vector, 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 (vector)
+      equals (vector)
       {
          return this .getValue () .equals (vector .getValue ());
       },
-      isDefaultValue: function ()
+      isDefaultValue ()
       {
          return this .getValue () .equals (Vector .Zero);
       },
-      set: function (value)
+      set (value)
       {
          this .getValue () .assign (value);
       },
-      abs: function ()
+      abs ()
       {
          return new (this .constructor) (this .getValue () .copy () .abs ());
       },
-      add: function (vector)
+      add (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .add (vector .getValue ()));
       },
-      distance: function (vector)
+      distance (vector)
       {
          return this .getValue () .distance (vector .getValue ());
       },
-      divide: function (value)
+      divide (value)
       {
          return new (this .constructor) (this .getValue () .copy () .divide (value));
       },
-      divVec: function (vector)
+      divVec (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .divVec (vector .getValue ()));
       },
-      dot: function (vector)
+      dot (vector)
       {
          return this .getValue () .dot (vector .getValue ());
       },
-      inverse: function ()
+      inverse ()
       {
          return new (this .constructor) (this .getValue () .copy () .inverse ());
       },
-      length: function ()
+      length ()
       {
          return this .getValue () .magnitude ();
       },
-      lerp: function (destination, t)
+      lerp (destination, t)
       {
          return new (this .constructor) (this .getValue () .copy () .lerp (destination, t));
       },
-      max: function (vector)
+      max (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .max (vector .getValue ()));
       },
-      min: function (vector)
+      min (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .min (vector .getValue ()));
       },
-      multiply: function (value)
+      multiply (value)
       {
          return new (this .constructor) (this .getValue () .copy () .multiply (value));
       },
-      multVec: function (vector)
+      multVec (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .multVec (vector .getValue ()));
       },
-      negate: function ()
+      negate ()
       {
          return new (this .constructor) (this .getValue () .copy () .negate ());
       },
-      normalize: function (vector)
+      normalize (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .normalize ());
       },
-      subtract: function (vector)
+      subtract (vector)
       {
          return new (this .constructor) (this .getValue () .copy () .subtract (vector .getValue ()));
       },
-      toStream: function (generator)
+      toStream (generator)
       {
          const
             value    = this .getValue (),
@@ -161,15 +161,15 @@ function SFVecPrototypeTemplate (Constructor, TypeName, Type, Vector, double)
 
          generator .string += generator [_formatter] (generator .ToUnit (category, 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 ();
@@ -179,7 +179,7 @@ function SFVecPrototypeTemplate (Constructor, TypeName, Type, Vector, double)
          generator .string += generator .TidySpace ();
          generator .string += ']';
       },
-      toJSONStreamValue: function (generator)
+      toJSONStreamValue (generator)
       {
          const
             value    = this .getValue (),

package/src/x_ite/Fields.js

@@ -71,24 +71,17 @@ const Fields = {
    SFFloat:     SFFloat,
    SFImage:     SFImage,
    SFInt32:     SFInt32,
-   SFMatrix3d:  SFMatrix3 .SFMatrix3d,
-   SFMatrix3f:  SFMatrix3 .SFMatrix3f,
-   SFMatrix4d:  SFMatrix4 .SFMatrix4d,
-   SFMatrix4f:  SFMatrix4 .SFMatrix4f,
+   ... SFMatrix3,
+   ... SFMatrix4,
    SFNode:      SFNode,
    SFRotation:  SFRotation,
    SFString:    SFString,
    SFTime:      SFTime,
-   SFVec2d:     SFVec2 .SFVec2d,
-   SFVec2f:     SFVec2 .SFVec2f,
-   SFVec3d:     SFVec3 .SFVec3d,
-   SFVec3f:     SFVec3 .SFVec3f,
-   SFVec4d:     SFVec4 .SFVec4d,
-   SFVec4f:     SFVec4 .SFVec4f,
+   ... SFVec2,
+   ... SFVec3,
+   ... SFVec4,
 
-   VrmlMatrix:  SFMatrix4 .VrmlMatrix,
-
-   ... ArrayFields
+   ... ArrayFields,
 };
 
 export default Fields;