x_ite 8.7.8 → 8.8.0

package/src/x_ite/Components/Layering/Viewport.js

@@ -66,37 +66,9 @@ function Viewport (executionContext)
    this .rectangle = new Vector4 (0, 0, 0, 0);
 }
 
-Viewport .prototype = Object .assign (Object .create (X3DViewportNode .prototype),
+Object .assign (Object .setPrototypeOf (Viewport .prototype, X3DViewportNode .prototype),
 {
-   constructor: Viewport,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",       new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "clipBoundary",   new Fields .MFFloat (0, 1, 0, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",        new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay",    new Fields .SFBool ()),
-      new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",       new Fields .SFVec3f (-1, -1, -1)),
-      new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",     new Fields .SFVec3f ()),
-      new X3DFieldDefinition (X3DConstants .inputOnly,      "addChildren",    new Fields .MFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOnly,      "removeChildren", new Fields .MFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "children",       new Fields .MFNode ()),
-   ]),
-   getTypeName: function ()
-   {
-      return "Viewport";
-   },
-   getComponentName: function ()
-   {
-      return "Layering";
-   },
-   getContainerField: function ()
-   {
-      return "viewport";
-   },
-   getSpecificationRange: function ()
-   {
-      return ["3.2", "Infinity"];
-   },
-   getRectangle: function ()
+   getRectangle ()
    {
       const
          viewport = this .getBrowser () .getViewport (),
@@ -112,23 +84,23 @@ Viewport .prototype = Object .assign (Object .create (X3DViewportNode .prototype
 
       return this .rectangle;
    },
-   getLeft: function ()
+   getLeft ()
    {
       return this ._clipBoundary .length > 0 ? this ._clipBoundary [0] : 0;
    },
-   getRight: function ()
+   getRight ()
    {
       return this ._clipBoundary .length > 1 ? this ._clipBoundary [1] : 1;
    },
-   getBottom: function ()
+   getBottom ()
    {
       return this ._clipBoundary .length > 2 ? this ._clipBoundary [2] : 0;
    },
-   getTop: function ()
+   getTop ()
    {
       return this ._clipBoundary .length > 3 ? this ._clipBoundary [3] : 1;
    },
-   traverse: function (type, renderObject)
+   traverse (type, renderObject)
    {
       this .push (renderObject);
 
@@ -148,7 +120,7 @@ Viewport .prototype = Object .assign (Object .create (X3DViewportNode .prototype
 
       this .pop (renderObject);
    },
-   push: function (renderObject)
+   push (renderObject)
    {
       const
          viewVolumes = renderObject .getViewVolumes (),
@@ -160,10 +132,49 @@ Viewport .prototype = Object .assign (Object .create (X3DViewportNode .prototype
 
       viewVolumes .push (viewVolume);
    },
-   pop: function (renderObject)
+   pop (renderObject)
    {
       ViewVolumes .push (renderObject .getViewVolumes () .pop ());
    },
 });
 
+Object .defineProperties (Viewport,
+{
+   typeName:
+   {
+      value: "Viewport",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Layering",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "viewport",
+      enumerable: true,
+   },
+   specificationRange:
+   {
+      value: Object .freeze (["3.2", "Infinity"]),
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",       new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "clipBoundary",   new Fields .MFFloat (0, 1, 0, 1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",        new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay",    new Fields .SFBool ()),
+         new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",       new Fields .SFVec3f (-1, -1, -1)),
+         new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",     new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOnly,      "addChildren",    new Fields .MFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOnly,      "removeChildren", new Fields .MFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "children",       new Fields .MFNode ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default Viewport;

package/src/x_ite/Components/Layering/X3DLayerNode.js

@@ -91,12 +91,11 @@ function X3DLayerNode (executionContext, defaultViewpoint, groupNode)
    this .defaultFog        .setHidden (true);
 }
 
-X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
+Object .assign (Object .setPrototypeOf (X3DLayerNode .prototype, X3DNode .prototype),
    X3DRenderObject .prototype,
 {
-   constructor: X3DLayerNode,
    layer0: false,
-   initialize: function ()
+   initialize ()
    {
       X3DNode         .prototype .initialize .call (this);
       X3DRenderObject .prototype .initialize .call (this);
@@ -120,64 +119,64 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 
       this .set_viewport__ ();
    },
-   isLayer0: function (value)
+   isLayer0 (value)
    {
       this .layer0 = value;
       this .defaultBackground .setHidden (! value);
    },
-   getLayer: function ()
+   getLayer ()
    {
       return this;
    },
-   getBBox: function (bbox, shadows)
+   getBBox (bbox, shadows)
    {
       return this .groupNode .getBBox (bbox, shadows);
    },
-   getGroup: function ()
+   getGroup ()
    {
       return this .groupNode;
    },
-   setGroup: function (groupNode)
+   setGroup (groupNode)
    {
       this .groupNode = groupNode;
    },
-   getViewport: function ()
+   getViewport ()
    {
       return this .viewportNode;
    },
-   getBackground: function ()
+   getBackground ()
    {
       return this .backgroundStack .top ();
    },
-   getFog: function ()
+   getFog ()
    {
       return this .fogStack .top ();
    },
-   getNavigationInfo: function ()
+   getNavigationInfo ()
    {
       return this .navigationInfoStack .top ();
    },
-   getViewpoint: function ()
+   getViewpoint ()
    {
       return this .viewpointStack .top ();
    },
-   getBackgrounds: function ()
+   getBackgrounds ()
    {
       return this .backgrounds;
    },
-   getFogs: function ()
+   getFogs ()
    {
       return this .fogs;
    },
-   getNavigationInfos: function ()
+   getNavigationInfos ()
    {
       return this .navigationInfos;
    },
-   getViewpoints: function ()
+   getViewpoints ()
    {
       return this .viewpoints;
    },
-   getUserViewpoints: function ()
+   getUserViewpoints ()
    {
       const userViewpoints = [ ];
 
@@ -189,27 +188,27 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 
       return userViewpoints;
    },
-   getBackgroundStack: function ()
+   getBackgroundStack ()
    {
       return this .backgroundStack;
    },
-   getFogStack: function ()
+   getFogStack ()
    {
       return this .fogStack;
    },
-   getNavigationInfoStack: function ()
+   getNavigationInfoStack ()
    {
       return this .navigationInfoStack;
    },
-   getViewpointStack: function ()
+   getViewpointStack ()
    {
       return this .viewpointStack;
    },
-   getCollisionTime: function ()
+   getCollisionTime ()
    {
       return this .collisionTime;
    },
-   viewAll: function (factor = 1, straighten = false)
+   viewAll (factor = 1, straighten = false)
    {
       const
          viewpointNode = this .getViewpoint (),
@@ -217,18 +216,18 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 
       viewpointNode .lookAt (this, bbox .center, viewpointNode .getLookAtDistance (bbox), factor, straighten);
    },
-   straightenView: function ()
+   straightenView ()
    {
       this .getViewpoint () .straightenView (this);
    },
-   set_viewport__: function ()
+   set_viewport__ ()
    {
       this .viewportNode = X3DCast (X3DConstants .X3DViewportNode, this ._viewport);
 
       if (! this .viewportNode)
          this .viewportNode = this .getBrowser () .getDefaultViewport ();
    },
-   bindBindables: function (viewpointName)
+   bindBindables (viewpointName)
    {
       this .traverse (TraverseType .CAMERA, this);
 
@@ -250,7 +249,7 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
       if (viewpointNode ._viewAll .getValue ())
          viewpointNode .viewAll (this .getBBox (new Box3 ()));
    },
-   traverse: function (type, renderObject = this)
+   traverse (type, renderObject = this)
    {
       const viewpointNode = this .getViewpoint ();
 
@@ -282,7 +281,7 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
       this .getCameraSpaceMatrix () .pop ();
       this .getProjectionMatrix ()  .pop ();
    },
-   pointer: function (type, renderObject)
+   pointer (type, renderObject)
    {
       const
          browser  = this .getBrowser (),
@@ -309,7 +308,7 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 
       this .getModelViewMatrix () .pop ();
    },
-   camera: function (type, renderObject)
+   camera (type, renderObject)
    {
       if (this ._visible .getValue ())
       {
@@ -329,7 +328,7 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
          this .getViewpoint () .update ();
       }
    },
-   picking: function (type, renderObject)
+   picking (type, renderObject)
    {
       if (this ._pickable .getValue ())
       {
@@ -375,7 +374,7 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
          }
       };
    })(),
-   display: function (type, renderObject)
+   display (type, renderObject)
    {
       if (this ._visible .getValue ())
       {
@@ -391,4 +390,18 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
    },
 });
 
+Object .defineProperties (X3DLayerNode,
+{
+   typeName:
+   {
+      value: "X3DLayerNode",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Layering",
+      enumerable: true,
+   },
+});
+
 export default X3DLayerNode;

package/src/x_ite/Components/Layering/X3DViewportNode.js

@@ -55,9 +55,20 @@ function X3DViewportNode (executionContext)
    this .addType (X3DConstants .X3DViewportNode);
 }
 
-X3DViewportNode .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
+Object .setPrototypeOf (X3DViewportNode .prototype, X3DGroupingNode .prototype);
+
+Object .defineProperties (X3DViewportNode,
 {
-   constructor: X3DViewportNode,
+   typeName:
+   {
+      value: "X3DViewportNode",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Layering",
+      enumerable: true,
+   },
 });
 
 export default X3DViewportNode;

package/src/x_ite/Components/Layering.js

@@ -45,30 +45,23 @@
  *
  ******************************************************************************/
 
-import SupportedNodes  from "../Configuration/SupportedNodes.js";
 import Layer           from "./Layering/Layer.js";
 import LayerSet        from "./Layering/LayerSet.js";
 import Viewport        from "./Layering/Viewport.js";
 import X3DLayerNode    from "./Layering/X3DLayerNode.js";
 import X3DViewportNode from "./Layering/X3DViewportNode.js";
 
-const Types =
-{
-   Layer:    Layer,
-   LayerSet: LayerSet,
-   Viewport: Viewport,
+export default {
+   name: "Layering",
+   concreteNodes:
+   [
+      Layer,
+      LayerSet,
+      Viewport,
+   ],
+   abstractNodes:
+   [
+      X3DLayerNode,
+      X3DViewportNode,
+   ],
 };
-
-const AbstractTypes =
-{
-   X3DLayerNode:    X3DLayerNode,
-   X3DViewportNode: X3DViewportNode,
-};
-
-for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
-
-for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
-
-export default undefined;

package/src/x_ite/Components/Layout/Layout.js

@@ -94,9 +94,8 @@ function Layout (executionContext)
    this .matrix          = new Matrix4 ();
 }
 
-Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
+Object .assign (Object .setPrototypeOf (Layout .prototype, X3DLayoutNode .prototype),
 {
-   constructor: Layout,
    viewportPixel: new Vector2 (0, 0),
    pixelSize: new Vector2 (0, 0),
    translation: new Vector3 (0, 0, 0),
@@ -106,32 +105,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
    currentRotation: new Rotation4 (),
    currentScale: new Vector3 (0, 0, 0),
    modelViewMatrix: new Matrix4 (),
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",    new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "align",       new Fields .MFString ("CENTER", "CENTER")),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "offsetUnits", new Fields .MFString ("WORLD", "WORLD")),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "offset",      new Fields .MFFloat (0, 0)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "sizeUnits",   new Fields .MFString ("WORLD", "WORLD")),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "size",        new Fields .MFFloat (1, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "scaleMode",   new Fields .MFString ("NONE", "NONE")),
-   ]),
-   getTypeName: function ()
-   {
-      return "Layout";
-   },
-   getComponentName: function ()
-   {
-      return "Layout";
-   },
-   getContainerField: function ()
-   {
-      return "layout";
-   },
-   getSpecificationRange: function ()
-   {
-      return ["3.2", "Infinity"];
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DLayoutNode .prototype .initialize .call (this);
 
@@ -149,7 +123,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
       this .set_size__ ();
       this .set_scaleMode__ ();
    },
-   set_align__: function ()
+   set_align__ ()
    {
       // X
 
@@ -183,7 +157,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
       else
          this .alignY = CENTER;
    },
-   set_offsetUnits__: function ()
+   set_offsetUnits__ ()
    {
       if (this ._offsetUnits .length > 0)
       {
@@ -220,7 +194,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
          this .offsetUnitY = WORLD;
       }
    },
-   set_offset__: function ()
+   set_offset__ ()
    {
       if (this ._offset .length > 0)
       {
@@ -242,7 +216,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
          this .offsetY = 0;
       }
    },
-   set_sizeUnits__: function ()
+   set_sizeUnits__ ()
    {
       if (this ._sizeUnits .length > 0)
       {
@@ -279,7 +253,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
          this .sizeUnitY = WORLD;
       }
    },
-   set_size__: function ()
+   set_size__ ()
    {
       if (this ._size .length > 0)
       {
@@ -301,7 +275,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
          this .sizeY = 0;
       }
    },
-   set_scaleMode__: function ()
+   set_scaleMode__ ()
    {
       if (this ._scaleMode .length > 0)
       {
@@ -344,23 +318,23 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
          this .scaleModeY = NONE;
       }
    },
-   getRectangleCenter: function ()
+   getRectangleCenter ()
    {
       return this .rectangleCenter;
    },
-   getRectangleSize: function ()
+   getRectangleSize ()
    {
       return this .rectangleSize;
    },
-   getAlignX: function ()
+   getAlignX ()
    {
       return this .alignX;
    },
-   getAlignY: function ()
+   getAlignY ()
    {
       return this .alignY;
    },
-   getOffsetUnitX: function ()
+   getOffsetUnitX ()
    {
       if (this .offsetUnitX === WORLD)
       {
@@ -372,7 +346,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       return this .offsetUnitX;
    },
-   getOffsetUnitY: function ()
+   getOffsetUnitY ()
    {
       if (this .offsetUnitY === WORLD)
       {
@@ -384,15 +358,15 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       return this .offsetUnitY;
    },
-   getOffsetX: function ()
+   getOffsetX ()
    {
       return this .offsetX;
    },
-   getOffsetY: function ()
+   getOffsetY ()
    {
       return this .offsetY;
    },
-   getSizeUnitX: function ()
+   getSizeUnitX ()
    {
       if (this .sizeUnitX === WORLD)
       {
@@ -404,7 +378,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       return this .sizeUnitX;
    },
-   getSizeUnitY: function ()
+   getSizeUnitY ()
    {
       if (this .sizeUnitY === WORLD)
       {
@@ -416,15 +390,15 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       return this .sizeUnitY;
    },
-   getSizeX: function ()
+   getSizeX ()
    {
       return this .sizeX;
    },
-   getSizeY: function ()
+   getSizeY ()
    {
       return this .sizeY;
    },
-   getScaleModeX: function ()
+   getScaleModeX ()
    {
       if (this .parent)
          return this .scaleModeX;
@@ -434,7 +408,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       return this .scaleModeX;
    },
-   getScaleModeY: function ()
+   getScaleModeY ()
    {
       if (this .parent)
          return this .scaleModeY;
@@ -444,7 +418,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       return this .scaleModeY;
    },
-   transform: function (type, renderObject)
+   transform (type, renderObject)
    {
       const parent = this .parent = renderObject .getParentLayout ();
 
@@ -628,4 +602,41 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
    },
 });
 
+Object .defineProperties (Layout,
+{
+   typeName:
+   {
+      value: "Layout",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Layout",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "layout",
+      enumerable: true,
+   },
+   specificationRange:
+   {
+      value: Object .freeze (["3.2", "Infinity"]),
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",    new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "align",       new Fields .MFString ("CENTER", "CENTER")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "offsetUnits", new Fields .MFString ("WORLD", "WORLD")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "offset",      new Fields .MFFloat (0, 0)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "sizeUnits",   new Fields .MFString ("WORLD", "WORLD")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "size",        new Fields .MFFloat (1, 1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "scaleMode",   new Fields .MFString ("NONE", "NONE")),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default Layout;