x_ite 8.7.8 → 8.8.0

package/src/x_ite/Execution/X3DWorld.js

@@ -45,7 +45,7 @@
  *
  ******************************************************************************/
 
-import SupportedNodes from "../Configuration/SupportedNodes.js";
+import AbstractNodes  from "../Configuration/AbstractNodes.js";
 import SFNode         from "../Fields/SFNode.js";
 import X3DBaseNode    from "../Base/X3DBaseNode.js";
 import LayerSet       from "../Components/Layering/LayerSet.js";
@@ -53,8 +53,6 @@ import Layer          from "../Components/Layering/Layer.js";
 import X3DCast        from "../Base/X3DCast.js";
 import X3DConstants   from "../Base/X3DConstants.js";
 
-SupportedNodes .addAbstractType ("X3DWorld", X3DWorld);
-
 function X3DWorld (executionContext)
 {
    X3DBaseNode .call (this, executionContext);
@@ -68,14 +66,9 @@ function X3DWorld (executionContext)
    this .layer0          = new Layer (executionContext);
 }
 
-X3DWorld .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
+Object .assign (Object .setPrototypeOf (X3DWorld .prototype, X3DBaseNode .prototype),
 {
-   constructor: X3DWorld,
-   getTypeName: function ()
-   {
-      return "X3DWorld";
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DBaseNode .prototype .initialize .call (this);
 
@@ -94,19 +87,19 @@ X3DWorld .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       this .set_activeLayer__ ();
    },
-   getCache: function ()
+   getCache ()
    {
       return this .getBrowser () .getBrowserOption ("Cache");
    },
-   getLayerSet: function ()
+   getLayerSet ()
    {
       return this .layerSet;
    },
-   getActiveLayer: function ()
+   getActiveLayer ()
    {
       return this ._activeLayer .getValue ();
    },
-   set_rootNodes__: function ()
+   set_rootNodes__ ()
    {
       const
          oldLayerSet = this .layerSet,
@@ -133,11 +126,11 @@ X3DWorld .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       this .set_activeLayer__ ();
    },
-   set_activeLayer__: function ()
+   set_activeLayer__ ()
    {
       this ._activeLayer = this .layerSet .getActiveLayer ();
    },
-   bindBindables: function ()
+   bindBindables ()
    {
       // Bind first X3DBindableNodes found in each layer.
 
@@ -145,7 +138,7 @@ X3DWorld .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       this .layerSet .bindBindables (decodeURIComponent (new URL (worldURL, worldURL) .hash .substr (1)));
    },
-   traverse: function (type, renderObject)
+   traverse (type, renderObject)
    {
       this .layerSet .traverse (type, renderObject);
    },
@@ -154,4 +147,15 @@ X3DWorld .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 for (const key of Reflect .ownKeys (X3DWorld .prototype))
    Object .defineProperty (X3DWorld .prototype, key, { enumerable: false });
 
+Object .defineProperties (X3DWorld,
+{
+   typeName:
+   {
+      value: "X3DWorld",
+      enumerable: true,
+   },
+});
+
+X3DConstants .addNode (X3DWorld);
+
 export default X3DWorld;

package/src/x_ite/Fields/ArrayFields.js

@@ -63,7 +63,6 @@ import SFVec3              from "./SFVec3.js";
 import SFVec4              from "./SFVec4.js";
 import X3DObjectArrayField from "../Base/X3DObjectArrayField.js";
 import X3DTypedArrayField  from "../Base/X3DTypedArrayField.js";
-import X3DConstants        from "../Base/X3DConstants.js";
 
 const
    SFMatrix3d = SFMatrix3 .SFMatrix3d,
@@ -88,35 +87,14 @@ function MFNode (... args)
    return X3DObjectArrayField .call (this, args);
 }
 
-MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
+Object .assign (Object .setPrototypeOf (MFNode .prototype, X3DObjectArrayField .prototype),
 {
-   constructor: MFNode,
    [_cloneCount]: 0,
-   getSingleType: function ()
+   getSingleType ()
    {
       return SFNode;
    },
-   getValueType: function ()
-   {
-      return SFNode;
-   },
-   getArrayType: function ()
-   {
-      return Array;
-   },
-   getComponents: function ()
-   {
-      return 1;
-   },
-   getTypeName: function ()
-   {
-      return "MFNode";
-   },
-   getType: function ()
-   {
-      return X3DConstants .MFNode;
-   },
-   copy: function (instance)
+   copy (instance)
    {
       if (instance)
       {
@@ -134,7 +112,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
          return X3DObjectArrayField .prototype .copy .call (this);
       }
    },
-   addCloneCount: function (count)
+   addCloneCount (count)
    {
       const target = this .getTarget ();
 
@@ -143,7 +121,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
       for (const element of target .getValue ())
          element .addCloneCount (count);
    },
-   removeCloneCount: function (count)
+   removeCloneCount (count)
    {
       const target = this .getTarget ();
 
@@ -152,7 +130,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
       for (const element of target .getValue ())
          element .removeCloneCount (count);
    },
-   addChildObject: function (value)
+   addChildObject (value)
    {
       const target = this .getTarget ();
 
@@ -160,7 +138,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
       value .addCloneCount (target [_cloneCount]);
    },
-   removeChildObject: function (value)
+   removeChildObject (value)
    {
       const target = this .getTarget ();
 
@@ -168,7 +146,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
       value .removeCloneCount (target [_cloneCount]);
    },
-   toStream: function (generator)
+   toStream (generator)
    {
       const
          target = this .getTarget (),
@@ -216,19 +194,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
          }
       }
    },
-   toVRMLString: function ()
-   {
-      const target = this .getTarget ();
-
-      target .addCloneCount (1);
-
-      const string = X3DObjectArrayField .prototype .toVRMLString .call (target);
-
-      target .removeCloneCount (1);
-
-      return string;
-   },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       const
          target = this .getTarget (),
@@ -276,19 +242,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
          }
       }
    },
-   toXMLString: function ()
-   {
-      const target = this .getTarget ();
-
-      target .addCloneCount (1);
-
-      const string = X3DObjectArrayField .prototype .toXMLString .call (target);
-
-      target .removeCloneCount (1);
-
-      return string;
-   },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       const
          target = this .getTarget (),
@@ -355,7 +309,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
          generator .LeaveScope ();
       }
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       const
          target = this .getTarget (),
@@ -405,7 +359,7 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 			generator .string += ']';
       }
    },
-   dispose: function ()
+   dispose ()
    {
       const target = this .getTarget ();
 
@@ -419,39 +373,27 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 for (const key of Reflect .ownKeys (MFNode .prototype))
    Object .defineProperty (MFNode .prototype, key, { enumerable: false });
 
+Object .defineProperties (MFNode,
+{
+   typeName:
+   {
+      value: "MFNode",
+      enumerable: true,
+   },
+});
+
 function MFString (... args)
 {
    return X3DObjectArrayField .call (this, args);
 }
 
-MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
+Object .assign (Object .setPrototypeOf (MFString .prototype, X3DObjectArrayField .prototype),
 {
-   constructor: MFString,
-   getValueType: function ()
-   {
-      return String;
-   },
-   getSingleType: function ()
+   getSingleType ()
    {
       return SFString;
    },
-   getArrayType: function ()
-   {
-      return Array;
-   },
-   getComponents: function ()
-   {
-      return 1;
-   },
-   getTypeName: function ()
-   {
-      return "MFString";
-   },
-   getType: function ()
-   {
-      return X3DConstants .MFString;
-   },
-   toXMLStream: function (generator, sourceText)
+   toXMLStream (generator, sourceText = false)
    {
       const
          target = this .getTarget (),
@@ -480,119 +422,111 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
 for (const key of Reflect .ownKeys (MFString .prototype))
    Object .defineProperty (MFString .prototype, key, { enumerable: false });
 
+Object .defineProperties (MFString,
+{
+   typeName:
+   {
+      value: "MFString",
+      enumerable: true,
+   },
+});
+
 /**
  * MFImage
  */
 
-function MFImageTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
+function MFImage (... args)
 {
-   function ArrayField (... args)
-   {
-      return X3DObjectArrayField .call (this, args);
-   }
+   return X3DObjectArrayField .call (this, args);
+}
 
-   ArrayField .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
+Object .assign (Object .setPrototypeOf (MFImage .prototype, X3DObjectArrayField .prototype),
+{
+   getSingleType ()
    {
-      constructor: ArrayField,
-      getSingleType: function ()
-      {
-         return SFImage;
-      },
-      getValueType: function ()
-      {
-         return SFImage;
-      },
-      getArrayType: function ()
-      {
-         return ArrayType;
-      },
-      getComponents: function ()
-      {
-         return Components;
-      },
-      getTypeName: function ()
-      {
-         return TypeName;
-      },
-      getType: function ()
-      {
-         return Type;
-      },
-   });
+      return SFImage;
+   },
+});
 
-   for (const key of Reflect .ownKeys (ArrayField .prototype))
-      Object .defineProperty (ArrayField .prototype, key, { enumerable: false });
+for (const key of Reflect .ownKeys (MFImage .prototype))
+   Object .defineProperty (MFImage .prototype, key, { enumerable: false });
 
-   return ArrayField;
-}
+Object .defineProperties (MFImage,
+{
+   typeName:
+   {
+      value: "MFImage",
+      enumerable: true,
+   },
+});
 
-function TypedArrayTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
+function TypedArrayTemplate (TypeName, SingleType, ValueType, ArrayType, Components)
 {
    function ArrayField (... args)
    {
       return X3DTypedArrayField .call (this, args);
    }
 
-   ArrayField .prototype = Object .assign (Object .create (X3DTypedArrayField .prototype),
+   Object .assign (Object .setPrototypeOf (ArrayField .prototype, X3DTypedArrayField .prototype),
    {
-      constructor: ArrayField,
-      getSingleType: function ()
+      getSingleType ()
       {
          return SingleType;
       },
-      getValueType: function ()
+      getValueType ()
       {
          return ValueType;
       },
-      getArrayType: function ()
+      getArrayType ()
       {
          return ArrayType;
       },
-      getComponents: function ()
+      getComponents ()
       {
          return Components;
       },
-      getTypeName: function ()
-      {
-         return TypeName;
-      },
-      getType: function ()
-      {
-         return Type;
-      },
    });
 
    for (const key of Reflect .ownKeys (ArrayField .prototype))
       Object .defineProperty (ArrayField .prototype, key, { enumerable: false });
 
+   Object .defineProperties (ArrayField,
+   {
+      typeName:
+      {
+         value: TypeName,
+         enumerable: true,
+      },
+   });
+
    return ArrayField;
 }
 
-const Value = (value) => value;
+const Value = value => value;
 
 const ArrayFields =
 {
-   MFBool:      TypedArrayTemplate ("MFBool",      X3DConstants .MFBool,      SFBool,      Boolean,     Uint8Array,   1),
-   MFColor:     TypedArrayTemplate ("MFColor",     X3DConstants .MFColor,     SFColor,     SFColor,     Float32Array, 3),
-   MFColorRGBA: TypedArrayTemplate ("MFColorRGBA", X3DConstants .MFColorRGBA, SFColorRGBA, SFColorRGBA, Float32Array, 4),
-   MFDouble:    TypedArrayTemplate ("MFDouble",    X3DConstants .MFDouble,    SFDouble,    Value,       Float64Array, 1),
-   MFFloat:     TypedArrayTemplate ("MFFloat",     X3DConstants .MFFloat,     SFFloat,     Value,       Float32Array, 1),
-   MFImage:     MFImageTemplate    ("MFImage",     X3DConstants .MFImage,     undefined,   undefined,   Array,        1),
-   MFInt32:     TypedArrayTemplate ("MFInt32",     X3DConstants .MFInt32,     SFInt32,     Value,       Int32Array,   1),
-   MFMatrix3d:  TypedArrayTemplate ("MFMatrix3d",  X3DConstants .MFMatrix3d,  SFMatrix3d,  SFMatrix3d,  Float64Array, 9),
-   MFMatrix3f:  TypedArrayTemplate ("MFMatrix3f",  X3DConstants .MFMatrix3f,  SFMatrix3f,  SFMatrix3f,  Float32Array, 9),
-   MFMatrix4d:  TypedArrayTemplate ("MFMatrix4d",  X3DConstants .MFMatrix4d,  SFMatrix4d,  SFMatrix4d,  Float64Array, 16),
-   MFMatrix4f:  TypedArrayTemplate ("MFMatrix4f",  X3DConstants .MFMatrix4f,  SFMatrix4f,  SFMatrix4f,  Float32Array, 16),
+   MFBool:      TypedArrayTemplate ("MFBool",      SFBool,      Boolean,     Uint8Array,   1),
+   MFColor:     TypedArrayTemplate ("MFColor",     SFColor,     SFColor,     Float32Array, 3),
+   MFColorRGBA: TypedArrayTemplate ("MFColorRGBA", SFColorRGBA, SFColorRGBA, Float32Array, 4),
+   MFDouble:    TypedArrayTemplate ("MFDouble",    SFDouble,    Value,       Float64Array, 1),
+   MFFloat:     TypedArrayTemplate ("MFFloat",     SFFloat,     Value,       Float32Array, 1),
+   MFImage:     MFImage,
+   MFInt32:     TypedArrayTemplate ("MFInt32",     SFInt32,     Value,       Int32Array,   1),
+   MFMatrix3d:  TypedArrayTemplate ("MFMatrix3d",  SFMatrix3d,  SFMatrix3d,  Float64Array, 9),
+   MFMatrix3f:  TypedArrayTemplate ("MFMatrix3f",  SFMatrix3f,  SFMatrix3f,  Float32Array, 9),
+   MFMatrix4d:  TypedArrayTemplate ("MFMatrix4d",  SFMatrix4d,  SFMatrix4d,  Float64Array, 16),
+   MFMatrix4f:  TypedArrayTemplate ("MFMatrix4f",  SFMatrix4f,  SFMatrix4f,  Float32Array, 16),
    MFNode:      MFNode,
-   MFRotation:  TypedArrayTemplate ("MFRotation",  X3DConstants .MFRotation,  SFRotation,  SFRotation,  Float64Array, 4),
+   MFRotation:  TypedArrayTemplate ("MFRotation",  SFRotation,  SFRotation,  Float64Array, 4),
    MFString:    MFString,
-   MFTime:      TypedArrayTemplate ("MFTime",      X3DConstants .MFTime,      SFTime,      Value,       Float64Array, 1),
-   MFVec2d:     TypedArrayTemplate ("MFVec2d",     X3DConstants .MFVec2d,     SFVec2d,     SFVec2d,     Float64Array, 2),
-   MFVec2f:     TypedArrayTemplate ("MFVec2f",     X3DConstants .MFVec2f,     SFVec2f,     SFVec2f,     Float32Array, 2),
-   MFVec3d:     TypedArrayTemplate ("MFVec3d",     X3DConstants .MFVec3d,     SFVec3d,     SFVec3d,     Float64Array, 3),
-   MFVec3f:     TypedArrayTemplate ("MFVec3f",     X3DConstants .MFVec3f,     SFVec3f,     SFVec3f,     Float32Array, 3),
-   MFVec4d:     TypedArrayTemplate ("MFVec4d",     X3DConstants .MFVec4d,     SFVec4d,     SFVec4d,     Float64Array, 4),
-   MFVec4f:     TypedArrayTemplate ("MFVec4f",     X3DConstants .MFVec4f,     SFVec4f,     SFVec4f,     Float32Array, 4),
+   MFTime:      TypedArrayTemplate ("MFTime",      SFTime,      Value,       Float64Array, 1),
+   MFVec2d:     TypedArrayTemplate ("MFVec2d",     SFVec2d,     SFVec2d,     Float64Array, 2),
+   MFVec2f:     TypedArrayTemplate ("MFVec2f",     SFVec2f,     SFVec2f,     Float32Array, 2),
+   MFVec3d:     TypedArrayTemplate ("MFVec3d",     SFVec3d,     SFVec3d,     Float64Array, 3),
+   MFVec3f:     TypedArrayTemplate ("MFVec3f",     SFVec3f,     SFVec3f,     Float32Array, 3),
+   MFVec4d:     TypedArrayTemplate ("MFVec4d",     SFVec4d,     SFVec4d,     Float64Array, 4),
+   MFVec4f:     TypedArrayTemplate ("MFVec4f",     SFVec4f,     SFVec4f,     Float32Array, 4),
 };
 
 export default ArrayFields;

package/src/x_ite/Fields/SFBool.js

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