x_ite 8.6.11 → 8.6.12

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

@@ -325,6 +325,11 @@ X3DCoreContext .prototype =
             this .loadURL (new Fields .MFString (newValue), new Fields .MFString ());
             break;
          }
+         case "timings":
+         {
+            this .setBrowserOption ("Timings", this .parseBooleanAttribute (newValue, false));
+            break;
+         }
          case "url":
          {
             this .loadURL (this .parseUrlAttribute (newValue), new Fields .MFString ());

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

@@ -184,7 +184,7 @@ X3DFlyViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
                this .addFly ();
 
                if (this .getBrowser () .getBrowserOption ("Rubberband"))
-                  this .getBrowser () .finished () .addInterest ("display", this, MOVE);
+                  this .getBrowser () .finishedEvents () .addInterest ("display", this, MOVE);
             }
 
             this ._isActive = true;
@@ -215,7 +215,7 @@ X3DFlyViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
             this .addPan ();
 
             if (this .getBrowser () .getBrowserOption ("Rubberband"))
-               this .getBrowser () .finished () .addInterest ("display", this, PAN);
+               this .getBrowser () .finishedEvents () .addInterest ("display", this, PAN);
 
             this ._isActive = true;
             break;
@@ -704,7 +704,7 @@ X3DFlyViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
 
       browser .prepareEvents () .removeInterest ("fly", this);
       browser .prepareEvents () .removeInterest ("pan", this);
-      browser .finished ()      .removeInterest ("display", this);
+      browser .finishedEvents ()      .removeInterest ("display", this);
 
       this .orientationChaser ._value_changed .removeInterest ("set_orientationOffset__", this);
 

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

@@ -55,7 +55,8 @@ const
    _loadingObjects = Symbol (),
    _loading        = Symbol (),
    _location       = Symbol (),
-   _defaultScene   = Symbol ();
+   _defaultScene   = Symbol (),
+   _set_loadCount  = Symbol ();
 
 function getBaseURI (element)
 {
@@ -82,7 +83,9 @@ function X3DNetworkingContext ()
 X3DNetworkingContext .prototype =
 {
    initialize: function ()
-   { },
+   {
+      this ._loadCount .addInterest (_set_loadCount, this);
+   },
    getProviderUrl: function ()
    {
       return URLs .getProviderUrl ();
@@ -163,12 +166,25 @@ X3DNetworkingContext .prototype =
    setLoadCount: function (value)
    {
       this ._loadCount = value;
+   },
+   resetLoadCount: function ()
+   {
+      this ._loadCount       = 0;
+      this [_loadingDisplay] = 0;
+      this [_loadingTotal]   = 0;
+
+      this [_loadingObjects] .clear ();
 
+      for (const object of this .getPrivateScene () .getLoadingObjects ())
+         this .addLoadingObject (object);
+   },
+   [_set_loadCount]: function ()
+   {
       const loadingDisplay = [... this [_loadingObjects]]
          .filter (o => o .isPrivate)
          .reduce ((v, o) => v + !o .isPrivate (), 0);
 
-      if (value || this [_loading])
+      if (this ._loadCount .getValue () || this [_loading])
       {
          var string = ((loadingDisplay || 1) === 1
             ? _ ("Loading %1 file")
@@ -184,7 +200,7 @@ X3DNetworkingContext .prototype =
       {
          this .getSplashScreen () .find (".x_ite-private-spinner-text") .text (string);
          this .getSplashScreen () .find (".x_ite-private-progressbar div")
-            .css ("width", (100 - 100 * value / this [_loadingTotal]) + "%");
+            .css ("width", (100 - 100 * this ._loadCount .getValue () / this [_loadingTotal]) + "%");
       }
       else
       {
@@ -194,17 +210,6 @@ X3DNetworkingContext .prototype =
 
       this [_loadingDisplay] = loadingDisplay;
    },
-   resetLoadCount: function ()
-   {
-      this ._loadCount       = 0;
-      this [_loadingDisplay] = 0;
-      this [_loadingTotal]   = 0;
-
-      this [_loadingObjects] .clear ();
-
-      for (const object of this .getPrivateScene () .getLoadingObjects ())
-         this .addLoadingObject (object);
-   },
 };
 
 export default X3DNetworkingContext;

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

@@ -124,7 +124,7 @@ PointingDevice .prototype = Object .assign (Object .create (X3DBaseNode .prototy
             event .stopImmediatePropagation (); // Keeps the rest of the handlers from being executed
 
             browser .setCursor ("HAND");
-            browser .finished () .addInterest ("onverifymotion", this, x, y);
+            browser .finishedEvents () .addInterest ("onverifymotion", this, x, y);
          }
       }
    },
@@ -145,7 +145,7 @@ PointingDevice .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
          browser .buttonReleaseEvent ();
          browser .setCursor (this .isOver ? "HAND" : "DEFAULT");
-         browser .finished () .addInterest ("onverifymotion", this, x, y);
+         browser .finishedEvents () .addInterest ("onverifymotion", this, x, y);
          browser .addBrowserEvent ();
 
          this .cursor = "DEFAULT";
@@ -272,7 +272,7 @@ PointingDevice .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       // and the new child has a sensor node inside. This sensor node must be update to
       // reflect the correct isOver state.
 
-      this .getBrowser () .finished () .removeInterest ("onverifymotion", this);
+      this .getBrowser () .finishedEvents () .removeInterest ("onverifymotion", this);
 
       this .onmotion (x, y);
    },

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.11";
+export default "8.6.12";

package/src/x_ite/Browser/X3DBrowser.js

@@ -813,14 +813,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    beginUpdate: function ()
    {
       this .setLive (true);
-      this .getExecutionContext () .setLive (true);
+      this .getExecutionContext () .beginUpdate ();
       this .advanceTime ();
       this .addBrowserEvent ();
    },
    endUpdate: function ()
    {
       this .setLive (false);
-      this .getExecutionContext () .setLive (false);
+      this .getExecutionContext () .endUpdate ();
    },
    print: function ()
    {

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -114,12 +114,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 (),
-                          "finished",      new SFTime ());
+   this .addChildObjects ("initialized",    new SFTime (),
+                          "shutdown",       new SFTime (),
+                          "prepareEvents",  new SFTime (),
+                          "timeEvents",     new SFTime (),
+                          "sensorEvents",   new SFTime (),
+                          "displayEvents",  new SFTime (),
+                          "finishedEvents", new SFTime ());
 
    this [_changedTime]     = 0;
    this [_previousTime]    = 0;
@@ -204,9 +205,13 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
    {
       return this ._sensorEvents;
    },
-   finished: function ()
+   displayEvents: function ()
    {
-      return this ._finished;
+      return this ._displayEvents;
+   },
+   finishedEvents: function ()
+   {
+      return this ._finishedEvents;
    },
    getBrowser: function ()
    {
@@ -267,10 +272,10 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Events
 
-      this ._prepareEvents .processInterests ();
+      this .addTaintedField (this ._prepareEvents);
       this [_processEvents] ();
 
-      this ._timeEvents .processInterests ();
+      this .addTaintedField (this ._timeEvents);
       this [_processEvents] ();
 
       // Camera
@@ -290,13 +295,16 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Events
 
-      this ._sensorEvents .processInterests ();
+      this .addTaintedField (this ._sensorEvents);
       this [_processEvents] ();
 
       // Display
 
       this [_displayTime] .start ()
 
+      this .addTaintedField (this ._displayEvents);
+      this [_processEvents] ();
+
       const gl = this .getContext ();
 
       this .getFrameBuffer () .bind ();
@@ -312,7 +320,8 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Finish
 
-      this ._finished .processInterests ();
+      this .addTaintedField (this ._finishedEvents);
+      this [_processEvents] ();
 
       this [_browserTime] .stop ();
       this [_systemTime] .start ();

package/src/x_ite/Components/CADGeometry/CADFace.js

@@ -102,14 +102,7 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
    getBBox: function (bbox, shadows)
    {
       if (this ._bboxSize .getValue () .equals (this .getDefaultBBoxSize ()))
-      {
-         const boundedObject = this .visibleNode;
-
-         if (boundedObject)
-            return boundedObject .getBBox (bbox, shadows);
-
-         return bbox .set ();
-      }
+         return this .visibleNode?.getBBox (bbox, shadows) ?? bbox .set ();
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
    },
@@ -173,11 +166,11 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_transformSensors__: function ()
    {
-      this .setPickableObject (!!(this .visibleNode && this .visibleNode .isPickableObject ()));
+      this .setPickableObject (!!this .visibleNode?.isPickableObject ());
    },
    set_visible__: function ()
    {
@@ -204,11 +197,7 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
          case TraverseType .CAMERA:
          case TraverseType .SHADOW:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
+            this .visibleNode?.traverse (type, renderObject);
             return;
          }
          case TraverseType .PICKING:
@@ -219,34 +208,21 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
 
             pickingHierarchy .push (this);
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             pickingHierarchy .pop ();
             return;
          }
          case TraverseType .COLLISION:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
             return;
          }
          case TraverseType .DISPLAY:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
-            const boundedObject = this .boundedObject;
-
-            if (boundedObject)
-               boundedObject .displayBBox (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
+            this .boundedObject?.displayBBox (type, renderObject);
             return;
          }
       }

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

@@ -651,7 +651,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                         case X3DConstants .SFNode:
                         case X3DConstants .MFNode:
                         {
-                           generator .PushContainerField (field);
+                           generator .PushContainerField (null);
 
                            generator .string += ">";
                            generator .string += generator .TidyBreak ();

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

@@ -533,7 +533,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                   {
                      if (field .getValue () !== null)
                      {
-                        generator .PushContainerField (field);
+                        generator .PushContainerField (null);
 
                         generator .string += generator .Indent ();
                         generator .string += "<fieldValue";

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

@@ -106,6 +106,8 @@ StaticGroup .prototype = Object .assign (Object .create (X3DChildNode .prototype
       X3DChildNode     .prototype .initialize .call (this);
       X3DBoundedObject .prototype .initialize .call (this);
 
+      this .getBrowser () .getBrowserOptions () ._OptimizeStaticGroup .addInterest ("set_optimize__", this);
+
       this ._bboxSize   .addFieldInterest (this .groupNode ._bboxSize);
       this ._bboxCenter .addFieldInterest (this .groupNode ._bboxCenter);
       this ._children   .addFieldInterest (this .groupNode ._children);
@@ -124,12 +126,24 @@ StaticGroup .prototype = Object .assign (Object .create (X3DChildNode .prototype
       this .setCameraObject   (this .groupNode .isCameraObject ());
       this .setPickableObject (this .groupNode .isPickableObject ());
 
+      this .set_optimize__ ();
       this .set_children__ ();
    },
    getBBox: function (bbox, shadows)
    {
       return bbox .assign (shadows ? this .shadowBBox : this .bbox);
    },
+   set_optimize__: function ()
+   {
+      if (this .getBrowser () .getBrowserOption ("OptimizeStaticGroup"))
+      {
+         delete this .traverse;
+      }
+      else
+      {
+         this .traverse = traverse;
+      }
+   },
    set_children__: function ()
    {
       this .groupNode .getBBox (this .bbox);
@@ -226,4 +240,9 @@ StaticGroup .prototype = Object .assign (Object .create (X3DChildNode .prototype
    },
 });
 
+function traverse (type, renderObject)
+{
+   this .groupNode .traverse (type, renderObject);
+}
+
 export default StaticGroup;

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

@@ -108,10 +108,7 @@ Switch .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
       {
          const boundedObject = X3DCast (X3DConstants .X3DBoundedObject, this .visibleNode);
 
-         if (boundedObject)
-            return boundedObject .getBBox (bbox, shadows);
-
-         return bbox .set ();
+         return boundedObject?.getBBox (bbox, shadows) ?? bbox .set ();
       }
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
@@ -165,11 +162,11 @@ Switch .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_transformSensors__: function ()
    {
-      this .setPickableObject (!!(this .getTransformSensors () .size || this .visibleNode && this .visibleNode .isPickableObject ()));
+      this .setPickableObject (!!(this .getTransformSensors () .size || this .visibleNode?.isPickableObject ()));
    },
    set_visible__: function ()
    {
@@ -196,11 +193,7 @@ Switch .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
          case TraverseType .CAMERA:
          case TraverseType .SHADOW:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
+            this .visibleNode?.traverse (type, renderObject);
             return;
          }
          case TraverseType .PICKING:
@@ -232,25 +225,14 @@ Switch .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
          }
          case TraverseType .COLLISION:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
+            this .visibleNode?.traverse (type, renderObject);
             return;
          }
          case TraverseType .DISPLAY:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
-            const boundedObject = this .boundedObject;
-
-            if (boundedObject)
-               boundedObject .displayBBox (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
+            this .boundedObject?.displayBBox (type, renderObject);
             return;
          }
       }

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

@@ -106,7 +106,6 @@ X3DBoundedObject .prototype =
          const modelViewMatrix = renderObject .getModelViewMatrix ();
 
          this .getBBox (bbox);
-
          matrix .set (bbox .center, null, bbox .size);
 
          modelViewMatrix .push ();

package/src/x_ite/Components/Layout/Layout.js

@@ -56,8 +56,9 @@ import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
 import Rotation4            from "../../../standard/Math/Numbers/Rotation4.js";
 import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
-var
-   i        = 0,
+let i = 0;
+
+const
    LEFT     = i++,
    CENTER   = i++,
    RIGHT    = i++,
@@ -441,11 +442,11 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
    },
    transform: function (type, renderObject)
    {
-      var parent = this .parent = renderObject .getParentLayout ();
+      const parent = this .parent = renderObject .getParentLayout ();
 
       // Calculate rectangleSize
 
-      var
+      const
          browser             = this .getBrowser (),
          contentScale        = browser .getRenderingProperty ("ContentScale"),
          matrix              = this .matrix,
@@ -488,7 +489,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Calculate translation
 
-      var translation = this .translation .set (0, 0, 0);
+      const translation = this .translation .set (0, 0, 0);
 
       switch (this .getAlignX ())
       {
@@ -524,7 +525,7 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Calculate offset
 
-      var offset = this .offset .set (0, 0, 0);
+      const offset = this .offset .set (0, 0, 0);
 
       switch (this .getOffsetUnitX ())
       {
@@ -548,13 +549,14 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Calculate scale
 
-      var
+      const
          scale              = this .scale .set (1, 1, 1),
          currentTranslation = this .currentTranslation,
          currentRotation    = this .currentRotation,
          currentScale       = this .currentScale;
 
-      var modelViewMatrix = renderObject .getModelViewMatrix () .get ();
+      const modelViewMatrix = renderObject .getModelViewMatrix () .get ();
+
       modelViewMatrix .get (currentTranslation, currentRotation, currentScale);
 
       switch (this .getScaleModeX ())
@@ -612,10 +614,10 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
 
       // Transform
 
-      rectangleCenter .assign (translation) .add (offset);
+      rectangleCenter .assign (translation .add (offset));
 
       matrix .set (currentTranslation, currentRotation);
-      matrix .translate (translation .add (offset));
+      matrix .translate (translation);
       matrix .scale (scale);
 
       return matrix;

package/src/x_ite/Components/Layout/LayoutGroup.js

@@ -52,6 +52,7 @@ import X3DGroupingNode      from "../Grouping/X3DGroupingNode.js";
 import X3DCast              from "../../Base/X3DCast.js";
 import TraverseType         from "../../Rendering/TraverseType.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
+import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
 import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
 function LayoutGroup (executionContext)
@@ -62,6 +63,7 @@ function LayoutGroup (executionContext)
 
    this .viewportNode    = null;
    this .layoutNode      = null;
+   this .matrix          = new Matrix4 ();
    this .modelViewMatrix = new Matrix4 ();
    this .screenMatrix    = new Matrix4 ();
 }
@@ -118,11 +120,13 @@ LayoutGroup .prototype = Object .assign (Object .create (X3DGroupingNode .protot
    getMatrix: function ()
    {
       if (this .layoutNode)
-         this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
-      else
-         this .matrix .identity ();
+         return this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
 
-      return this .matrix;
+      return this .matrix .identity ();
+   },
+   getLayout: function ()
+   {
+      return this .layoutNode;
    },
    traverse: function (type, renderObject)
    {
@@ -139,7 +143,7 @@ LayoutGroup .prototype = Object .assign (Object .create (X3DGroupingNode .protot
 
             if (this .layoutNode)
             {
-               var modelViewMatrix = renderObject .getModelViewMatrix ();
+               const modelViewMatrix = renderObject .getModelViewMatrix ();
 
                this .modelViewMatrix .assign (modelViewMatrix .get ());
                this .screenMatrix .assign (this .layoutNode .transform (type, renderObject));

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

@@ -115,10 +115,7 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
       {
          const boundedObject = X3DCast (X3DConstants .X3DBoundedObject, this .visibleNode);
 
-         if (boundedObject)
-            return boundedObject .getBBox (bbox, shadows);
-
-         return bbox .set ();
+         return boundedObject?.getBBox (bbox, shadows) ?? bbox .set ();
       }
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
@@ -174,11 +171,11 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_transformSensors__: function ()
    {
-      this .setPickableObject (!!(this .getTransformSensors () .size || this .visibleNode && this .visibleNode .isPickableObject ()));
+      this .setPickableObject (!!(this .getTransformSensors () .size || this .visibleNode?.isPickableObject ()));
    },
    set_visible__: function ()
    {
@@ -250,11 +247,7 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
             case TraverseType .CAMERA:
             case TraverseType .SHADOW:
             {
-               const visibleNode = this .visibleNode;
-
-               if (visibleNode)
-                  visibleNode .traverse (type, renderObject);
-
+               this .visibleNode?.traverse (type, renderObject);
                return;
             }
             case TraverseType .PICKING:
@@ -286,11 +279,7 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
             }
             case TraverseType .COLLISION:
             {
-               const visibleNode = this .visibleNode;
-
-               if (visibleNode)
-                  visibleNode .traverse (type, renderObject);
-
+               this .visibleNode?.traverse (type, renderObject);
                return;
             }
             case TraverseType .DISPLAY:
@@ -318,16 +307,9 @@ LOD .prototype = Object .assign (Object .create (X3DGroupingNode .prototype),
                   }
                }
 
-               const visibleNode = this .visibleNode;
-
-               if (visibleNode)
-                  visibleNode .traverse (type, renderObject);
-
-               const boundedObject = this .boundedObject;
-
-               if (boundedObject)
-                  boundedObject .displayBBox (type, renderObject);
+               this .visibleNode?.traverse (type, renderObject);
 
+               this .boundedObject?.displayBBox (type, renderObject);
                return;
             }
          }

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

@@ -442,7 +442,7 @@ X3DViewpointNode .prototype = Object .assign (Object .create (X3DBindableNode .p
    {
       bbox = bbox .copy () .multRight (Matrix4 .inverse (this .getModelMatrix ()));
 
-      const minDistance = layerNode .getNavigationInfo () .getNearValue () * 2;
+      const minDistance = Math .max (layerNode .getNavigationInfo () .getNearValue () * 2, this .getLookAtDistance (bbox));
 
       this .lookAt (layerNode, bbox .center, minDistance, factor, straighten);
    },