x_ite 8.9.6 → 8.10.0

package/src/x_ite/Browser/Navigation/X3DViewer.js

@@ -95,17 +95,6 @@ Object .assign (Object .setPrototypeOf (X3DViewer .prototype, X3DBaseNode .proto
 
       return button;
    },
-   getPointer (event)
-   {
-      const
-         browser  = this .getBrowser (),
-         rect     = browser .getSurface () [0] .getBoundingClientRect (),
-         viewport = browser .getViewport (),
-         x        = (event .pageX - (rect .left + $(document) .scrollLeft ())) / rect .width * viewport [2],
-         y        = (rect .height - (event .pageY - (rect .top + $(document) .scrollTop ()))) / rect .height * viewport [3];
-
-      return [x, y];
-   },
    isPointerInRectangle: (() =>
    {
       const pointer = new Vector2 (0, 0);
@@ -172,7 +161,7 @@ Object .assign (Object .setPrototypeOf (X3DViewer .prototype, X3DBaseNode .proto
          viewpoint = this .getActiveViewpoint (),
          hit       = this .getBrowser () .getHit ();
 
-      viewpoint .lookAtPoint (this .getActiveLayer (), hit .point, 2 - 1.618034, straightenHorizon);
+      viewpoint .lookAtPoint (this .getActiveLayer (), hit .point, 1, 2 - 1.618034, straightenHorizon);
    },
    lookAtBBox (x, y, straightenHorizon)
    {
@@ -187,7 +176,7 @@ Object .assign (Object .setPrototypeOf (X3DViewer .prototype, X3DBaseNode .proto
          .multRight (hit .modelViewMatrix)
          .multRight (viewpoint .getCameraSpaceMatrix ());
 
-      viewpoint .lookAtBBox (this .getActiveLayer (), bbox, 2 - 1.618034, straightenHorizon);
+      viewpoint .lookAtBBox (this .getActiveLayer (), bbox, 1, 2 - 1.618034, straightenHorizon);
    },
    touch (x, y)
    {

package/src/x_ite/Browser/Networking/X3DNetworkingContext.js

@@ -45,9 +45,10 @@
  *
  ******************************************************************************/
 
-import Fields from "../../Fields.js";
-import URLs   from "./URLs.js";
-import _      from "../../../locale/gettext.js";
+import X3DConstants from "../../Base/X3DConstants.js";
+import Fields       from "../../Fields.js";
+import URLs         from "./URLs.js";
+import _            from "../../../locale/gettext.js";
 
 const
    _loadingDisplay = Symbol (),
@@ -71,7 +72,7 @@ function getBaseURI (element)
 
 function X3DNetworkingContext ()
 {
-   this .addChildObjects ("loadCount", new Fields .SFInt32 ());
+   this .addChildObjects (X3DConstants .outputOnly, "loadCount", new Fields .SFInt32 ());
 
    this [_loadingDisplay] = 0;
    this [_loadingTotal]   = 0;

package/src/x_ite/Browser/PointingDeviceSensor/PointingDevice.js

@@ -76,17 +76,6 @@ Object .assign (Object .setPrototypeOf (PointingDevice .prototype, X3DBaseNode .
       element .on ("touchstart.PointingDevice" + this .getId (), this .touchstart .bind (this));
       element .on ("touchend.PointingDevice"   + this .getId (), this .touchend   .bind (this));
    },
-   getPointer (event)
-   {
-      const
-         browser  = this .getBrowser (),
-         rect     = browser .getSurface () [0] .getBoundingClientRect (),
-         viewport = browser .getViewport (),
-         x        = (event .pageX - (rect .left + $(document) .scrollLeft ())) / rect .width * viewport [2],
-         y        = (rect .height - (event .pageY - (rect .top + $(document) .scrollTop ()))) / rect .height * viewport [3];
-
-      return [x, y];
-   },
    mousewheel (event)
    {
       // event .preventDefault () must be done in the all viewers.
@@ -104,14 +93,15 @@ Object .assign (Object .setPrototypeOf (PointingDevice .prototype, X3DBaseNode .
 
       if (event .button === 0)
       {
-         const [x, y] = this .getPointer (event);
+         const { x, y } = browser .getPointerFromEvent (event);
 
          element .off ("mousemove.PointingDevice" + this .getId ());
 
-         $(document) .on ("mouseup.PointingDevice"   + this .getId (), this .mouseup   .bind (this));
-         $(document) .on ("mousemove.PointingDevice" + this .getId (), this .mousemove .bind (this));
-         $(document) .on ("touchend.PointingDevice"  + this .getId (), this .touchend  .bind (this));
-         $(document) .on ("touchmove.PointingDevice" + this .getId (), this .touchmove .bind (this));
+         $(document)
+            .on ("mouseup.PointingDevice"   + this .getId (), this .mouseup   .bind (this))
+            .on ("mousemove.PointingDevice" + this .getId (), this .mousemove .bind (this))
+            .on ("touchend.PointingDevice"  + this .getId (), this .touchend  .bind (this))
+            .on ("touchmove.PointingDevice" + this .getId (), this .touchmove .bind (this));
 
          if (browser .buttonPressEvent (x, y))
          {
@@ -133,7 +123,7 @@ Object .assign (Object .setPrototypeOf (PointingDevice .prototype, X3DBaseNode .
             browser = this .getBrowser (),
             element = browser .getSurface ();
 
-         const [x, y] = this .getPointer (event);
+         const { x, y } = browser .getPointerFromEvent (event);
 
          $(document) .off (".PointingDevice" + this .getId ());
          element .on ("mousemove.PointingDevice" + this .getId (), this .mousemove .bind (this));
@@ -162,7 +152,7 @@ Object .assign (Object .setPrototypeOf (PointingDevice .prototype, X3DBaseNode .
 
       this .motionTime = browser .getCurrentTime ();
 
-      const [x, y] = this .getPointer (event);
+      const { x, y } = browser .getPointerFromEvent (event);
 
       this .onmotion (x, y);
    },

package/src/x_ite/Browser/PointingDeviceSensor/X3DPointingDeviceSensorContext.js

@@ -153,6 +153,17 @@ Object .assign (X3DPointingDeviceSensorContext .prototype,
    {
       return this [_pointer];
    },
+   getPointerFromEvent ({ pageX, pageY })
+   {
+      const
+         offset   = this .getSurface () .offset (),
+         rect     = this .getSurface () [0] .getBoundingClientRect (),
+         viewport = this .getViewport (),
+         x        =      (pageX - offset .left) / rect .width   * viewport [2],
+         y        = (1 - (pageY - offset .top)  / rect .height) * viewport [3];
+
+      return new Vector2 (x, y);
+   },
    isPointerInRectangle (rectangle, pointer = this [_pointer])
    {
       return pointer .x >= rectangle .x &&
@@ -320,7 +331,7 @@ Object .assign (X3DPointingDeviceSensorContext .prototype,
       for (const sensor of this [_activeSensors])
          sensor .set_motion__ (hit);
    },
-   getPointingShader (numClipPlanes, shapeNode)
+   getPointingShader (numClipPlanes, shapeNode, humanoidNode)
    {
       const geometryContext = shapeNode .getGeometryContext ();
 
@@ -330,6 +341,7 @@ Object .assign (X3DPointingDeviceSensorContext .prototype,
       key += ".";
       key += shapeNode .getShapeKey ();
       key += geometryContext .geometryType;
+      key += humanoidNode ? 1 : 0;
 
       if (geometryContext .geometryType >= 2)
       {
@@ -346,9 +358,9 @@ Object .assign (X3DPointingDeviceSensorContext .prototype,
          key += appearanceNode .getMaterial () .getTextureBits () .toString (4); // Textures for point and line.
       }
 
-      return this [_pointingShaders] .get (key) || this .createPointingShader (key, numClipPlanes, shapeNode);
+      return this [_pointingShaders] .get (key) || this .createPointingShader (key, numClipPlanes, shapeNode, humanoidNode);
    },
-   createPointingShader (key, numClipPlanes, shapeNode)
+   createPointingShader (key, numClipPlanes, shapeNode, humanoidNode)
    {
       const
          appearanceNode  = shapeNode .getAppearance (),
@@ -369,8 +381,8 @@ Object .assign (X3DPointingDeviceSensorContext .prototype,
       if (appearanceNode .getStyleProperties (geometryContext .geometryType))
          options .push ("X3D_STYLE_PROPERTIES");
 
-      if (+appearanceNode .getTextureBits () || +appearanceNode .getMaterial () .getTextureBits ())
-         options .push ("X3D_TEXTURE", "X3D_NUM_TEXTURE_COORDINATES 1")
+      if (humanoidNode)
+         options .push ("X3D_SKINNING");
 
       const shaderNode = this .createShader ("PointingShader", "Pointing", "Pointing", options);
 

package/src/x_ite/Browser/Rendering/X3DRenderingContext.js

@@ -166,7 +166,7 @@ Object .assign (X3DRenderingContext .prototype,
    {
       return this [_frameBuffer];
    },
-   getDepthShader (numClipPlanes, shapeNode)
+   getDepthShader (numClipPlanes, shapeNode, humanoidNode)
    {
       const geometryContext = shapeNode .getGeometryContext ();
 
@@ -176,6 +176,7 @@ Object .assign (X3DRenderingContext .prototype,
       key += ".";
       key += shapeNode .getShapeKey ();
       key += geometryContext .geometryType;
+      key += humanoidNode ? 1 : 0;
 
       if (geometryContext .geometryType >= 2)
       {
@@ -192,9 +193,9 @@ Object .assign (X3DRenderingContext .prototype,
          key += appearanceNode .getMaterial () .getTextureBits () .toString (4); // Textures for point and line.
       }
 
-      return this [_depthShaders] .get (key) || this .createDepthShader (key, numClipPlanes, shapeNode);
+      return this [_depthShaders] .get (key) || this .createDepthShader (key, numClipPlanes, shapeNode, humanoidNode);
    },
-   createDepthShader (key, numClipPlanes, shapeNode)
+   createDepthShader (key, numClipPlanes, shapeNode, humanoidNode)
    {
       const
          appearanceNode  = shapeNode .getAppearance (),
@@ -215,8 +216,8 @@ Object .assign (X3DRenderingContext .prototype,
       if (appearanceNode .getStyleProperties (geometryContext .geometryType))
          options .push ("X3D_STYLE_PROPERTIES");
 
-      if (+appearanceNode .getTextureBits () || +appearanceNode .getMaterial () .getTextureBits ())
-         options .push ("X3D_TEXTURE", "X3D_NUM_TEXTURE_COORDINATES 1")
+      if (humanoidNode)
+         options .push ("X3D_SKINNING");
 
       const shaderNode = this .createShader ("DepthShader", "Depth", "Depth", options);
 

package/src/x_ite/Browser/Shaders/Shaders.js

@@ -75,9 +75,11 @@ import Perlin2                from "../../../assets/shaders/webgl2/include/Perli
 import Point2                 from "../../../assets/shaders/webgl2/include/Point.glsl.js";
 import PointSize2             from "../../../assets/shaders/webgl2/include/PointSize.glsl.js";
 import Shadow2                from "../../../assets/shaders/webgl2/include/Shadow.glsl.js";
+import Skin2                  from "../../../assets/shaders/webgl2/include/Skin.glsl.js";
 import Stipple2               from "../../../assets/shaders/webgl2/include/Stipple.glsl.js";
 import SpotFactor2            from "../../../assets/shaders/webgl2/include/SpotFactor.glsl.js";
 import Texture2               from "../../../assets/shaders/webgl2/include/Texture.glsl.js";
+import Utils2                 from "../../../assets/shaders/webgl2/include/Utils.glsl.js";
 import Vertex2                from "../../../assets/shaders/webgl2/include/Vertex.glsl.js";
 
 /* WebGL 1 */
@@ -138,9 +140,11 @@ const Shaders = {
          Point: Point2,
          PointSize: PointSize2,
          Shadow: Shadow2,
+         Skin: Skin2,
          Stipple: Stipple2,
          SpotFactor: SpotFactor2,
          Texture: Texture2,
+         Utils: Utils2,
          Vertex: Vertex2,
       },
    },

package/src/x_ite/Browser/Shape/X3DShapeContext.js

@@ -179,9 +179,9 @@ Object .assign (X3DShapeContext .prototype,
       ];
 
       const transformFeedbackVaryings = [
-         "lineStipple0", "fogDepth0", "color0", "normal0", "vertex0",
-         "lineStipple1", "fogDepth1", "color1", "normal1", "vertex1",
-         "lineStipple2", "fogDepth2", "color2", "normal2", "vertex2",
+         "coordIndex0", "lineStipple0", "fogDepth0", "color0", "normal0", "vertex0",
+         "coordIndex1", "lineStipple1", "fogDepth1", "color1", "normal1", "vertex1",
+         "coordIndex2", "lineStipple2", "fogDepth2", "color2", "normal2", "vertex2",
       ];
 
       this [_lineTransformShaderNode] = this .createShader ("LineTransformShader", "LineTransform", "LineTransform", [ ], uniformNames, transformFeedbackVaryings);

package/src/x_ite/Browser/Sound/X3DSoundContext.js

@@ -45,12 +45,13 @@
  *
  ******************************************************************************/
 
-import Fields from "../../Fields.js";
+import X3DConstants from "../../Base/X3DConstants.js";
+import Fields       from "../../Fields.js";
 
 function X3DSoundContext ()
 {
-   this .addChildObjects ("volume", new Fields .SFFloat (1),
-                          "mute",   new Fields .SFBool ());
+   this .addChildObjects (X3DConstants .outputOnly, "volume", new Fields .SFFloat (1),
+                          X3DConstants .outputOnly, "mute",   new Fields .SFBool ());
 }
 
 export default X3DSoundContext;

package/src/x_ite/Browser/Text/PolygonText.js

@@ -45,9 +45,9 @@
  *
  ******************************************************************************/
 
+import Fields           from "../../Fields.js";
 import PrimitiveQuality from "../Core/PrimitiveQuality.js";
 import X3DTextGeometry  from "./X3DTextGeometry.js";
-import X3DGeometryNode  from "../../Components/Rendering/X3DGeometryNode.js";
 import Vector3          from "../../../standard/Math/Numbers/Vector3.js";
 import Matrix4          from "../../../standard/Math/Numbers/Matrix4.js";
 import Bezier           from "../../../standard/Math/Algorithms/Bezier.js";
@@ -59,7 +59,7 @@ function PolygonText (text, fontStyle)
 
    text ._transparent = false;
 
-   this .texCoordArray = X3DGeometryNode .createArray ();
+   this .texCoordArray = new Fields .MFFloat ();
 }
 
 Object .assign (Object .setPrototypeOf (PolygonText .prototype, X3DTextGeometry .prototype),

package/src/x_ite/Browser/Texturing/X3DTexturingContext.js

@@ -90,7 +90,7 @@ Object .assign (X3DTexturingContext .prototype,
 
       const maxCombinedTextureUnits = gl .getParameter (gl .MAX_COMBINED_TEXTURE_IMAGE_UNITS);
 
-      this [_combinedTextureUnits] = [...Array (maxCombinedTextureUnits) .keys ()];
+      this [_combinedTextureUnits] = [...Array (maxCombinedTextureUnits) .keys ()] .reverse ();
       this [_texture2DUnits]       = [this [_combinedTextureUnits] .pop ()];
       this [_texture3DUnits]       = [this [_combinedTextureUnits] .pop ()];
       this [_textureCubeUnits]     = [this [_combinedTextureUnits] .pop ()];

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.9.6";
+export default "8.10.0";

package/src/x_ite/Browser/X3DBrowser.js

@@ -96,9 +96,16 @@ function X3DBrowser (element)
    this [_supportedComponents] = SupportedComponents .copy ();
    this [_concreteNodes]       = ConcreteNodes .copy ();
    this [_abstractNodes]       = AbstractNodes .copy ();
-   this [_browserCallbacks]    = new Map ();
    this [_console]             = document .getElementsByClassName ("x_ite-console");
 
+   this [_browserCallbacks] = new Map ([
+      [X3DConstants .CONNECTION_ERROR,  new Map ()],
+      [X3DConstants .BROWSER_EVENT,     new Map ()],
+      [X3DConstants .INITIALIZED_EVENT, new Map ()],
+      [X3DConstants .SHUTDOWN_EVENT,    new Map ()],
+      [X3DConstants .INITIALIZED_ERROR, new Map ()],
+   ]);
+
    this .setup ();
 };
 
@@ -216,7 +223,7 @@ Object .assign (Object .setPrototypeOf (X3DBrowser .prototype, X3DBrowserContext
 
       if (component)
       {
-         return new ComponentInfo (name,
+         return new ComponentInfo (component .name,
             Algorithm .clamp (level || component .level, 1, component .level),
             component .title,
             component .providerUrl,
@@ -666,30 +673,52 @@ Object .assign (Object .setPrototypeOf (X3DBrowser .prototype, X3DBrowserContext
    {
       // The string describes the name of the callback function to be called within the current ECMAScript context.
    },
-   addBrowserCallback (key, object)
+   addBrowserCallback (... args)
    {
-      this [_browserCallbacks] .set (key, object);
+      switch (args .length)
+      {
+         case 2:
+         {
+            const [key, object] = args;
+
+            this [_browserCallbacks] .forEach (map => map .set (key, object));
+            break;
+         }
+         case 3:
+         {
+            const [key, event, object] = args;
+
+            this [_browserCallbacks] .get (event) .set (key, object);
+            break;
+         }
+      }
    },
-   removeBrowserCallback (key)
+   removeBrowserCallback (key, event)
    {
-      this [_browserCallbacks] .delete (key);
+      if (arguments .length === 2)
+         this [_browserCallbacks] .get (event) .delete (key);
+      else
+         this [_browserCallbacks] .forEach (map => map .delete (key));
    },
-   getBrowserCallbacks ()
+   getBrowserCallbacks (event)
    {
-      return this [_browserCallbacks];
+      if (arguments .length === 1)
+         return this [_browserCallbacks] .get (event);
+      else
+         return new Map ([... this [_browserCallbacks]] .flatMap (([event, map]) => [... map]));
    },
    callBrowserCallbacks: (() =>
    {
-      const browserCallbacks = [ ];
+      const values = [ ];
 
-      return function (browserEvent)
+      return function (event)
       {
-         if (this [_browserCallbacks] .size)
+         const browserCallbacks = this [_browserCallbacks] .get (event);
+
+         if (browserCallbacks .size)
          {
-            for (const browserCallback of MapUtilities .values (browserCallbacks, this [_browserCallbacks]))
-            {
-               browserCallback (browserEvent);
-            }
+            for (const callback of MapUtilities .values (values, browserCallbacks))
+               callback (event);
          }
       };
    })(),
@@ -749,14 +778,17 @@ Object .assign (Object .setPrototypeOf (X3DBrowser .prototype, X3DBrowserContext
    {
       return this .getRenderingProperties () .getField (name) .getValue ();
    },
-   viewAll (layerNode)
+   viewAll (layerNode, transitionTime = 1)
    {
+      if (arguments .length === 1 && typeof layerNode === "number")
+         transitionTime = layerNode;
+
       layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
 
-      layerNode .viewAll (1, this .getBrowserOption ("StraightenHorizon"));
+      layerNode .viewAll (transitionTime, 1, this .getBrowserOption ("StraightenHorizon"));
    },
    firstViewpoint (layerNode)
    {

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -46,6 +46,7 @@
  ******************************************************************************/
 
 import SFTime                         from "../Fields/SFTime.js";
+import X3DConstants                   from "../Base/X3DConstants.js";
 import X3DBaseNode                    from "../Base/X3DBaseNode.js";
 import X3DCoreContext                 from "./Core/X3DCoreContext.js";
 import X3DEnvironmentalEffectsContext from "./EnvironmentalEffects/X3DEnvironmentalEffectsContext.js";
@@ -117,13 +118,13 @@ function X3DBrowserContext (element)
    for (const browserContext of browserContexts)
       browserContext .call (this);
 
-   this .addChildObjects ("initialized",    new SFTime (),
-                          "shutdown",       new SFTime (),
-                          "prepareEvents",  new SFTime (),
-                          "timeEvents",     new SFTime (),
-                          "sensorEvents",   new SFTime (),
-                          "displayEvents",  new SFTime (),
-                          "finishedEvents", new SFTime ());
+   this .addChildObjects (X3DConstants .outputOnly, "initialized",    new SFTime (),
+                          X3DConstants .outputOnly, "shutdown",       new SFTime (),
+                          X3DConstants .outputOnly, "prepareEvents",  new SFTime (),
+                          X3DConstants .outputOnly, "timeEvents",     new SFTime (),
+                          X3DConstants .outputOnly, "sensorEvents",   new SFTime (),
+                          X3DConstants .outputOnly, "displayEvents",  new SFTime (),
+                          X3DConstants .outputOnly, "finishedEvents", new SFTime ());
 
    this [_changedTime]    = 0;
    this [_previousTime]   = 0;

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

@@ -58,11 +58,8 @@ function X3DChildNode (executionContext)
 
    this .addType (X3DConstants .X3DChildNode);
 
-   this .addChildObjects ("isCameraObject",   new Fields .SFBool (),
-                          "isPickableObject", new Fields .SFBool ());
-
-   this ._isCameraObject   .setAccessType (X3DConstants .outputOnly);
-   this ._isPickableObject .setAccessType (X3DConstants .outputOnly);
+   this .addChildObjects (X3DConstants .outputOnly, "isCameraObject",   new Fields .SFBool (),
+                          X3DConstants .outputOnly, "isPickableObject", new Fields .SFBool ());
 }
 
 Object .assign (Object .setPrototypeOf (X3DChildNode .prototype, X3DNode .prototype),

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

@@ -96,6 +96,19 @@ Object .assign (Object .setPrototypeOf (X3DPrototypeInstance .prototype, X3DNode
 
       if (protoNode .isExternProto)
       {
+         if (protoNode .checkLoadState () !== X3DConstants .COMPLETE_STATE)
+         {
+            this [_body] = null;
+
+            if (this .isInitialized ())
+               X3DChildObject .prototype .addEvent .call (this);
+
+            protoNode ._updateInstances .addInterest ("construct", this);
+            protoNode .requestImmediateLoad () .catch (Function .prototype);
+
+            return;
+         }
+
          for (const protoField of proto .getUserDefinedFields ())
          {
             try
@@ -233,20 +246,7 @@ Object .assign (Object .setPrototypeOf (X3DPrototypeInstance .prototype, X3DNode
 
       protoNode ._name_changed .addFieldInterest (this ._typeName_changed);
 
-      if (protoNode .isExternProto && protoNode .checkLoadState () !== X3DConstants .COMPLETE_STATE)
-      {
-         this [_body] = null;
-
-         if (this .isInitialized ())
-            X3DChildObject .prototype .addEvent .call (this);
-
-         protoNode ._updateInstances .addInterest ("construct", this);
-         protoNode .requestImmediateLoad () .catch (Function .prototype);
-      }
-      else
-      {
-         this .construct ();
-      }
+      this .construct ();
    },
    getBody ()
    {

package/src/x_ite/Components/CubeMapTexturing/ComposedCubeMapTexture.js

@@ -69,7 +69,7 @@ function ComposedCubeMapTexture (executionContext)
       this .addAlias ("bottom", this ._bottomTexture);
    }
 
-   this .addChildObjects ("update", new Fields .SFTime ());
+   this .addChildObjects (X3DConstants .inputOutput, "update", new Fields .SFTime ());
 
    this .textureNodes = [null, null, null, null, null, null];
    this .textureBits  = new BitSet ();

package/src/x_ite/Components/EnvironmentalSensor/X3DEnvironmentalSensorNode.js

@@ -56,7 +56,7 @@ function X3DEnvironmentalSensorNode (executionContext)
 
    this .addType (X3DConstants .X3DEnvironmentalSensorNode);
 
-   this .addChildObjects ("traversed", new Fields .SFBool (true));
+   this .addChildObjects (X3DConstants .outputOnly, "traversed", new Fields .SFBool (true));
 
    this ._size   .setUnit ("length");
    this ._center .setUnit ("length");

package/src/x_ite/Components/Geometry3D/ElevationGrid.js

@@ -223,8 +223,8 @@ Object .assign (Object .setPrototypeOf (ElevationGrid .prototype, X3DGeometryNod
          normals .push (normal);
       }
 
-      // if (!this ._normalPerVertex .getValue ())
-      //    return normals;
+      if (!this ._normalPerVertex .getValue ())
+         return normals;
 
       return this .refineNormals (normalIndex, normals, this ._creaseAngle .getValue ());
    },
@@ -293,6 +293,7 @@ Object .assign (Object .setPrototypeOf (ElevationGrid .prototype, X3DGeometryNod
          colorPerVertex     = this ._colorPerVertex .getValue (),
          normalPerVertex    = this ._normalPerVertex .getValue (),
          coordIndex         = this .createCoordIndex (),
+         coordIndicesArray  = this .getCoordIndices (),
          attribNodes        = this .getAttrib (),
          numAttribNodes     = attribNodes .length,
          attribArrays       = this .getAttribs (),
@@ -332,6 +333,8 @@ Object .assign (Object .setPrototypeOf (ElevationGrid .prototype, X3DGeometryNod
                index = coordIndex [c],
                point = points [index];
 
+            coordIndicesArray .push (index);
+
             for (let a = 0; a < numAttribNodes; ++ a)
                attribNodes [a] .addValue (index, attribArrays [a]);
 

package/src/x_ite/Components/Geometry3D/Extrusion.js

@@ -337,11 +337,12 @@ Object .assign (Object .setPrototypeOf (Extrusion .prototype, X3DGeometryNode .p
       return function ()
       {
          const
-            cw            = ! this ._ccw .getValue (),
-            crossSection  = this ._crossSection,
-            spine         = this ._spine,
-            numSpines     = spine .length,
-            texCoordArray = this .getTexCoords ();
+            cw                = ! this ._ccw .getValue (),
+            crossSection      = this ._crossSection,
+            spine             = this ._spine,
+            numSpines         = spine .length,
+            coordIndicesArray = this .getCoordIndices (),
+            texCoordArray     = this .getTexCoords ();
 
          if (numSpines < 2 || crossSection .length < 2)
             return;
@@ -477,6 +478,8 @@ Object .assign (Object .setPrototypeOf (Extrusion .prototype, X3DGeometryNode .p
 
                if (l1)
                {
+                  coordIndicesArray .push (i1, i2, i3);
+
                   // p1
                   if (l2)
                   {
@@ -511,6 +514,8 @@ Object .assign (Object .setPrototypeOf (Extrusion .prototype, X3DGeometryNode .p
 
                if (l2)
                {
+                  coordIndicesArray .push (i1, i3, i4);
+
                   // p1
                   texCoordArray .push (k / numCrossSection_1, n / numSpine_1, 0, 1);
                   normalIndex .get (i1) .push (normals .length);
@@ -642,18 +647,24 @@ Object .assign (Object .setPrototypeOf (Extrusion .prototype, X3DGeometryNode .p
    addCap (texCoordArray, texCoord, normal, vertices, triangles)
    {
       const
-         normalArray = this .getNormals (),
-         vertexArray = this .getVertices ();
+         coordIndicesArray = this .getCoordIndices (),
+         normalArray       = this .getNormals (),
+         vertexArray       = this .getVertices ();
 
       for (let i = 0, length = triangles .length; i < length; i += 3)
       {
          const
-            p0 = vertices [triangles [i]],
-            p1 = vertices [triangles [i + 1]],
-            p2 = vertices [triangles [i + 2]],
-            t0 = texCoord [triangles [i]],
-            t1 = texCoord [triangles [i + 1]],
-            t2 = texCoord [triangles [i + 2]];
+            i1 = triangles [i],
+            i2 = triangles [i + 1],
+            i3 = triangles [i + 2],
+            p0 = vertices [i1],
+            p1 = vertices [i2],
+            p2 = vertices [i3],
+            t0 = texCoord [i1],
+            t1 = texCoord [i2],
+            t2 = texCoord [i3];
+
+         coordIndicesArray .push (i1, i2, i3);
 
          texCoordArray .push (t0 .x, t0 .y, 0, 1);
          texCoordArray .push (t1 .x, t1 .y, 0, 1);

package/src/x_ite/Components/Geometry3D/IndexedFaceSet.js

@@ -126,6 +126,7 @@ Object .assign (Object .setPrototypeOf (IndexedFaceSet .prototype, X3DComposedGe
          colorPerVertex     = this ._colorPerVertex .getValue (),
          normalPerVertex    = this ._normalPerVertex .getValue (),
          coordIndex         = this ._coordIndex .getValue (),
+         coordIndicesArray  = this .getCoordIndices (),
          attribNodes        = this .getAttrib (),
          numAttribNodes     = attribNodes .length,
          attribArrays       = this .getAttribs (),
@@ -152,6 +153,8 @@ Object .assign (Object .setPrototypeOf (IndexedFaceSet .prototype, X3DComposedGe
          {
             const index = coordIndex [i];
 
+            coordIndicesArray .push (index);
+
             for (let a = 0; a < numAttribNodes; ++ a)
                attribNodes [a] .addValue (index, attribArrays [a]);
 
@@ -378,8 +381,8 @@ Object .assign (Object .setPrototypeOf (IndexedFaceSet .prototype, X3DComposedGe
             normal .negate ();
       }
 
-      // if (!this ._normalPerVertex .getValue ())
-      //    return normals;
+      if (!this ._normalPerVertex .getValue ())
+         return normals;
 
       return this .refineNormals (normalIndex, normals, this ._creaseAngle .getValue ());
    },