x_ite 8.3.2 → 8.3.3

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

@@ -49,7 +49,6 @@ import X3DChildObject      from "../../Base/X3DChildObject.js";
 import X3DNode             from "./X3DNode.js";
 import X3DExecutionContext from "../../Execution/X3DExecutionContext.js";
 import X3DConstants        from "../../Base/X3DConstants.js";
-import Generator           from "../../InputOutput/Generator.js";
 
 const
    _protoNode        = Symbol (),
@@ -86,6 +85,23 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
    },
    getContainerField: function ()
    {
+      // Determine container field from proto.
+
+      // const proto = this [_protoNode];
+
+      // if (! proto .isExternProto)
+      // {
+      //    const rootNodes = proto .getBody () .getRootNodes ();
+
+      //    if (rootNodes .length)
+      //    {
+      //       const rootNode = rootNodes [0];
+
+      //       if (rootNode)
+      //          return rootNode .getValue () .getContainerField ();
+      //    }
+      // }
+
       return "children";
    },
    initialize: function ()
@@ -361,11 +377,9 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
          }
       }
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const
-         generator  = Generator .Get (stream),
-         sharedNode = generator .IsSharedNode (this);
+      const sharedNode = generator .IsSharedNode (this);
 
       generator .EnterScope ();
 
@@ -375,16 +389,16 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
       {
          if (generator .ExistsNode (this))
          {
-            stream .string += generator .Indent ();
-            stream .string += "<ProtoInstance";
-            stream .string += " ";
-            stream .string += "name='";
-            stream .string += generator .XMLEncode (this .getTypeName ());
-            stream .string += "'";
-            stream .string += " ";
-            stream .string += "USE='";
-            stream .string += generator .XMLEncode (name);
-            stream .string += "'";
+            generator .string += generator .Indent ();
+            generator .string += "<ProtoInstance";
+            generator .string += generator .Space ();
+            generator .string += "name='";
+            generator .string += generator .XMLEncode (this .getTypeName ());
+            generator .string += "'";
+            generator .string += generator .Space ();
+            generator .string += "USE='";
+            generator .string += generator .XMLEncode (name);
+            generator .string += "'";
 
             const containerField = generator .ContainerField ();
 
@@ -392,35 +406,35 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
             {
                if (containerField .getName () !== this .getContainerField ())
                {
-                  stream .string += " ";
-                  stream .string += "containerField='";
-                  stream .string += generator .XMLEncode (containerField .getName ());
-                  stream .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "containerField='";
+                  generator .string += generator .XMLEncode (containerField .getName ());
+                  generator .string += "'";
                }
             }
 
-            stream .string += "/>";
+            generator .string += "/>";
 
             generator .LeaveScope ();
             return;
          }
       }
 
-      stream .string += generator .Indent ();
-      stream .string += "<ProtoInstance";
-      stream .string += " ";
-      stream .string += "name='";
-      stream .string += generator .XMLEncode (this .getTypeName ());
-      stream .string += "'";
+      generator .string += generator .Indent ();
+      generator .string += "<ProtoInstance";
+      generator .string += generator .Space ();
+      generator .string += "name='";
+      generator .string += generator .XMLEncode (this .getTypeName ());
+      generator .string += "'";
 
       if (name .length)
       {
          generator .AddNode (this);
 
-         stream .string += " ";
-         stream .string += "DEF='";
-         stream .string += generator .XMLEncode (name);
-         stream .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "DEF='";
+         generator .string += generator .XMLEncode (name);
+         generator .string += "'";
       }
 
       const containerField = generator .ContainerField ();
@@ -429,10 +443,10 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
       {
          if (containerField .getName () !== this .getContainerField ())
          {
-            stream .string += " ";
-            stream .string += "containerField='";
-            stream .string += generator .XMLEncode (containerField .getName ());
-            stream .string += "'";
+            generator .string += generator .Space ();
+            generator .string += "containerField='";
+            generator .string += generator .XMLEncode (containerField .getName ());
+            generator .string += "'";
          }
       }
 
@@ -440,11 +454,12 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       if (fields .length === 0)
       {
-         stream .string += "/>";
+         generator .string += "/>";
       }
       else
       {
-         stream .string += ">\n";
+         generator .string += ">";
+         generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
@@ -485,33 +500,36 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                {
                   case X3DConstants .MFNode:
                   {
-                     stream .string += generator .Indent ();
-                     stream .string += "<fieldValue";
-                     stream .string += " ";
-                     stream .string += "name='";
-                     stream .string += generator .XMLEncode (field .getName ());
-                     stream .string += "'";
+                     generator .string += generator .Indent ();
+                     generator .string += "<fieldValue";
+                     generator .string += generator .Space ();
+                     generator .string += "name='";
+                     generator .string += generator .XMLEncode (field .getName ());
+                     generator .string += "'";
 
                      if (field .length === 0)
                      {
-                        stream .string += "/>\n";
+                        generator .string += "/>";
+                        generator .string += generator .TidyBreak ();
                      }
                      else
                      {
                         generator .PushContainerField (field);
 
-                        stream .string += ">\n";
+                        generator .string += ">";
+                        generator .string += generator .TidyBreak ();
 
                         generator .IncIndent ();
 
-                        field .toXMLStream (stream);
+                        field .toXMLStream (generator);
 
-                        stream .string += "\n";
+                        generator .string += generator .TidyBreak ();
 
                         generator .DecIndent ();
 
-                        stream .string += generator .Indent ();
-                        stream .string += "</fieldValue>\n";
+                        generator .string += generator .Indent ();
+                        generator .string += "</fieldValue>";
+                        generator .string += generator .TidyBreak ();
 
                         generator .PopContainerField ();
                      }
@@ -524,24 +542,26 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                      {
                         generator .PushContainerField (field);
 
-                        stream .string += generator .Indent ();
-                        stream .string += "<fieldValue";
-                        stream .string += " ";
-                        stream .string += "name='";
-                        stream .string += generator .XMLEncode (field .getName ());
-                        stream .string += "'";
-                        stream .string += ">\n";
+                        generator .string += generator .Indent ();
+                        generator .string += "<fieldValue";
+                        generator .string += generator .Space ();
+                        generator .string += "name='";
+                        generator .string += generator .XMLEncode (field .getName ());
+                        generator .string += "'";
+                        generator .string += ">";
+                        generator .string += generator .TidyBreak ();
 
                         generator .IncIndent ();
 
-                        field .toXMLStream (stream);
+                        field .toXMLStream (generator);
 
-                        stream .string += "\n";
+                        generator .string += generator .TidyBreak ();
 
                         generator .DecIndent ();
 
-                        stream .string += generator .Indent ();
-                        stream .string += "</fieldValue>\n";
+                        generator .string += generator .Indent ();
+                        generator .string += "</fieldValue>";
+                        generator .string += generator .TidyBreak ();
 
                         generator .PopContainerField ();
                         break;
@@ -551,19 +571,20 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                   }
                   default:
                   {
-                     stream .string += generator .Indent ();
-                     stream .string += "<fieldValue";
-                     stream .string += " ";
-                     stream .string += "name='";
-                     stream .string += generator .XMLEncode (field .getName ());
-                     stream .string += "'";
-                     stream .string += " ";
-                     stream .string += "value='";
-
-                     field .toXMLStream (stream);
-
-                     stream .string += "'";
-                     stream .string += "/>\n";
+                     generator .string += generator .Indent ();
+                     generator .string += "<fieldValue";
+                     generator .string += generator .Space ();
+                     generator .string += "name='";
+                     generator .string += generator .XMLEncode (field .getName ());
+                     generator .string += "'";
+                     generator .string += generator .Space ();
+                     generator .string += "value='";
+
+                     field .toXMLStream (generator);
+
+                     generator .string += "'";
+                     generator .string += "/>";
+                     generator .string += generator .TidyBreak ();
                      break;
                   }
                }
@@ -576,9 +597,9 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
          if (references .length && ! sharedNode)
          {
-            stream .string += generator .Indent ();
-            stream .string += "<IS>";
-            stream .string += "\n";
+            generator .string += generator .Indent ();
+            generator .string += "<IS>";
+            generator .string += generator .TidyBreak ();
 
             generator .IncIndent ();
 
@@ -588,30 +609,32 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
                protoFields .forEach (function (protoField)
                {
-                  stream .string += generator .Indent ();
-                  stream .string += "<connect";
-                  stream .string += " ";
-                  stream .string += "nodeField='";
-                  stream .string += generator .XMLEncode (field .getName ());
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "protoField='";
-                  stream .string += generator .XMLEncode (protoField .getName ());
-                  stream .string += "'";
-                  stream .string += "/>\n";
+                  generator .string += generator .Indent ();
+                  generator .string += "<connect";
+                  generator .string += generator .Space ();
+                  generator .string += "nodeField='";
+                  generator .string += generator .XMLEncode (field .getName ());
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "protoField='";
+                  generator .string += generator .XMLEncode (protoField .getName ());
+                  generator .string += "'";
+                  generator .string += "/>";
+                  generator .string += generator .TidyBreak ();
                });
             }
 
             generator .DecIndent ();
 
-            stream .string += generator .Indent ();
-            stream .string += "</IS>\n";
+            generator .string += generator .Indent ();
+            generator .string += "</IS>";
+            generator .string += generator .TidyBreak ();
          }
 
          generator .DecIndent ();
 
-         stream .string += generator .Indent ();
-         stream .string += "</ProtoInstance>";
+         generator .string += generator .Indent ();
+         generator .string += "</ProtoInstance>";
       }
 
       generator .LeaveScope ();

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,14 @@ 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);
    },
    skinning: (function ()
    {
-      var
+      const
          invModelMatrix = new Matrix4 (),
          vector         = new Vector3 (0, 0, 0),
          rest           = new Vector3 (0, 0, 0),
@@ -252,8 +258,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 +278,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 +307,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/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;