x_ite 8.7.3 → 8.7.5

package/src/x_ite/Components/Core/X3DPrototypeInstance.js

@@ -59,7 +59,7 @@ const
 function X3DPrototypeInstance (executionContext, protoNode)
 {
    this [_protoNode]        = protoNode;
-   this [_protoFields]      = new Map (protoNode .getFields () .map (f => [f, f .getName ()]));
+   this [_protoFields]      = new Map ([... protoNode .getFields ()] .map (f => [f, f .getName ()]));
    this [_fieldDefinitions] = protoNode .getFieldDefinitions ();
    this [_body]             = null;
 
@@ -197,14 +197,14 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       const
          oldProtoFields = this [_protoFields],
-         oldFields      = new Map (this .getFields () .map (f => [f .getName (), f]));
+         oldFields      = new Map ([... this .getFields ()] .map (f => [f .getName (), f]));
 
       for (const field of oldFields .values ())
          this .removeField (field .getName ());
 
       // Add new fields.
 
-      this [_protoFields] = new Map (this [_protoNode] .getFields () .map (f => [f, f .getName ()]));
+      this [_protoFields] = new Map ([... this [_protoNode] .getFields ()] .map (f => [f, f .getName ()]));
 
       for (const fieldDefinition of this .getFieldDefinitions ())
          this .addField (fieldDefinition);
@@ -268,7 +268,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
          // Get field from new proto node.
 
-         this [_protoFields]      = new Map (protoNode .getFields () .map (f => [f, f .getName ()]));
+         this [_protoFields]      = new Map ([... protoNode .getFields ()] .map (f => [f, f .getName ()]));
          this [_fieldDefinitions] = protoNode .getFieldDefinitions ();
       }
 

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

@@ -213,7 +213,7 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
    {
       const
          viewpointNode = this .getViewpoint (),
-         bbox          = this .getBBox (new Box3 ()) .multRight (Matrix4 .inverse (viewpointNode .getModelMatrix ()));
+         bbox          = this .getBBox (new Box3 ()) .multRight (viewpointNode .getModelMatrix () .copy () .inverse ());
 
       viewpointNode .lookAt (this, bbox .center, viewpointNode .getLookAtDistance (bbox), factor, straighten);
    },

package/src/x_ite/Components/Navigation/X3DViewpointNode.js

@@ -431,8 +431,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    lookAtPoint: function (layerNode, point, factor, straighten)
    {
       this .getCameraSpaceMatrix () .multVecMatrix (point);
-
-      Matrix4 .inverse (this .getModelMatrix ()) .multVecMatrix (point);
+      this .getModelMatrix () .copy () .inverse () .multVecMatrix (point);
 
       const minDistance = layerNode .getNavigationInfo () .getNearValue () * 2;
 
@@ -440,7 +439,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    },
    lookAtBBox: function (layerNode, bbox, factor, straighten)
    {
-      bbox = bbox .copy () .multRight (Matrix4 .inverse (this .getModelMatrix ()));
+      bbox = bbox .copy () .multRight (this .getModelMatrix () .copy () .inverse ());
 
       const minDistance = Math .max (layerNode .getNavigationInfo () .getNearValue () * 2, this .getLookAtDistance (bbox));
 

package/src/x_ite/Components/Picking/X3DPickSensorNode.js

@@ -238,7 +238,7 @@ X3DPickSensorNode .prototype = Object .assign (Object .create (X3DSensorNode .pr
 
       var instance = geometryNode .getExecutionContext ();
 
-      if (instance .getType () .indexOf (X3DConstants .X3DPrototypeInstance) !== -1 && instance .getExecutionContext () === executionContext)
+      if (instance .getType () .includes (X3DConstants .X3DPrototypeInstance) && instance .getExecutionContext () === executionContext)
          return instance;
 
       var pickingHierarchy = target .pickingHierarchy;
@@ -252,7 +252,7 @@ X3DPickSensorNode .prototype = Object .assign (Object .create (X3DSensorNode .pr
 
          var instance = node .getExecutionContext ();
 
-         if (instance .getType () .indexOf (X3DConstants .X3DPrototypeInstance) !== -1 && instance .getExecutionContext () === executionContext)
+         if (instance .getType () .includes (X3DConstants .X3DPrototypeInstance) && instance .getExecutionContext () === executionContext)
             return instance;
       }
 

package/src/x_ite/Configuration/ComponentInfoArray.js

@@ -45,12 +45,12 @@
  *
  ******************************************************************************/
 
-import ComponentInfo from "./ComponentInfo.js";
 import X3DInfoArray  from "../Base/X3DInfoArray.js";
+import ComponentInfo from "./ComponentInfo.js";
 
 function ComponentInfoArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   return X3DInfoArray .call (this, values, ComponentInfo);
 }
 
 ComponentInfoArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Configuration/ProfileInfoArray.js

@@ -45,13 +45,13 @@
  *
  ******************************************************************************/
 
+import X3DInfoArray       from "../Base/X3DInfoArray.js";
 import ComponentInfoArray from "./ComponentInfoArray.js";
 import ProfileInfo        from "./ProfileInfo.js";
-import X3DInfoArray       from "../Base/X3DInfoArray.js";
 
 function ProfileInfoArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   return X3DInfoArray .call (this, values, X3DInfoArray);
 }
 
 ProfileInfoArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Configuration/UnitInfoArray.js

@@ -46,10 +46,24 @@
  ******************************************************************************/
 
 import X3DInfoArray from "../Base/X3DInfoArray.js";
+import UnitInfo     from "./UnitInfo.js"
 
 function UnitInfoArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   const proxy = X3DInfoArray .call (this);
+
+   if (values)
+   {
+      for (const value of values)
+      {
+         if (!(value instanceof UnitInfo))
+            throw new TypeError (`Wrong type in construction of ${this .getTypeName ()}.`);
+
+         this .add (value .category, value);
+      }
+   }
+
+   return proxy;
 }
 
 UnitInfoArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/BindableList.js

@@ -151,7 +151,7 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
 
          for (const node of this .nodes)
          {
-            if (collectedNodes .indexOf (node) === -1)
+            if (!collectedNodes .includes (node))
                removedNodes .push (node);
          }
 

package/src/x_ite/Execution/ExportedNodesArray.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DInfoArray    from "../Base/X3DInfoArray.js";
+import X3DExportedNode from "./X3DExportedNode.js"
 
-function ExportedNodesArray (array)
+function ExportedNodesArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   return X3DInfoArray .call (this, values, X3DExportedNode);
 }
 
 ExportedNodesArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/ImportedNodesArray.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DInfoArray    from "../Base/X3DInfoArray.js";
+import X3DImportedNode from "./X3DImportedNode.js"
 
-function ImportedNodesArray (array)
+function ImportedNodesArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   return X3DInfoArray .call (this, values, X3DImportedNode);
 }
 
 ImportedNodesArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/NamedNodesArray.js

@@ -46,10 +46,24 @@
  ******************************************************************************/
 
 import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DBaseNode  from "../Base/X3DBaseNode.js"
 
-function NamedNodesArray (array)
+function NamedNodesArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   const proxy = X3DInfoArray .call (this);
+
+   if (values)
+   {
+      for (const value of values)
+      {
+         if (!(value instanceof X3DBaseNode))
+            throw new TypeError (`Wrong type in construction of ${this .getTypeName ()}.`);
+
+         this .add (value .getName (), value);
+      }
+   }
+
+   return proxy;
 }
 
 NamedNodesArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -940,65 +940,59 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 for (const key of Reflect .ownKeys (X3DExecutionContext .prototype))
    Object .defineProperty (X3DExecutionContext .prototype, key, { enumerable: false });
 
-Object .defineProperty (X3DExecutionContext .prototype, "specificationVersion",
+Object .defineProperties (X3DExecutionContext .prototype,
 {
-   get: X3DExecutionContext .prototype .getSpecificationVersion,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "encoding",
-{
-   get: X3DExecutionContext .prototype .getEncoding,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "profile",
-{
-   get: X3DExecutionContext .prototype .getProfile,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "components",
-{
-   get: X3DExecutionContext .prototype .getComponents,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "worldURL",
-{
-   get: X3DExecutionContext .prototype .getWorldURL,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "units",
-{
-   get: X3DExecutionContext .prototype .getUnits,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "rootNodes",
-{
-   get: X3DExecutionContext .prototype .getRootNodes,
-   set: X3DExecutionContext .prototype .setRootNodes,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "protos",
-{
-   get: X3DExecutionContext .prototype .getProtoDeclarations,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "externprotos",
-{
-   get: X3DExecutionContext .prototype .getExternProtoDeclarations,
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExecutionContext .prototype, "routes",
-{
-   get: X3DExecutionContext .prototype .getRoutes,
-   enumerable: true,
+   specificationVersion:
+   {
+      get: X3DExecutionContext .prototype .getSpecificationVersion,
+      enumerable: true,
+   },
+   encoding:
+   {
+      get: X3DExecutionContext .prototype .getEncoding,
+      enumerable: true,
+   },
+   profile:
+   {
+      get: X3DExecutionContext .prototype .getProfile,
+      enumerable: true,
+   },
+   components:
+   {
+      get: X3DExecutionContext .prototype .getComponents,
+      enumerable: true,
+   },
+   worldURL:
+   {
+      get: X3DExecutionContext .prototype .getWorldURL,
+      enumerable: true,
+   },
+   units:
+   {
+      get: X3DExecutionContext .prototype .getUnits,
+      enumerable: true,
+   },
+   rootNodes:
+   {
+      get: X3DExecutionContext .prototype .getRootNodes,
+      set: X3DExecutionContext .prototype .setRootNodes,
+      enumerable: true,
+   },
+   protos:
+   {
+      get: X3DExecutionContext .prototype .getProtoDeclarations,
+      enumerable: true,
+   },
+   externprotos:
+   {
+      get: X3DExecutionContext .prototype .getExternProtoDeclarations,
+      enumerable: true,
+   },
+   routes:
+   {
+      get: X3DExecutionContext .prototype .getRoutes,
+      enumerable: true,
+   },
 });
 
 export default X3DExecutionContext;

package/src/x_ite/Execution/X3DExportedNode.js

@@ -170,22 +170,24 @@ X3DExportedNode .prototype = Object .assign (Object .create (X3DObject .prototyp
 for (const key of Reflect .ownKeys (X3DExportedNode .prototype))
    Object .defineProperty (X3DExportedNode .prototype, key, { enumerable: false });
 
-Object .defineProperty (X3DExportedNode .prototype, "exportedName",
+Object .defineProperties (X3DExportedNode .prototype,
 {
-   get: function ()
+   exportedName:
    {
-      return SFNodeCache .get (this [_exportedName]);
+      get: function ()
+      {
+         return SFNodeCache .get (this [_exportedName]);
+      },
+      enumerable: true,
    },
-   enumerable: true,
-});
-
-Object .defineProperty (X3DExportedNode .prototype, "localNode",
-{
-   get: function ()
+   localNode:
    {
-      return SFNodeCache .get (this [_localNode]);
+      get: function ()
+      {
+         return SFNodeCache .get (this [_localNode]);
+      },
+      enumerable: true,
    },
-   enumerable: true,
 });
 
 export default X3DExportedNode;

package/src/x_ite/Execution/X3DImportedNode.js

@@ -513,40 +513,40 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
 for (const key of Reflect .ownKeys (X3DImportedNode .prototype))
    Object .defineProperty (X3DImportedNode .prototype, key, { enumerable: false });
 
-Object .defineProperty (X3DImportedNode .prototype, "inlineNode",
+Object .defineProperties (X3DImportedNode .prototype,
 {
-   get: function ()
+   inlineNode:
    {
-      return SFNodeCache .get (this [_inlineNode]);
+      get: function ()
+      {
+         return SFNodeCache .get (this [_inlineNode]);
+      },
+      enumerable: true,
    },
-   enumerable: true,
-});
-
-Object .defineProperty (X3DImportedNode .prototype, "exportedName",
-{
-   get: function ()
+   exportedName:
    {
-      return this [_exportedName];
+      get: function ()
+      {
+         return this [_exportedName];
+      },
+      enumerable: true,
    },
-   enumerable: true,
-});
-
-Object .defineProperty (X3DImportedNode .prototype, "exportedNode",
-{
-   get: function ()
+   exportedNode:
    {
-      return this [_inlineNode] .getInternalScene () .getExportedNode (this [_exportedName]);
+      get: function ()
+      {
+         return this [_inlineNode] .getInternalScene () .getExportedNode (this [_exportedName]);
+      },
+      enumerable: true,
    },
-   enumerable: true,
-});
-
-Object .defineProperty (X3DImportedNode .prototype, "importedName",
-{
-   get: function ()
+   importedName:
    {
-      return this [_importedName];
+      get: function ()
+      {
+         return this [_importedName];
+      },
+      enumerable: true,
    },
-   enumerable: true,
 });
 
 export default X3DImportedNode;