x_ite 8.9.0 → 8.9.2

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

@@ -55,8 +55,9 @@ import X3DBoundedObject     from "../Grouping/X3DBoundedObject.js";
 import TraverseType         from "../../Rendering/TraverseType.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 import X3DCast              from "../../Base/X3DCast.js";
-import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
+import Rotation4            from "../../../standard/Math/Numbers/Rotation4.js";
+import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
 function HAnimHumanoid (executionContext)
 {
@@ -70,16 +71,17 @@ function HAnimHumanoid (executionContext)
    this ._bboxSize    .setUnit ("length");
    this ._bboxCenter  .setUnit ("length");
 
-   this .skeletonNode   = new Group (executionContext);
-   this .viewpointsNode = new Group (executionContext);
-   this .skinNode       = new Group (executionContext);
-   this .transformNode  = new Transform (executionContext);
-   this .jointNodes     = [ ];
-   this .skinNormalNode = null;
-   this .skinCoordNode  = null;
-   this .restNormalNode = null;
-   this .restCoordNode  = null;
-   this .changed        = false;
+   this .skeletonNode         = new Group (executionContext);
+   this .viewpointsNode       = new Group (executionContext);
+   this .skinNode             = new Group (executionContext);
+   this .transformNode        = new Transform (executionContext);
+   this .jointNodes           = [ ];
+   this .jointBindingMatrices = [ ];
+   this .skinBindingNormal    = null;
+   this .skinBindingCoord     = null;
+   this .skinNormalNode       = null;
+   this .skinCoordNode        = null;
+   this .changed              = false;
 }
 
 Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .prototype),
@@ -145,13 +147,18 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
 
       // Skinning
 
-      this ._joints     .addInterest ("set_joints__",     this);
-      this ._skinNormal .addInterest ("set_skinNormal__", this);
-      this ._skinCoord  .addInterest ("set_skinCoord__",  this);
+      this ._joints                .addInterest ("set_joints__",            this);
+      this ._jointBindingPositions .addInterest ("set_joints__",            this);
+      this ._jointBindingRotations .addInterest ("set_joints__",            this);
+      this ._jointBindingScales    .addInterest ("set_joints__",            this);
+      this ._skinBindingNormal     .addInterest ("set_skinBindingNormal__", this);
+      this ._skinBindingCoord      .addInterest ("set_skinBindingCoord__",  this);
+      this ._skinNormal            .addInterest ("set_skinNormal__",        this);
+      this ._skinCoord             .addInterest ("set_skinCoord__",         this);
 
       this .set_joints__ ();
-      this .set_skinNormal__ ();
-      this .set_skinCoord__ ();
+      this .set_skinBindingNormal__ ();
+      this .set_skinBindingCoord__ ();
    },
    getBBox (bbox, shadows)
    {
@@ -159,19 +166,39 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
    },
    set_joints__ ()
    {
-      const jointNodes = this .jointNodes;
+      const
+         jointNodes            = this .jointNodes,
+         jointBindingMatrices  = this .jointBindingMatrices,
+         jointBindingPositions = this ._jointBindingPositions,
+         jointBindingRotations = this ._jointBindingRotations,
+         jointBindingScales    = this ._jointBindingScales;
 
       for (const jointNode of jointNodes)
          jointNode .removeInterest ("set_joint__", this);
 
-      jointNodes .length = 0;
+      jointNodes           .length = 0;
+      jointBindingMatrices .length = 0;
 
-      for (const node of this ._joints)
+      for (const [i, node] of this ._joints .entries ())
       {
          const jointNode = X3DCast (X3DConstants .HAnimJoint, node);
 
          if (jointNode)
-            jointNodes .push (jointNode);
+         {
+            const jointBindingMatrix = new Matrix4 ();
+
+            if (jointBindingPositions .length)
+               jointBindingMatrix .translate (jointBindingPositions [Math .min (i, jointBindingPositions .length - 1)] .getValue ());
+
+            if (jointBindingRotations .length)
+               jointBindingMatrix .rotate (jointBindingRotations [Math .min (i, jointBindingRotations .length - 1)] .getValue ());
+
+            if (jointBindingScales .length)
+               jointBindingMatrix .scale (jointBindingScales [Math .min (i, jointBindingScales .length - 1)] .getValue ());
+
+            jointNodes           .push (jointNode);
+            jointBindingMatrices .push (jointBindingMatrix);
+         }
       }
 
       for (const jointNode of jointNodes)
@@ -183,33 +210,38 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
    {
       this .changed = true;
    },
-   set_skinNormal__ ()
+   set_skinBindingNormal__ ()
    {
-      this .restNormalNode = null;
+      this .skinBindingNormal = X3DCast (X3DConstants .X3DNormalNode, this ._skinBindingNormal);
 
+      this .set_skinNormal__ ();
+   },
+   set_skinBindingCoord__ ()
+   {
+      this .skinBindingCoord = X3DCast (X3DConstants .X3DCoordinateNode, this ._skinBindingCoord);
+
+      this .set_skinCoord__ ();
+   },
+   set_skinNormal__ ()
+   {
       this .skinNormalNode = X3DCast (X3DConstants .X3DNormalNode, this ._skinNormal);
 
-      if (this .skinNormalNode)
-         this .restNormalNode = this .skinNormalNode .copy ();
+      if (!this .skinBindingNormal && this .skinNormalNode)
+         this .skinBindingNormal = this .skinNormalNode .copy ();
 
       this .changed = true;
    },
    set_skinCoord__ ()
    {
-      this .restCoordNode = null;
-
       this .skinCoordNode = X3DCast (X3DConstants .X3DCoordinateNode, this ._skinCoord);
 
-      if (this .skinCoordNode)
-      {
-         this .restCoordNode = this .skinCoordNode .copy ();
+      if (!this .skinBindingCoord && this .skinCoordNode)
+         this .skinBindingCoord = this .skinCoordNode .copy ();
 
+      if (this .skinCoordNode)
          delete this .skinning;
-      }
       else
-      {
          this .skinning = Function .prototype
-      }
 
       this .changed = true;
    },
@@ -223,9 +255,9 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
    {
       const
          invModelMatrix = new Matrix4 (),
-         vector         = new Vector3 (0, 0, 0),
          rest           = new Vector3 (0, 0, 0),
          skin           = new Vector3 (0, 0, 0),
+         vector         = new Vector3 (0, 0, 0),
          point          = new Vector3 (0, 0, 0);
 
       return function (type, renderObject)
@@ -239,31 +271,36 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
          this .changed = false;
 
          const
-            jointNodes     = this .jointNodes,
-            skinNormalNode = this .skinNormalNode,
-            skinCoordNode  = this .skinCoordNode,
-            restNormalNode = this .restNormalNode,
-            restCoordNode  = this .restCoordNode;
+            jointNodes           = this .jointNodes,
+            jointNodesLength     = jointNodes .length,
+            jointBindingMatrices = this .jointBindingMatrices,
+            skinBindingNormal    = this .skinBindingNormal,
+            skinBindingCoord     = this .skinBindingCoord,
+            skinNormalNode       = this .skinNormalNode,
+            skinCoordNode        = this .skinCoordNode;
 
          // Reset skin normals and coords.
 
          if (skinNormalNode)
-            skinNormalNode ._vector .assign (restNormalNode ._vector);
+            skinNormalNode ._vector .assign (skinBindingNormal ._vector);
 
-         skinCoordNode ._point .assign (restCoordNode ._point);
+         skinCoordNode ._point .assign (skinBindingCoord ._point);
 
          // Determine inverse model matrix of humanoid.
 
-         invModelMatrix .assign (this .transformNode .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ()) .inverse ();
+         invModelMatrix .assign (this .transformNode .getMatrix ())
+            .multRight (renderObject .getModelViewMatrix () .get ()) .inverse ();
 
          // Apply joint transformations.
 
-         for (const jointNode of jointNodes)
+         for (let i = 0; i < jointNodesLength; ++ i)
          {
             const
-               skinCoordIndexLength = jointNode ._skinCoordIndex .length,
-               jointMatrix          = jointNode .getModelMatrix () .multRight (invModelMatrix),
-               displacerNodes       = jointNode .getDisplacers ();
+               jointNode            = jointNodes [i],
+               jointBindingMatrix   = jointBindingMatrices [i],
+               jointMatrix          = jointNode .getModelMatrix () .multRight (invModelMatrix) .multLeft (jointBindingMatrix),
+               displacerNodes       = jointNode .getDisplacers (),
+               skinCoordIndexLength = jointNode ._skinCoordIndex .length;
 
             for (const displacerNode of displacerNodes)
             {
@@ -301,15 +338,15 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
 
                if (skinNormalNode)
                {
-                  rest .assign (restNormalNode .get1Vector (index, vector));
+                  rest .assign (skinBindingNormal .get1Vector (index, vector));
                   skinNormalNode .get1Vector (index, skin);
                   normalMatrix .multVecMatrix (vector) .subtract (rest) .multiply (weight) .add (skin);
                   skinNormalNode .set1Vector (index, vector);
-                  // Should the normals be normalized at end, or let it the shader do?
+                  // Let the shader normalize the normals.
                }
 
                //skin += (rest * J - rest) * weight
-               rest .assign (restCoordNode .get1Point (index, point));
+               rest .assign (skinBindingCoord .get1Point (index, point));
                skinCoordNode .get1Point (index, skin);
                jointMatrix .multVecMatrix (point) .subtract (rest) .multiply (weight) .add (skin);
                skinCoordNode .set1Point (index, point);
@@ -319,31 +356,31 @@ Object .assign (Object .setPrototypeOf (HAnimHumanoid .prototype, X3DChildNode .
    })(),
    toVRMLStream (generator)
    {
-      if (this .skinCoordNode)
-         this .skinCoordNode ._point = this .restCoordNode ._point;
-
       if (this .skinNormalNode)
-         this .skinNormalNode ._vector = this .restNormalNode ._vector;
+         this .skinNormalNode ._vector = this .skinBindingNormal ._vector;
+
+      if (this .skinCoordNode)
+         this .skinCoordNode ._point = this .skinBindingCoord ._point;
 
       X3DChildNode .prototype .toVRMLStream .call (this, generator);
    },
    toXMLStream (generator)
    {
-      if (this .skinCoordNode)
-         this .skinCoordNode ._point = this .restCoordNode ._point;
-
       if (this .skinNormalNode)
-         this .skinNormalNode ._vector = this .restNormalNode ._vector;
+         this .skinNormalNode ._vector = this .skinBindingNormal ._vector;
+
+      if (this .skinCoordNode)
+         this .skinCoordNode ._point = this .skinBindingCoord ._point;
 
       X3DChildNode .prototype .toXMLStream .call (this, generator);
    },
    toJSONStream (generator)
    {
-      if (this .skinCoordNode)
-         this .skinCoordNode ._point = this .restCoordNode ._point;
-
       if (this .skinNormalNode)
-         this .skinNormalNode ._vector = this .restNormalNode ._vector;
+         this .skinNormalNode ._vector = this .skinBindingNormal ._vector;
+
+      if (this .skinCoordNode)
+         this .skinCoordNode ._point = this .skinBindingCoord ._point;
 
       X3DChildNode .prototype .toJSONStream .call (this, generator);
    },
@@ -380,31 +417,31 @@ Object .defineProperties (HAnimHumanoid,
    {
       value: new FieldDefinitionArray ([
          new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",              new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "version",               new Fields .SFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "description",           new Fields .SFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "name",                  new Fields .SFString ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "version",               new Fields .SFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "info",                  new Fields .MFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "translation",           new Fields .SFVec3f ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "rotation",              new Fields .SFRotation ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "scale",                 new Fields .SFVec3f (1, 1, 1)),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "scaleOrientation",      new Fields .SFRotation ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "center",                new Fields .SFVec3f ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "jointBindingPositions", new Fields .MFVec3f ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "jointBindingRotations", new Fields .MFRotation ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "jointBindingScales",    new Fields .MFVec3f ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "motionsEnabled",        new Fields .MFBool ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "loa",                   new Fields .SFInt32 (-1)),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "skeletalConfiguration", new Fields .SFString ("BASIC")),
          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 .inputOutput,    "loa",                   new Fields .SFInt32 (-1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "skeletalConfiguration", new Fields .SFString ("BASIC")),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "skeleton",              new Fields .MFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "viewpoints",            new Fields .MFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "sites",                 new Fields .MFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "segments",              new Fields .MFNode ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput,    "joints",                new Fields .MFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "motionsEnabled",        new Fields .MFBool ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "motions",               new Fields .MFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "jointBindingPositions", new Fields .MFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "jointBindingRotations", new Fields .MFRotation ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "jointBindingScales",    new Fields .MFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "joints",                new Fields .MFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "skinBindingNormal",     new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "skinBindingCoord",      new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput,    "skinNormal",            new Fields .SFNode ()),

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

@@ -96,16 +96,16 @@ Object .defineProperties (HAnimMotion,
          new X3DFieldDefinition (X3DConstants .inputOutput, "enabled",         new Fields .SFBool (true)),
          new X3DFieldDefinition (X3DConstants .inputOnly,   "next",            new Fields .SFBool ()),
          new X3DFieldDefinition (X3DConstants .inputOnly,   "previous",        new Fields .SFBool ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "startFrame",      new Fields .SFInt32 ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "endFrame",        new Fields .SFInt32 ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "frameDuration",   new Fields .SFTime (0.1)),
          new X3DFieldDefinition (X3DConstants .inputOutput, "frameIncrement",  new Fields .SFInt32 (1)),
          new X3DFieldDefinition (X3DConstants .inputOutput, "frameIndex",      new Fields .SFInt32 (0)),
          new X3DFieldDefinition (X3DConstants .inputOutput, "loop",            new Fields .SFBool ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput, "channels",        new Fields .SFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "channelsEnabled", new Fields .MFBool ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "channels",        new Fields .SFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "joints",          new Fields .SFString ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "loa",             new Fields .SFInt32 (-1)),
-         new X3DFieldDefinition (X3DConstants .inputOutput, "startFrame",      new Fields .SFInt32 ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput, "endFrame",        new Fields .SFInt32 ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "values",          new Fields .MFFloat ()),
          new X3DFieldDefinition (X3DConstants .outputOnly,  "cycleTime",       new Fields .SFTime ()),
          new X3DFieldDefinition (X3DConstants .outputOnly,  "elapsedTime",     new Fields .SFTime ()),

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

@@ -190,7 +190,7 @@ Object .assign (Object .setPrototypeOf (X3DComposedGeometryNode .prototype, X3DG
 
       // Set size to a multiple of verticesPerPolygon.
 
-      polygonsSize  -= polygonsSize % verticesPerPolygon;
+      polygonsSize  -= polygonsSize  % verticesPerPolygon;
       trianglesSize -= trianglesSize % verticesPerFace;
 
       const

package/src/x_ite/Fields/ArrayFields.js

@@ -108,9 +108,10 @@ Object .assign (Object .setPrototypeOf (MFNode .prototype, X3DObjectArrayField .
    {
       const
          target = this .getTarget (),
-         array  = target .getValue ();
+         array  = target .getValue (),
+         length = array .length;
 
-      switch (array .length)
+      switch (length)
       {
          case 0:
          {
@@ -136,11 +137,11 @@ Object .assign (Object .setPrototypeOf (MFNode .prototype, X3DObjectArrayField .
             generator .string += generator .TidyBreak ();
             generator .IncIndent ();
 
-            for (let i = 0, length = array .length; i < length; ++ i)
+            for (let i = 0; i < length; ++ i)
             {
                generator .string += generator .Indent ();
                array [i] .toStream (generator);
-               generator .string += generator .Break ();
+               generator .string += generator .string .at (-1) === "}" ? generator .TidyBreak () : generator .Break ();
             }
 
             generator .DecIndent ();
@@ -156,9 +157,10 @@ Object .assign (Object .setPrototypeOf (MFNode .prototype, X3DObjectArrayField .
    {
       const
          target = this .getTarget (),
-         array  = target .getValue ();
+         array  = target .getValue (),
+         length = array .length;
 
-      switch (array .length)
+      switch (length)
       {
          case 0:
          {
@@ -188,7 +190,7 @@ Object .assign (Object .setPrototypeOf (MFNode .prototype, X3DObjectArrayField .
             {
                generator .string += generator .Indent ();
                element .toVRMLStream (generator);
-               generator .string += generator .Break ();
+               generator .string += generator .string .at (-1) === "}" ? generator .TidyBreak () : generator .Break ();
             }
 
             generator .DecIndent ();