x_ite 8.3.2 → 8.4.0

package/src/x_ite/Components/Grouping/X3DTransformMatrix3DNode.js

@@ -57,9 +57,7 @@ function X3DTransformMatrix3DNode (executionContext)
 
    this .addType (X3DConstants .X3DTransformMatrix3DNode);
 
-   this .matrix   = new Matrix4 ();
-   this .getBBox  = this .getGetGroupBBox ();
-   this .traverse = this .getGroupTraverse ();
+   this .matrix = new Matrix4 ();
 }
 
 X3DTransformMatrix3DNode .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
@@ -71,15 +69,15 @@ X3DTransformMatrix3DNode .prototype = Object .assign (Object .create (X3DGroupin
       {
          this .matrix .identity ();
 
-         this .getBBox  = this .getGetGroupBBox ();
-         this .traverse = this .getGroupTraverse ();
+         this .getBBox  = this .getSubBBox;
+         this .traverse = this .groupTraverse;
       }
       else
       {
          this .matrix .assign (matrix);
 
-         this .getBBox  = this .getGetBBox ();
-         this .traverse = this .getTraverse ();
+         delete this .getBBox;
+         delete this .traverse;
       }
    },
    getMatrix: function ()
@@ -92,56 +90,33 @@ X3DTransformMatrix3DNode .prototype = Object .assign (Object .create (X3DGroupin
       {
          this .matrix .identity ();
 
-         this .getBBox  = this .getGetGroupBBox ();
-         this .traverse = this .getGroupTraverse ();
+         this .getBBox  = this .getSubBBox;
+         this .traverse = this .groupTraverse;
       }
       else
       {
          this .matrix .set (t, r, s, so, c);
 
-         this .getBBox  = this .getGetBBox ();
-         this .traverse = this .getTraverse ();
+         delete this .getBBox;
+         delete this .traverse;
       }
    },
-   getGetBBox: (function ()
+   getBBox: function getBBox (bbox, shadows)
    {
-      function getBBox (bbox, shadows)
-      {
-         return this .getSubBBox (bbox, shadows) .multRight (this .matrix);
-      }
-
-      return function ()
-      {
-         return getBBox;
-      };
-   })(),
-   getGetGroupBBox: function ()
-   {
-      return X3DGroupingNode .prototype .getBBox;
+      return this .getSubBBox (bbox, shadows) .multRight (this .matrix);
    },
-   getTraverse: (function ()
+   traverse: function (type, renderObject)
    {
-      function traverse (type, renderObject)
-      {
-         const modelViewMatrix = renderObject .getModelViewMatrix ();
-
-         modelViewMatrix .push ();
-         modelViewMatrix .multLeft (this .matrix);
+      const modelViewMatrix = renderObject .getModelViewMatrix ();
 
-         X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
+      modelViewMatrix .push ();
+      modelViewMatrix .multLeft (this .matrix);
 
-         modelViewMatrix .pop ();
-      }
+      X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
 
-      return function ()
-      {
-         return traverse;
-      };
-   })(),
-   getGroupTraverse: function ()
-   {
-      return X3DGroupingNode .prototype .traverse;
+      modelViewMatrix .pop ();
    },
+   groupTraverse: X3DGroupingNode .prototype .traverse,
 });
 
 export default X3DTransformMatrix3DNode;

package/src/x_ite/Components/HAnim/HAnimHumanoid.js

@@ -159,6 +159,8 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
       this ._scale            .addFieldInterest (this .transformNode ._scale);
       this ._scaleOrientation .addFieldInterest (this .transformNode ._scaleOrientation);
       this ._center           .addFieldInterest (this .transformNode ._center);
+      this ._visible          .addFieldInterest (this .transformNode ._visible);
+      this ._bboxDisplay      .addFieldInterest (this .transformNode ._bboxDisplay);
       this ._bboxSize         .addFieldInterest (this .transformNode ._bboxSize);
       this ._bboxCenter       .addFieldInterest (this .transformNode ._bboxCenter);
 
@@ -167,6 +169,8 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
       this .transformNode ._scale            = this ._scale;
       this .transformNode ._scaleOrientation = this ._scaleOrientation;
       this .transformNode ._center           = this ._center;
+      this .transformNode ._visible          = this ._visible;
+      this .transformNode ._bboxDisplay      = this ._bboxDisplay;
       this .transformNode ._bboxSize         = this ._bboxSize;
       this .transformNode ._bboxCenter       = this ._bboxCenter;
       this .transformNode ._children         = [ this .viewpointsNode, this .skeletonNode, this .skinNode ];
@@ -200,13 +204,13 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
    },
    set_joints__: function ()
    {
-      var jointNodes = this .jointNodes;
+      const jointNodes = this .jointNodes;
 
       jointNodes .length = 0;
 
-      for (var i = 0, length = this ._joints .length; i < length; ++ i)
+      for (const node of this ._joints)
       {
-         var jointNode = X3DCast (X3DConstants .HAnimJoint, this ._joints [i]);
+         const jointNode = X3DCast (X3DConstants .HAnimJoint, node);
 
          if (jointNode)
             jointNodes .push (jointNode);
@@ -232,12 +236,16 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
    },
    traverse: function (type, renderObject)
    {
+      renderObject .getJoints () .length = 0;
+
       this .transformNode .traverse (type, renderObject);
-      this .skinning (type, renderObject);
+
+      if (this .isLive () .getValue ())
+         this .skinning (type, renderObject);
    },
    skinning: (function ()
    {
-      var
+      const
          invModelMatrix = new Matrix4 (),
          vector         = new Vector3 (0, 0, 0),
          rest           = new Vector3 (0, 0, 0),
@@ -252,8 +260,8 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
          if (! this .skinCoordNode)
             return;
 
-         var
-            jointNodes     = this .jointNodes,
+         const
+            jointNodes     = this .jointNodes .length ? this .jointNodes : renderObject .getJoints (),
             skinNormalNode = this .skinNormalNode,
             skinCoordNode  = this .skinCoordNode,
             restNormalNode = this .restNormalNode,
@@ -272,32 +280,25 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
 
          // Apply joint transformations.
 
-         for (var j = 0, jointNodesLength = jointNodes .length; j < jointNodesLength; ++ j)
+         for (const jointNode of jointNodes)
          {
-            var
-               jointNode            = jointNodes [j],
-               skinCoordIndexLength = jointNode ._skinCoordIndex .length;
-
-            if (skinCoordIndexLength === 0)
-               continue;
-
-            var
-               jointMatrix    = jointNode .getModelMatrix () .multRight (invModelMatrix),
-               displacerNodes = jointNode .getDisplacers ();
+            const
+               skinCoordIndexLength = jointNode ._skinCoordIndex .length,
+               jointMatrix          = jointNode .getModelMatrix () .multRight (invModelMatrix),
+               displacerNodes       = jointNode .getDisplacers ();
 
-            for (var d = 0, displacerNodesLength = displacerNodes .length; d < displacerNodesLength; ++ d)
+            for (const displacerNode of displacerNodes)
             {
-               var
-                  displacerNode       = displacerNodes [d],
+               const
                   coordIndex          = displacerNode ._coordIndex .getValue (),
                   coordIndexLength    = displacerNode ._coordIndex .length,
                   weight              = displacerNode ._weight .getValue (),
                   displacements       = displacerNode ._displacements .getValue (),
                   displacementsLength = displacerNode ._displacements .length;
 
-               for (var i = 0; i < coordIndexLength; ++ i)
+               for (let i = 0; i < coordIndexLength; ++ i)
                {
-                  var
+                  const
                      i3           = i * 3,
                      index        = coordIndex [i],
                      displacement = i < displacementsLength ? point .set (displacements [i3], displacements [i3 + 1], displacements [i3 + 2]) : point .assign (Vector3 .Zero);
@@ -308,15 +309,15 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
                }
             }
 
-            var
+            const
                normalMatrix          = skinNormalNode ? jointMatrix .submatrix .transpose () .inverse () : null,
                skinCoordIndex        = jointNode ._skinCoordIndex .getValue (),
                skinCoordWeight       = jointNode ._skinCoordWeight .getValue (),
                skinCoordWeightLength = jointNode ._skinCoordWeight .length;
 
-            for (var i = 0; i < skinCoordIndexLength; ++ i)
+            for (let i = 0; i < skinCoordIndexLength; ++ i)
             {
-               var
+               const
                   index  = skinCoordIndex [i],
                   weight = i < skinCoordWeightLength ? skinCoordWeight [i] : 1;
 

package/src/x_ite/Components/HAnim/HAnimJoint.js

@@ -133,54 +133,42 @@ HAnimJoint .prototype = Object .assign (Object .create (X3DTransformNode .protot
 
       displacerNodes .length = 0;
 
-      for (var i = 0, length = this ._displacers .length; i < length; ++ i)
+      for (const node of this ._displacers)
       {
-         const displacerNode = X3DCast (X3DConstants .HAnimDisplacer, this ._displacers [i]);
+         const displacerNode = X3DCast (X3DConstants .HAnimDisplacer, node);
 
          if (displacerNode)
             displacerNodes .push (displacerNode);
       }
    },
-   getTraverse: (function ()
+   traverse: function traverse (type, renderObject)
    {
-      const base = X3DTransformNode .prototype .getTraverse ();
-
-      function traverse (type, renderObject)
+      if (type === TraverseType .CAMERA)
       {
-         if (type === TraverseType .CAMERA)
-            this .modelMatrix .assign (this .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ());
+         if (this ._skinCoordIndex .length)
+         {
+            renderObject .getJoints () .push (this);
 
-         base .call (this, type, renderObject);
+            this .modelMatrix .assign (this .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ());
+         }
       }
 
-      return function ()
+      X3DTransformNode .prototype .traverse .call (this, type, renderObject);
+   },
+   groupTraverse: function (type, renderObject)
+   {
+      if (type === TraverseType .CAMERA)
       {
          if (this ._skinCoordIndex .length)
-            return traverse;
-
-         return base;
-      };
-   })(),
-   getGroupTraverse: (function ()
-   {
-      const base = X3DTransformNode .prototype .getGroupTraverse ();
+         {
+            renderObject .getJoints () .push (this);
 
-      function traverse (type, renderObject)
-      {
-         if (type === TraverseType .CAMERA)
             this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
-
-         base .call (this, type, renderObject);
+         }
       }
 
-      return function ()
-      {
-         if (this ._skinCoordIndex .length)
-            return traverse;
-
-         return base;
-      };
-   })(),
+      X3DTransformNode .prototype .groupTraverse .call (this, type, renderObject);
+   },
 });
 
 export default HAnimJoint;

package/src/x_ite/Components/Rendering/X3DGeometryNode.js

@@ -401,7 +401,8 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          if ((Xsize >= Ysize) && (Xsize >= Zsize))
          {
             // X size largest
-            texCoordParams .Ssize = Xsize; texCoordParams .Sindex = 0;
+            texCoordParams .Ssize  = Xsize;
+            texCoordParams .Sindex = 0;
 
             if (Ysize >= Zsize)
                texCoordParams .Tindex = 1;
@@ -411,7 +412,8 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          else if ((Ysize >= Xsize) && (Ysize >= Zsize))
          {
             // Y size largest
-            texCoordParams .Ssize = Ysize; texCoordParams .Sindex = 1;
+            texCoordParams .Ssize  = Ysize;
+            texCoordParams .Sindex = 1;
 
             if (Xsize >= Zsize)
                texCoordParams .Tindex = 0;
@@ -421,7 +423,8 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          else
          {
             // Z is the largest
-            texCoordParams .Ssize = Zsize; texCoordParams .Sindex = 2;
+            texCoordParams .Ssize  = Zsize;
+            texCoordParams .Sindex = 2;
 
             if (Xsize >= Ysize)
                texCoordParams .Tindex = 0;

package/src/x_ite/Components/Sound/X3DSoundProcessingNode.js

@@ -45,19 +45,32 @@
  *
  ******************************************************************************/
 
+import X3DChildNode         from "../Core/X3DChildNode.js";
 import X3DTimeDependentNode from "../Time/X3DTimeDependentNode.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 
 function X3DSoundProcessingNode (executionContext)
 {
+   X3DChildNode         .call (this, executionContext);
    X3DTimeDependentNode .call (this, executionContext);
 
    this .addType (X3DConstants .X3DSoundProcessingNode);
 }
 
-X3DSoundProcessingNode .prototype = Object .assign (Object .create (X3DTimeDependentNode .prototype),
+X3DSoundProcessingNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),
+   X3DTimeDependentNode .prototype,
 {
    constructor: X3DSoundProcessingNode,
+   initialize: function ()
+   {
+      X3DChildNode         .prototype .initialize .call (this);
+      X3DTimeDependentNode .prototype .initialize .call (this);
+   },
+   dispose: function ()
+   {
+      X3DTimeDependentNode .prototype .dispose .call (this);
+      X3DChildNode         .prototype .dispose .call (this);
+   },
 });
 
 export default X3DSoundProcessingNode;

package/src/x_ite/Components/Sound/X3DSoundSourceNode.js

@@ -45,7 +45,6 @@
  *
  ******************************************************************************/
 
-import Fields               from "../../Fields.js";
 import X3DChildNode         from "../Core/X3DChildNode.js";
 import X3DTimeDependentNode from "../Time/X3DTimeDependentNode.js";
 import X3DConstants         from "../../Base/X3DConstants.js";

package/src/x_ite/Components/{ProjectiveTextureMapping → TextureProjector}/TextureProjector.js

@@ -182,7 +182,7 @@ TextureProjector .prototype = Object .assign (Object .create (X3DTextureProjecto
    },
    getComponentName: function ()
    {
-      return "ProjectiveTextureMapping";
+      return "TextureProjector";
    },
    getContainerField: function ()
    {

package/src/x_ite/Components/{ProjectiveTextureMapping → TextureProjector}/TextureProjectorParallel.js

@@ -203,7 +203,7 @@ TextureProjectorParallel .prototype = Object .assign (Object .create (X3DTexture
    },
    getComponentName: function ()
    {
-      return "ProjectiveTextureMapping";
+      return "TextureProjector";
    },
    getContainerField: function ()
    {

package/src/x_ite/Components/Time/TimeSensor.js

@@ -197,6 +197,11 @@ TimeSensor .prototype = Object .assign (Object .create (X3DSensorNode .prototype
 
       this ._time = time;
    },
+   dispose: function ()
+   {
+      X3DTimeDependentNode .prototype .dispose .call (this);
+      X3DSensorNode        .prototype .dispose .call (this);
+   },
 });
 
 export default TimeSensor;

package/src/x_ite/Components/Time/X3DTimeDependentNode.js

@@ -342,6 +342,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
    set_resume: function () { },
    set_stop: function () { },
    set_time: function () { },
+   dispose: function () { }
 });
 
 export default X3DTimeDependentNode;

package/src/x_ite/Configuration/ComponentInfo.js

@@ -47,7 +47,6 @@
 
 import X3DObject from "../Base/X3DObject.js";
 import URLs      from "../Browser/Networking/URLs.js";
-import Generator from "../InputOutput/Generator.js";
 
 function ComponentInfo ({ name, level, title, providerUrl, external = false, dependencies = [ ] })
 {
@@ -67,31 +66,61 @@ ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype)
    {
       return "ComponentInfo";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      stream .string += "COMPONENT";
-      stream .string += " ";
-      stream .string += this .name;
-      stream .string += " ";
-      stream .string += ":";
-      stream .string += " ";
-      stream .string += this .level;
+      generator .string += "COMPONENT";
+      generator .string += generator .Space ();
+      generator .string += this .name;
+      generator .string += generator .TidySpace ();
+      generator .string += ":";
+      generator .string += generator .TidySpace ();
+      generator .string += this .level;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
+      generator .string += generator .Indent ();
+      generator .string += "<component";
+      generator .string += generator .Space ();
+      generator .string += "name='";
+      generator .string += this .name;
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "level='";
+      generator .string += this .level;
+      generator .string += "'";
+      generator .string += "/>";
+   },
+   toJSONStream: function (generator)
+   {
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@name";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += this .name;
+      generator .string += '"';
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@level";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += this .level;
+      generator .string += generator .TidyBreak ();
 
-      stream .string += generator .Indent ();
-      stream .string += "<component";
-      stream .string += " ";
-      stream .string += "name='";
-      stream .string += this .name;
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "level='";
-      stream .string += this .level;
-      stream .string += "'";
-      stream .string += "/>";
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
    },
 });
 

package/src/x_ite/Configuration/ProfileInfo.js

@@ -62,15 +62,19 @@ ProfileInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
    {
       return "ProfileInfo";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      stream .string += "PROFILE";
-      stream .string += " ";
-      stream .string += this .name;
+      generator .string += "PROFILE";
+      generator .string += generator .Space ();
+      generator .string += this .name;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      stream .string += this .name;
+      generator .string += this .name;
+   },
+   toJSONStream: function (generator)
+   {
+      generator .string += this .name;
    },
 });
 

package/src/x_ite/Configuration/SupportedComponents.js

@@ -59,7 +59,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Computer-Aided Design (CAD) model geometry",
+   title: "CAD geometry",
    name: "CADGeometry",
    level: 2,
    external: true,
@@ -82,7 +82,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Distributed interactive simulation (DIS)",
+   title: "Distributed interactive simulation",
    name: "DIS",
    level: 2,
    external: true,
@@ -99,14 +99,14 @@ SupportedComponents .addComponent (
 {
    title: "Environmental sensor",
    name: "EnvironmentalSensor",
-   level: 4,
+   level: 3,
 });
 
 SupportedComponents .addComponent (
 {
    title: "Event utilities",
    name: "EventUtilities",
-   level: 4,
+   level: 1,
    external: true,
 });
 
@@ -114,7 +114,7 @@ SupportedComponents .addComponent (
 {
    title: "Followers",
    name: "Followers",
-   level: 4,
+   level: 1,
 });
 
 SupportedComponents .addComponent (
@@ -211,7 +211,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Non-uniform Rational B-Spline (NURBS)",
+   title: "NURBS",
    name: "NURBS",
    level: 4,
    external: true,
@@ -227,7 +227,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Picking sensor",
+   title: "Picking",
    name: "Picking",
    level: 3,
    external: true,
@@ -243,19 +243,21 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Projective Texture Mapping",
-   name: "ProjectiveTextureMapping",
-   level: 2,
-   external: true,
+   title: "Programmable shaders",
+   name: "Shaders",
+   level: 1,
 });
 
 SupportedComponents .addComponent (
 {
-   title: "Programmable shaders",
-   name: "Shaders",
-   level: 1,
+   title: "Texture Projector",
+   name: "TextureProjector",
+   level: 2,
+   external: true,
 });
 
+SupportedComponents .addAlias ("ProjectiveTextureMapping", "TextureProjector");
+
 SupportedComponents .addComponent (
 {
    title: "Rendering",
@@ -267,7 +269,7 @@ SupportedComponents .addComponent (
 {
    title: "Rigid body physics",
    name: "RigidBodyPhysics",
-   level: 5,
+   level: 2,
    external: true,
 });
 
@@ -283,14 +285,14 @@ SupportedComponents .addComponent (
 {
    title: "Shape",
    name: "Shape",
-   level: 5,
+   level: 4,
 });
 
 SupportedComponents .addComponent (
 {
    title: "Sound",
    name: "Sound",
-   level: 1,
+   level: 3,
 });
 
 SupportedComponents .addComponent (
@@ -305,14 +307,14 @@ SupportedComponents .addComponent (
 {
    title: "Texturing",
    name: "Texturing",
-   level: 3,
+   level: 4,
 });
 
 SupportedComponents .addComponent (
 {
    title: "Texturing3D",
    name: "Texturing3D",
-   level: 3,
+   level: 2,
    external: true,
 });
 
@@ -327,7 +329,7 @@ SupportedComponents .addComponent (
 {
    title: "Volume rendering",
    name: "VolumeRendering",
-   level: 2,
+   level: 4,
    external: true,
    dependencies: ["CADGeometry", "Texturing3D"],
 });