x_ite 8.7.8 → 8.8.0

package/src/x_ite/Rendering/VertexArray.js

@@ -51,16 +51,16 @@ function VertexArray (gl)
    this .vertexArrays = new Map ();
 }
 
-VertexArray .prototype =
+Object .assign (VertexArray .prototype,
 {
-   update: function (value = true)
+   update (value = true)
    {
       if (value)
          this .delete ();
 
       return this;
    },
-   enable: function (shaderNode)
+   enable (shaderNode)
    {
       const vertexArray = this .vertexArrays .get (shaderNode);
 
@@ -83,13 +83,13 @@ VertexArray .prototype =
          return true; // Rebuild
       }
    },
-   delete: function ()
+   delete ()
    {
       for (const vertexArray of this .vertexArrays .values ())
          this .gl .deleteVertexArray (vertexArray);
 
       this .vertexArrays .clear ();
    },
-};
+});
 
 export default VertexArray;

package/src/x_ite/Rendering/X3DRenderObject.js

@@ -111,92 +111,91 @@ function X3DRenderObject (executionContext)
    }
 }
 
-X3DRenderObject .prototype =
+Object .assign (X3DRenderObject .prototype,
 {
-   constructor: X3DRenderObject,
-   initialize: function ()
+   initialize ()
    { },
-   isIndependent: function ()
+   isIndependent ()
    {
       return true;
    },
-   getRenderTime: function ()
+   getRenderTime ()
    {
       return this .renderTime;
    },
-   getViewVolumes: function ()
+   getViewVolumes ()
    {
       return this .viewVolumes;
    },
-   getViewVolume: function ()
+   getViewVolume ()
    {
       return this .viewVolumes .at (-1);
    },
-   getCameraSpaceMatrix: function ()
+   getCameraSpaceMatrix ()
    {
       return this .cameraSpaceMatrix;
    },
-   getViewMatrix: function ()
+   getViewMatrix ()
    {
       return this .viewMatrix;
    },
-   getProjectionMatrix: function ()
+   getProjectionMatrix ()
    {
       return this .projectionMatrix;
    },
-   getModelViewMatrix: function ()
+   getModelViewMatrix ()
    {
       return this .modelViewMatrix;
    },
-   getViewportArray: function ()
+   getViewportArray ()
    {
       return this .viewportArray;
    },
-   getProjectionMatrixArray: function ()
+   getProjectionMatrixArray ()
    {
       return this .projectionMatrixArray;
    },
-   getCameraSpaceMatrixArray: function ()
+   getCameraSpaceMatrixArray ()
    {
       return this .cameraSpaceMatrixArray;
    },
-   getHitRay: function ()
+   getHitRay ()
    {
       return this .hitRay;
    },
-   getSensors: function ()
+   getSensors ()
    {
       return this .sensors;
    },
-   getGlobalObjects: function ()
+   getGlobalObjects ()
    {
       return this .globalObjects;
    },
-   getLocalObjects: function ()
+   getLocalObjects ()
    {
       return this .localObjects;
    },
-   getLocalObjectsCount: function ()
+   getLocalObjectsCount ()
    {
       return this .localObjectsCount;
    },
-   getLights: function ()
+   getLights ()
    {
       return this .lights;
    },
-   pushGlobalShadows: function (value)
+   pushGlobalShadows (value)
    {
       this .globalShadows .push (value || this .globalShadows .at (-1));
    },
-   getGlobalShadows: function ()
+   getGlobalShadows ()
    {
       return this .globalShadows;
    },
-   pushLocalShadows: function (value)
+   pushLocalShadows (value)
    {
       this .localShadows .push (value || this .localShadows .at (-1));
    },
-   popLocalShadows: function ()
+   popLocalShadows ()
    {
       this .localShadows .pop ();
    },
@@ -221,95 +220,95 @@ X3DRenderObject .prototype =
          }
       };
    })(),
-   getLocalFogs: function ()
+   getLocalFogs ()
    {
       return this .localFogs;
    },
-   getLayouts: function ()
+   getLayouts ()
    {
       return this .layouts;
    },
-   getParentLayout: function ()
+   getParentLayout ()
    {
       return this .layouts .at (-1);
    },
-   getTextureProjectors: function ()
+   getTextureProjectors ()
    {
       return this .textureProjectors;
    },
-   getGeneratedCubeMapTextures: function ()
+   getGeneratedCubeMapTextures ()
    {
       return this .generatedCubeMapTextures;
    },
-   getCollisions: function ()
+   getCollisions ()
    {
       return this .collisions;
    },
-   getCollisionTime: function ()
+   getCollisionTime ()
    {
       return this .collisionTime;
    },
-   setNumPointingShapes: function (value)
+   setNumPointingShapes (value)
    {
       this .numPointingShapes = value;
    },
-   getNumPointingShapes: function ()
+   getNumPointingShapes ()
    {
       return this .numPointingShapes;
    },
-   getPointingShapes: function ()
+   getPointingShapes ()
    {
       return this .pointingShapes;
    },
-   setNumCollisionShapes: function (value)
+   setNumCollisionShapes (value)
    {
       this .numCollisionShapes = value;
    },
-   getNumCollisionShapes: function ()
+   getNumCollisionShapes ()
    {
       return this .numCollisionShapes;
    },
-   getCollisionShapes: function ()
+   getCollisionShapes ()
    {
       return this .collisionShapes;
    },
-   setNumShadowShapes: function (value)
+   setNumShadowShapes (value)
    {
       this .numShadowShapes = value;
    },
-   getNumShadowShapes: function ()
+   getNumShadowShapes ()
    {
       return this .numShadowShapes;
    },
-   getShadowShapes: function ()
+   getShadowShapes ()
    {
       return this .shadowShapes;
    },
-   setNumOpaqueShapes: function (value)
+   setNumOpaqueShapes (value)
    {
       this .numOpaqueShapes = value;
    },
-   getNumOpaqueShapes: function ()
+   getNumOpaqueShapes ()
    {
       return this .numOpaqueShapes;
    },
-   getOpaqueShapes: function ()
+   getOpaqueShapes ()
    {
       return this .opaqueShapes;
    },
-   setNumTransparentShapes: function (value)
+   setNumTransparentShapes (value)
    {
       this .numTransparentShapes = value;
    },
-   getNumTransparentShapes: function ()
+   getNumTransparentShapes ()
    {
       return this .numTransparentShapes;
    },
-   getTransparentShapes: function ()
+   getTransparentShapes ()
    {
       return this .transparentShapes;
    },
-   constrainTranslation: function (translation, stepBack)
+   constrainTranslation (translation, stepBack)
    {
       ///  Contrains @a translation to a possible value the avatar can move.  If the avatar reaches and intersects with an
       ///  and obstacle and @a stepBack is true a translation in the opposite directiion is returned.  Future implementation will
@@ -428,7 +427,7 @@ X3DRenderObject .prototype =
          return depth;
       };
    })(),
-   render: function (type, callback, group)
+   render (type, callback, group)
    {
       switch (type)
       {
@@ -472,7 +471,7 @@ X3DRenderObject .prototype =
          }
       }
    },
-   setHitRay: function (projectionMatrix, viewport, pointer)
+   setHitRay (projectionMatrix, viewport, pointer)
    {
       ViewVolume .unProjectRay (pointer .x, pointer .y, Matrix4 .Identity, projectionMatrix, viewport, this .hitRay);
    },
@@ -665,7 +664,7 @@ X3DRenderObject .prototype =
          return false;
       };
    })(),
-   createRenderContext: function (transparent)
+   createRenderContext (transparent)
    {
       return {
          renderObject: this,
@@ -976,7 +975,7 @@ X3DRenderObject .prototype =
          }
       };
    })(),
-   draw: function ()
+   draw ()
    {
       const
          browser                    = this .getBrowser (),
@@ -1122,7 +1121,7 @@ X3DRenderObject .prototype =
       textureProjectors        .length = 0;
       generatedCubeMapTextures .length = 0;
    },
-};
+});
 
 function assign (lhs, rhs)
 {

package/src/x_ite/Routing/RouteArray.js

@@ -48,21 +48,23 @@
 import X3DInfoArray from "../Base/X3DInfoArray.js";
 import X3DRoute     from "./X3DRoute.js";
 
-function RouteArray (values)
+function RouteArray (values = [ ])
 {
-   return X3DInfoArray .call (this, values, X3DRoute);
+   return X3DInfoArray .call (this, Array .from (values, value => [value .getId (), value]), X3DRoute);
 }
 
-RouteArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),
+Object .setPrototypeOf (RouteArray .prototype, X3DInfoArray .prototype);
+
+for (const key of Reflect .ownKeys (RouteArray .prototype))
+   Object .defineProperty (RouteArray .prototype, key, { enumerable: false });
+
+Object .defineProperties (RouteArray,
 {
-   constructor: RouteArray,
-   getTypeName: function ()
+   typeName:
    {
-      return "RouteArray";
+      value: "RouteArray",
+      enumerable: true,
    },
 });
 
-for (const key of Reflect .ownKeys (RouteArray .prototype))
-   Object .defineProperty (RouteArray .prototype, key, { enumerable: false });
-
 export default RouteArray;

package/src/x_ite/Routing/X3DRoute.js

@@ -74,45 +74,44 @@ function X3DRoute (executionContext, sourceNode, sourceField, destinationNode, d
    destinationField .addInputRoute (this);
 }
 
-X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
+Object .assign (Object .setPrototypeOf (X3DRoute .prototype, X3DObject .prototype),
 {
-   constructor: X3DRoute,
-   getTypeName: function ()
+   getExecutionContext ()
    {
-      return "X3DRoute";
+      return this [_executionContext];
    },
-   getExecutionContext: function ()
+   getId ()
    {
-      return this [_executionContext];
+      return X3DRoute .getId (this [_sourceField], this [_destinationField]);
    },
-   getSourceNode: function ()
+   getSourceNode ()
    {
       ///  SAI
       return this [_sourceNode];
    },
-   getSourceField: function ()
+   getSourceField ()
    {
       ///  SAI
       return this [_sourceField];
    },
-   getDestinationNode: function ()
+   getDestinationNode ()
    {
       ///  SAI
       return this [_destinationNode];
    },
-   getDestinationField: function ()
+   getDestinationField ()
    {
       ///  SAI
       return this [_destinationField];
    },
-   disconnect: function ()
+   disconnect ()
    {
       this [_sourceField] .removeFieldInterest (this [_destinationField]);
 
       this [_sourceField]      .removeOutputRoute (this);
       this [_destinationField] .removeInputRoute (this);
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       const
          sourceNodeName      = generator .LocalName (this [_sourceNode]),
@@ -139,7 +138,7 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       generator .string += this [_destinationField] .getName ();
    },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       const
          sourceNodeName      = generator .LocalName (this [_sourceNode]),
@@ -173,7 +172,7 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += "'";
       generator .string += generator .closingTags ? "></ROUTE>" : "/>";
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       const
          sourceNodeName      = generator .LocalName (this [_sourceNode]),
@@ -248,7 +247,7 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += generator .Indent ();
       generator .string += '}';
    },
-   dispose: function ()
+   dispose ()
    {
       this .disconnect ();
 
@@ -265,7 +264,7 @@ Object .defineProperties (X3DRoute .prototype,
 {
    sourceNode:
    {
-      get: function ()
+      get ()
       {
          return SFNodeCache .get (this [_sourceNode]);
       },
@@ -273,7 +272,7 @@ Object .defineProperties (X3DRoute .prototype,
    },
    sourceField:
    {
-      get: function ()
+      get ()
       {
          return this [_sourceField] .getName ();
       },
@@ -281,7 +280,7 @@ Object .defineProperties (X3DRoute .prototype,
    },
    destinationNode:
    {
-      get: function ()
+      get ()
       {
          return SFNodeCache .get (this [_destinationNode]);
       },
@@ -289,7 +288,7 @@ Object .defineProperties (X3DRoute .prototype,
    },
    destinationField:
    {
-      get: function ()
+      get ()
       {
          return this [_destinationField] .getName ();
       },
@@ -297,4 +296,21 @@ Object .defineProperties (X3DRoute .prototype,
    },
 });
 
+Object .defineProperties (X3DRoute,
+{
+   typeName:
+   {
+      value: "X3DRoute",
+      enumerable: true,
+   },
+});
+
+Object .assign (X3DRoute,
+{
+   getId (sourceField, destinationField)
+   {
+      return `${sourceField .getId ()}.${destinationField .getId ()}`;
+   },
+});
+
 export default X3DRoute;

package/src/x_ite/Routing/X3DRoutingContext.js

@@ -59,19 +59,18 @@ function X3DRoutingContext ()
    this [_taintedNodesTemp]  = [ ];
 }
 
-X3DRoutingContext .prototype =
+Object .assign (X3DRoutingContext .prototype,
 {
-   constructor: X3DRoutingContext,
-   initialize: function () { },
-   addTaintedField: function (field, event)
+   initialize () { },
+   addTaintedField (field, event)
    {
       this [_taintedFields] .push (field, event);
    },
-   addTaintedNode: function (node)
+   addTaintedNode (node)
    {
       this [_taintedNodes] .push (node);
    },
-   [Symbol .for ("X_ITE.X3DRoutingContext.processEvents")]: function ()
+   [Symbol .for ("X_ITE.X3DRoutingContext.processEvents")] ()
    {
       do
       {
@@ -102,7 +101,7 @@ X3DRoutingContext .prototype =
             this [_taintedNodes] .length = 0;
 
             for (const taintedNode of taintedNodes)
-               taintedNode .processEvents ();
+               taintedNode .processEvent ();
 
             // Don't know why this must be done after the for loop, otherwise a fatal error could be thrown.
             this [_taintedNodesTemp] = taintedNodes;
@@ -111,7 +110,7 @@ X3DRoutingContext .prototype =
       }
       while (this [_taintedFields] .length);
    },
-   dispose: function () { },
-};
+   dispose () { },
+});
 
 export default X3DRoutingContext;

package/src/x_ite/X3D.js

@@ -56,11 +56,16 @@ import ComponentInfo               from "./Configuration/ComponentInfo.js";
 import ComponentInfoArray          from "./Configuration/ComponentInfoArray.js";
 import ProfileInfo                 from "./Configuration/ProfileInfo.js";
 import ProfileInfoArray            from "./Configuration/ProfileInfoArray.js";
+import ConcreteNodesArray          from "./Configuration/ConcreteNodesArray.js";
+import AbstractNodesArray          from "./Configuration/AbstractNodesArray.js";
 import UnitInfo                    from "./Configuration/UnitInfo.js";
 import UnitInfoArray               from "./Configuration/UnitInfoArray.js";
 import X3DExecutionContext         from "./Execution/X3DExecutionContext.js";
 import X3DScene                    from "./Execution/X3DScene.js";
+import NamedNodesArray             from "./Execution/NamedNodesArray.js";
+import ImportedNodesArray          from "./Execution/ImportedNodesArray.js";
 import X3DImportedNode             from "./Execution/X3DImportedNode.js";
+import ExportedNodesArray          from "./Execution/ExportedNodesArray.js";
 import X3DExportedNode             from "./Execution/X3DExportedNode.js";
 import ExternProtoDeclarationArray from "./Prototype/ExternProtoDeclarationArray.js";
 import ProtoDeclarationArray       from "./Prototype/ProtoDeclarationArray.js";
@@ -70,7 +75,7 @@ import X3DProtoDeclarationNode     from "./Prototype/X3DProtoDeclarationNode.js"
 import RouteArray                  from "./Routing/RouteArray.js";
 import X3DRoute                    from "./Routing/X3DRoute.js";
 import X3DConstants                from "./Base/X3DConstants.js";
-import Fallback                    from "./Fallback.js";
+import Legacy                      from "./Browser/Legacy.js";
 import MicroTime                   from "../standard/Time/MicroTime.js";
 import jQuery                      from "../lib/jquery.js";
 import libtess                     from "../lib/libtess.js";
@@ -89,7 +94,7 @@ let initialized = false;
  */
 function X3D (callback, fallback)
 {
-   return new Promise (function (resolve, reject)
+   return new Promise ((resolve, reject) =>
    {
       if (typeof callback === "function")
          callbacks .done (callback);
@@ -109,24 +114,16 @@ function X3D (callback, fallback)
       {
          try
          {
-            // Begin Legacy
+            Legacy .elements ($("X3DCanvas"), X3DBrowser);
 
-            const elements = $("X3DCanvas");
-
-            if (elements .length)
-            {
-               console .warn ("Use of <X3DCanvas> element is depreciated, please use <x3d-canvas> element instead. See https://create3000.github.io/x_ite/#embedding-x_ite-within-a-web-page.");
-
-               $.map (elements, element => new X3DBrowser (element));
-            }
-
-            // End Legacy
-
-            callbacks .resolve ();
+            if ([... $("x3d-canvas")] .every (canvas => canvas .browser))
+               callbacks .resolve ();
+            else
+               fallbacks .resolve (new Error ("Couldn't create browser."));
          }
          catch (error)
          {
-            Fallback .show ($("x3d-canvas, X3DCanvas"), error);
+            Legacy .error ($("X3DCanvas"), error);
             fallbacks .resolve (error);
          }
       });
@@ -135,10 +132,10 @@ function X3D (callback, fallback)
 
 Object .assign (X3D,
 {
-   require: function (id)
+   require (id)
    {
-      if (! Namespace .has (id))
-         throw new Error ("Unknown module '" + id + "'.");
+      if (!Namespace .has (id))
+         throw new Error (`Unknown module '${id}'.`);
 
       return Namespace .get (id);
    },
@@ -161,11 +158,11 @@ Object .assign (X3D,
          return X3D;
       };
    })(),
-   getBrowser: function (element)
+   getBrowser (element)
    {
       return $(element || "x3d-canvas, X3DCanvas") .prop ("browser");
    },
-   createBrowser: function (url, parameter)
+   createBrowser (url, parameter)
    {
       const element = document .createElement ("x3d-canvas");
 
@@ -186,20 +183,24 @@ Object .assign (X3D,
    ComponentInfoArray:          ComponentInfoArray,
    ProfileInfo:                 ProfileInfo,
    ProfileInfoArray:            ProfileInfoArray,
+   ConcreteNodesArray:          ConcreteNodesArray,          // non-standard
+   AbstractNodesArray:          AbstractNodesArray,          // non-standard
    UnitInfo:                    UnitInfo,
    UnitInfoArray:               UnitInfoArray,
+   NamedNodesArray:             NamedNodesArray,             // non-standard
+   ImportedNodesArray:          ImportedNodesArray,          // non-standard
+   X3DImportedNode:             X3DImportedNode,             // non-standard
+   ExportedNodesArray:          ExportedNodesArray,          // non-standard
+   X3DExportedNode:             X3DExportedNode,             // non-standard
    ExternProtoDeclarationArray: ExternProtoDeclarationArray,
    ProtoDeclarationArray:       ProtoDeclarationArray,
    X3DExternProtoDeclaration:   X3DExternProtoDeclaration,
    X3DProtoDeclaration:         X3DProtoDeclaration,
+   X3DProtoDeclarationNode:     X3DProtoDeclarationNode,     // non-standard
    RouteArray:                  RouteArray,
    X3DRoute:                    X3DRoute,
 
-   // Additional classes
-   X3DBaseNode:                 X3DBaseNode,
-   X3DExportedNode:             X3DExportedNode,
-   X3DImportedNode:             X3DImportedNode,
-   X3DProtoDeclarationNode:     X3DProtoDeclarationNode,
+   X3DBaseNode:                 X3DBaseNode,                 // non-standard
 
    X3DFieldDefinition:          X3DFieldDefinition,
    FieldDefinitionArray:        FieldDefinitionArray,