x_ite 8.6.8 → 8.6.9

package/src/x_ite/Browser/Core/Context.js

@@ -192,70 +192,70 @@ const Context =
 
       // Async functions
 
-      // Object .assign (gl, gl .getVersion () === 1
-      // ? {
-      //    readPixelsAsync: gl .readPixels,
-      // }
-      // : {
-      //    clientWaitAsync: function (sync, flags, timeout)
-      //    {
-      //       return new Promise ((resolve, reject) =>
-      //       {
-      //          const check = () =>
-      //          {
-      //             const result = this .clientWaitSync (sync, flags, 0);
-
-      //             switch (result)
-      //             {
-      //                case this .WAIT_FAILED:
-      //                {
-      //                   reject ();
-      //                   return;
-      //                }
-      //                case this .TIMEOUT_EXPIRED:
-      //                {
-      //                   setTimeout (check, timeout);
-      //                   return;
-      //                }
-      //                default:
-      //                {
-      //                   resolve ();
-      //                   return;
-      //                }
-      //             }
-      //          };
-
-      //          check ();
-      //       });
-      //    },
-      //    getBufferSubDataAsync: async function (target, buffer, srcByteOffset, dstBuffer, /* optional */ dstOffset, /* optional */ length)
-      //    {
-      //       const sync = this .fenceSync (this .SYNC_GPU_COMMANDS_COMPLETE, 0);
-
-      //       this .flush ();
-
-      //       await this .clientWaitAsync (sync, 0, 10);
-
-      //       this .deleteSync (sync);
-
-      //       this .bindBuffer (target, buffer);
-      //       this .getBufferSubData (target, srcByteOffset, dstBuffer, dstOffset, length);
-      //       this .bindBuffer (target, null);
-      //    },
-      //    readPixelsAsync: async function (x, y, w, h, format, type, dest, dstOffset)
-      //    {
-      //       const buffer = this .createBuffer ();
-
-      //       this .bindBuffer (this .PIXEL_PACK_BUFFER, buffer);
-      //       this .bufferData (this .PIXEL_PACK_BUFFER, dest .byteLength, this .STREAM_READ);
-      //       this .readPixels (x, y, w, h, format, type, 0);
-      //       this .bindBuffer (this .PIXEL_PACK_BUFFER, null);
-
-      //       await this .getBufferSubDataAsync (this .PIXEL_PACK_BUFFER, buffer, 0, dest, dstOffset);
-
-      //       this .deleteBuffer (buffer);
-      //    },
-      // });
+      Object .assign (gl, gl .getVersion () === 1
+      ? {
+         readPixelsAsync: gl .readPixels,
+      }
+      : {
+         clientWaitAsync: function (sync, flags, timeout)
+         {
+            return new Promise ((resolve, reject) =>
+            {
+               const check = () =>
+               {
+                  const result = this .clientWaitSync (sync, flags, 0);
+
+                  switch (result)
+                  {
+                     case this .WAIT_FAILED:
+                     {
+                        reject ();
+                        return;
+                     }
+                     case this .TIMEOUT_EXPIRED:
+                     {
+                        setTimeout (check, timeout);
+                        return;
+                     }
+                     default:
+                     {
+                        resolve ();
+                        return;
+                     }
+                  }
+               };
+
+               check ();
+            });
+         },
+         getBufferSubDataAsync: async function (target, buffer, srcByteOffset, dstBuffer, /* optional */ dstOffset, /* optional */ length)
+         {
+            const sync = this .fenceSync (this .SYNC_GPU_COMMANDS_COMPLETE, 0);
+
+            this .flush ();
+
+            await this .clientWaitAsync (sync, 0, 10);
+
+            this .deleteSync (sync);
+
+            this .bindBuffer (target, buffer);
+            this .getBufferSubData (target, srcByteOffset, dstBuffer, dstOffset, length);
+            this .bindBuffer (target, null);
+         },
+         readPixelsAsync: async function (x, y, w, h, format, type, dest, dstOffset)
+         {
+            const buffer = this .createBuffer ();
+
+            this .bindBuffer (this .PIXEL_PACK_BUFFER, buffer);
+            this .bufferData (this .PIXEL_PACK_BUFFER, dest .byteLength, this .STREAM_READ);
+            this .readPixels (x, y, w, h, format, type, 0);
+            this .bindBuffer (this .PIXEL_PACK_BUFFER, null);
+
+            await this .getBufferSubDataAsync (this .PIXEL_PACK_BUFFER, buffer, 0, dest, dstOffset);
+
+            this .deleteBuffer (buffer);
+         },
+      });
 
       // Return context.
 

package/src/x_ite/Browser/Core/ContextMenu.js

@@ -150,18 +150,9 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      browser .setBrowserOption ("StraightenHorizon", straightenHorizon);
 
                      if (straightenHorizon)
-                     {
                         browser .getNotification () ._string = _("Straighten Horizon") + ": " + _("on");
-
-                        const activeViewpoint = browser .getActiveViewpoint ();
-
-                        if (activeViewpoint)
-                           activeViewpoint .straighten (browser .getActiveLayer (), true);
-                     }
                      else
-                     {
                         browser .getNotification () ._string = _("Straighten Horizon") + ": " + _("off");
-                     }
                   }
                   .bind (this),
                },

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

@@ -789,7 +789,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
             .multRight (orientationOffsetBefore);
 
          if (straightenHorizon)
-            viewpoint .straightenHorizon (userOrientation, viewpoint .getUpVector (true));
+            viewpoint .straightenHorizon (userOrientation);
 
          const orientationOffsetAfter = orientationOffset
             .assign (viewpoint .getOrientation ())

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

@@ -146,6 +146,14 @@ X3DTexturingContext .prototype =
    {
       return this [_maxTextures];
    },
+   getMaxTextureTransforms: function ()
+   {
+      return 4;
+   },
+   getMaxTexCoords: function ()
+   {
+      return 4;
+   },
    getMinTextureSize: function ()
    {
       return 16;

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.8";
+export default "8.6.9";

package/src/x_ite/Browser/X3DBrowser.js

@@ -656,7 +656,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
       if (!layerNode)
          return;
 
-      layerNode .getViewpoint () ._viewAll = true;
+      layerNode .viewAll (1, this .getBrowserOption ("StraightenHorizon"));
    },
    firstViewpoint: function (layerNode)
    {

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

@@ -54,8 +54,6 @@ function X3DBindableNode (executionContext)
    X3DChildNode .call (this, executionContext);
 
    this .addType (X3DConstants .X3DBindableNode);
-
-   this .addChildObjects ("transitionActive", new Fields .SFBool ());
 }
 
 X3DBindableNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),

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

@@ -173,15 +173,10 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          return copy;
       }
    },
-   getDisplayName: (function ()
+   getDisplayName: function ()
    {
-      const _TrailingNumber = /_\d+$/;
-
-      return function ()
-      {
-         return this .getName () .replace (_TrailingNumber, "");
-      };
-   })(),
+      return this .getName () .replace (/_\d+$/, "");
+   },
    getNeedsName: function ()
    {
       if (this .getName () .length)

package/src/x_ite/Components/Layering/X3DLayerNode.js

@@ -221,13 +221,17 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
    {
       return this .collisionTime;
    },
-   lookAt: function (factor = 1, straighten = false)
+   viewAll: function (factor = 1, straighten = false)
    {
       const
          viewpointNode = this .getViewpoint (),
          bbox          = this .getBBox (new Box3 ()) .multRight (Matrix4 .inverse (viewpointNode .getModelMatrix ()));
 
-         viewpointNode .lookAt (this, bbox .center, viewpointNode .getLookAtDistance (bbox), factor, straighten);
+      viewpointNode .lookAt (this, bbox .center, viewpointNode .getLookAtDistance (bbox), factor, straighten);
+   },
+   straightenView: function ()
+   {
+      this .getViewpoint () .straightenView (this);
    },
    set_viewport__: function ()
    {

package/src/x_ite/Components/Navigation/NavigationInfo.js

@@ -66,6 +66,7 @@ function NavigationInfo (executionContext)
    this .addType (X3DConstants .NavigationInfo);
 
    this .addChildObjects ("transitionStart",  new Fields .SFBool (),
+                          "transitionActive", new Fields .SFBool (),
                           "availableViewers", new Fields .MFString (),
                           "viewer",           new Fields .SFString ("EXAMINE"));
 

package/src/x_ite/Components/Navigation/X3DViewpointNode.js

@@ -118,7 +118,6 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this .scaleOrientationInterpolator .setup ();
       this .fieldOfViewScaleInterpolator .setup ();
 
-      this .timeSensor ._isActive         .addFieldInterest (this ._transitionActive);
       this .timeSensor ._fraction_changed .addFieldInterest (this .easeInEaseOut ._set_fraction);
 
       this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .positionInterpolator         ._set_fraction);
@@ -186,10 +185,18 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    },
    set_active__: function (navigationInfoNode, active)
    {
-      if (this ._isBound .getValue () && ! active .getValue () && this .timeSensor ._fraction_changed .getValue () === 1)
-      {
-         navigationInfoNode ._transitionComplete = true;
-      }
+      if (active .getValue ())
+         return;
+
+      this .timeSensor ._isActive .removeInterest ("set_active__", this);
+
+      if (!this ._isBound .getValue ())
+         return;
+
+      if (this .timeSensor ._fraction_changed .getValue () !== 1)
+         return;
+
+      navigationInfoNode ._transitionComplete = true;
    },
    setInterpolators: function () { },
    getPosition: function ()
@@ -272,6 +279,11 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
          if (this ._viewAll .getValue ())
             this .viewAll (layerNode .getBBox (new Box3 ()));
 
+         if (this .getBrowser () .getBrowserOption ("StraightenHorizon"))
+         {
+            this ._orientationOffset = this .straightenHorizon (this .getUserOrientation ()) .multLeft (this .getOrientation () .copy () .inverse ());
+         }
+
          // Handle NavigationInfo.
 
          const
@@ -320,7 +332,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
             }
          }
 
-         layerNode .getNavigationInfo () ._transitionStart = true;
+         navigationInfoNode ._transitionStart = true;
 
          this .timeSensor ._cycleInterval = transitionTime;
          this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
@@ -339,11 +351,13 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
          this ._scaleOrientationOffset = relative .scaleOrientation;
 
          this .setInterpolators (fromViewpointNode, relative);
-
-         this ._transitionActive = true;
       }
       else
       {
+         const navigationInfoNode = layerNode .getNavigationInfo ();
+
+         navigationInfoNode ._transitionComplete = true;
+
          const relative = this .getRelativeTransformation (fromViewpointNode);
 
          this ._positionOffset         = relative .position;
@@ -368,6 +382,11 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       this ._centerOfRotationOffset = Vector3   .Zero;
       this ._fieldOfViewScale       = 1;
 
+      if (this .getBrowser () .getBrowserOption ("StraightenHorizon"))
+      {
+         this ._orientationOffset = this .straightenHorizon (this .getUserOrientation ()) .multLeft (this .getOrientation () .copy () .inverse ());
+      }
+
       this .set_nearDistance__ ();
       this .set_farDistance__ ();
    },
@@ -413,7 +432,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
          x .assign (up) .cross (z) .normalize ();
          y .assign (z) .cross (x) .normalize ();
 
-         m .set (x.x, x.y, x.z, y.x, y.y, y.z, z.x, z.y, z.z);
+         m .set (... x, ... y, ... z);
          r .setMatrix (m);
 
          return r;
@@ -442,14 +461,10 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
       const
          offset = point .copy () .add (this .getUserOrientation () .multVecRot (new Vector3 (0, 0, distance))) .subtract (this .getPosition ());
 
-      layerNode .getNavigationInfo () ._transitionStart = true;
-
-      this .timeSensor ._cycleInterval = 0.2;
+      this .timeSensor ._cycleInterval = 1;
       this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
       this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
 
-      this .timeSensor ._isActive .addInterest ("set_active__", this, layerNode .getNavigationInfo ());
-
       this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 1), new Fields .SFVec2f (1, 0));
 
       const
@@ -472,19 +487,17 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
 
       this ._fieldOfViewScale       = 1;
       this ._centerOfRotationOffset = Vector3 .subtract (point, this .getCenterOfRotation ());
+      this .nearDistance            = Math .min (distance / 2, 0.125);
+      this .farDistance             = this .nearDistance * this .getMaxFarValue () / 0.125;
 
       this .setInterpolators (this, relative);
    },
-   straighten: function (layerNode, horizon)
+   straightenView: function (layerNode)
    {
-      layerNode .getNavigationInfo () ._transitionStart = true;
-
-      this .timeSensor ._cycleInterval = 0.4;
+      this .timeSensor ._cycleInterval = 1;
       this .timeSensor ._stopTime      = this .getBrowser () .getCurrentTime ();
       this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
 
-      this .timeSensor ._isActive .addInterest ("set_active__", this, layerNode .getNavigationInfo ());
-
       this .easeInEaseOut ._easeInEaseOut = new Fields .MFVec2f (new Fields .SFVec2f (0, 1), new Fields .SFVec2f (1, 0));
 
       const rotation = Rotation4 .multRight (Rotation4 .inverse (this .getOrientation ()), this .straightenHorizon (this .getUserOrientation ()));
@@ -507,7 +520,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
          localZAxis  = new Vector3 (0, 0, 0),
          rotation    = new Rotation4 (0, 0, 1, 0);
 
-      return function (orientation, upVector = this .getUpVector ())
+      return function (orientation, upVector = this .getUpVector (true))
       {
          orientation .multVecRot (localXAxis .assign (Vector3 .xAxis) .negate ());
          orientation .multVecRot (localZAxis .assign (Vector3 .zAxis));

package/src/x_ite/Components/ParticleSystems/ParticleSystem.js

@@ -981,8 +981,7 @@ ParticleSystem .prototype = Object .assign (Object .create (X3DShapeNode .protot
 
                const blendModeNode = appearanceNode .getBlendMode ();
 
-               if (blendModeNode)
-                  blendModeNode .enable (gl);
+               blendModeNode?.enable (gl);
 
                shaderNode .enable (gl);
                shaderNode .setUniforms (gl, this .geometryContext, renderContext);
@@ -1027,8 +1026,7 @@ ParticleSystem .prototype = Object .assign (Object .create (X3DShapeNode .protot
 
                gl .drawArraysInstanced (primitiveMode, 0, this .vertexCount, this .numParticles);
 
-               if (blendModeNode)
-                  blendModeNode .disable (gl);
+               blendModeNode?.disable (gl);
             }
 
             break;

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

@@ -178,7 +178,7 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
       this .backFace              = new Map ([[gl .CCW, gl .CW], [gl .CW, gl .CCW]]);
       this .attribBuffers         = [ ];
       this .textureCoordinateNode = browser .getDefaultTextureCoordinate ();
-      this .texCoordBuffers       = Array .from ({length: browser .getMaxTextures ()}, () => gl .createBuffer ());
+      this .texCoordBuffers       = Array .from ({length: browser .getMaxTexCoords ()}, () => gl .createBuffer ());
       this .fogDepthBuffer        = gl .createBuffer ();
       this .colorBuffer           = gl .createBuffer ();
       this .normalBuffer          = gl .createBuffer ();
@@ -830,16 +830,6 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          if (this .multiTexCoords .length === 0)
             this .buildTexCoords ();
 
-         if (this .multiTexCoords .length)
-         {
-            const maxTextures = this .getBrowser () .getMaxTextures ();
-
-            for (let i = this .multiTexCoords .length; i < maxTextures; ++ i)
-               this .multiTexCoords [i] = this .multiTexCoords .at (-1);
-
-            this .multiTexCoords .length = maxTextures;
-         }
-
          // Transfer arrays and update.
 
          this .transfer ();
@@ -1019,8 +1009,7 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          attribBuffers = this .attribBuffers,
          primitiveMode = browser .getPrimitiveMode (this .primitiveMode);
 
-      if (blendModeNode)
-         blendModeNode .enable (gl);
+      blendModeNode?.enable (gl);
 
       shaderNode .enable (gl);
       shaderNode .setUniforms (gl, this, renderContext, front);
@@ -1091,8 +1080,7 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          }
       }
 
-      if (blendModeNode)
-         blendModeNode .disable (gl);
+      blendModeNode?.disable (gl);
    },
    displaySimpleParticles: function (gl, shaderNode, particleSystem)
    {
@@ -1140,8 +1128,7 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          attribBuffers = this .attribBuffers,
          primitiveMode = browser .getPrimitiveMode (this .primitiveMode);
 
-      if (blendModeNode)
-         blendModeNode .enable (gl);
+      blendModeNode?.enable (gl);
 
       // Setup shader.
 
@@ -1211,8 +1198,7 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          gl .drawArraysInstanced (primitiveMode, 0, this .vertexCount, particleSystem .numParticles);
       }
 
-      if (blendModeNode)
-         blendModeNode .disable (gl);
+      blendModeNode?.disable (gl);
    },
 });
 

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

@@ -306,8 +306,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
 
                // Render triangles.
 
-               if (blendModeNode)
-                  blendModeNode .enable (gl);
+               blendModeNode?.enable (gl);
 
                // Setup shader.
 
@@ -349,8 +348,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
                gl .enable (gl .CULL_FACE);
                gl .drawArrays (primitiveMode, 0, this .vertexCount * 3);
 
-               if (blendModeNode)
-                  blendModeNode .disable (gl);
+               blendModeNode?.disable (gl);
 
                return;
             }
@@ -358,8 +356,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
 
          const primitiveMode = browser .getPrimitiveMode (this .getPrimitiveMode ());
 
-         if (blendModeNode)
-            blendModeNode .enable (gl);
+         blendModeNode?.enable (gl);
 
          // Setup shader.
 
@@ -389,8 +386,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
 
          gl .drawArrays (primitiveMode, 0, this .vertexCount);
 
-         if (blendModeNode)
-            blendModeNode .disable (gl);
+         blendModeNode?.disable (gl);
 
          gl .lineWidth (1);
       };
@@ -406,8 +402,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
          attribBuffers  = this .getAttribBuffers (),
          primitiveMode  = browser .getPrimitiveMode (this .getPrimitiveMode ());
 
-      if (blendModeNode)
-         blendModeNode .enable (gl);
+      blendModeNode?.enable (gl);
 
       // Setup shader.
 
@@ -446,8 +441,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
 
       gl .drawArraysInstanced (primitiveMode, 0, this .vertexCount, particleSystem .numParticles);
 
-      if (blendModeNode)
-         blendModeNode .disable (gl);
+      blendModeNode?.disable (gl);
 
       gl .lineWidth (1);
    },

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

@@ -81,8 +81,7 @@ X3DPointGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNod
          attribNodes    = this .getAttrib (),
          attribBuffers  = this .getAttribBuffers ();
 
-      if (blendModeNode)
-         blendModeNode .enable (gl);
+      blendModeNode?.enable (gl);
 
       // Setup shader.
 
@@ -110,8 +109,7 @@ X3DPointGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNod
 
       gl .drawArrays (this .primitiveMode, 0, this .vertexCount);
 
-      if (blendModeNode)
-         blendModeNode .disable (gl);
+      blendModeNode?.disable (gl);
    },
    displayParticles: function (gl, renderContext, particleSystem)
    {
@@ -122,8 +120,7 @@ X3DPointGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNod
          attribNodes    = this .getAttrib (),
          attribBuffers  = this .getAttribBuffers ();
 
-      if (blendModeNode)
-         blendModeNode .enable (gl);
+      blendModeNode?.enable (gl);
 
       // Setup shader.
 
@@ -162,8 +159,7 @@ X3DPointGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNod
 
       gl .drawArraysInstanced (this .primitiveMode, 0, this .vertexCount, particleSystem .numParticles);
 
-      if (blendModeNode)
-         blendModeNode .disable (gl);
+      blendModeNode?.disable (gl);
    },
 });