x_ite 8.0.0 → 8.3.0

package/src/x_ite/Components/Lighting.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -47,6 +47,7 @@
 
 import SupportedNodes   from "../Configuration/SupportedNodes.js";
 import DirectionalLight from "./Lighting/DirectionalLight.js";
+import EnvironmentLight from "./Lighting/EnvironmentLight.js";
 import PointLight       from "./Lighting/PointLight.js";
 import SpotLight        from "./Lighting/SpotLight.js";
 import X3DLightNode     from "./Lighting/X3DLightNode.js";
@@ -54,6 +55,7 @@ import X3DLightNode     from "./Lighting/X3DLightNode.js";
 const Types =
 {
    DirectionalLight: DirectionalLight,
+   EnvironmentLight: EnvironmentLight,
    PointLight:       PointLight,
    SpotLight:        SpotLight,
 };

package/src/x_ite/Components/NURBS/Contour2D.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/ContourPolyline2D.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/CoordinateDouble.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsCurve.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsCurve2D.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsOrientationInterpolator.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsPatchSurface.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsPositionInterpolator.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsSet.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsSurfaceInterpolator.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsSweptSurface.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsSwungSurface.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsTextureCoordinate.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/NurbsTrimmedSurface.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/X3DNurbsControlCurveNode.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/X3DNurbsSurfaceGeometryNode.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Components/NURBS/X3DParametricGeometryNode.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -190,6 +190,7 @@ NavigationInfo .prototype = Object .assign (Object .create (X3DBindableNode .pro
             case "NONE":
                this ._viewer = string;
                break;
+            case "PLANE_create3000.github.io":
             case "PLANE_create3000.de":
                this ._viewer = "PLANE";
                break;

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

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -53,7 +53,6 @@ import ScalarInterpolator   from "../Interpolation/ScalarInterpolator.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 import Camera               from "../../../standard/Math/Geometry/Camera.js";
 import Vector2              from "../../../standard/Math/Numbers/Vector2.js";
-import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
 import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
 function OrthoViewpoint (executionContext)
@@ -73,7 +72,6 @@ function OrthoViewpoint (executionContext)
    this .fieldOfViewOffsetInterpolator1 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
    this .fieldOfViewOffsetInterpolator2 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
    this .fieldOfViewOffsetInterpolator3 = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
-   this .fieldOfViewScaleInterpolator   = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
 }
 
 OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototype),
@@ -87,10 +85,14 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
       new X3DFieldDefinition (X3DConstants .inputOutput, "orientation",       new Fields .SFRotation ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "centerOfRotation",  new Fields .SFVec3f ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "fieldOfView",       new Fields .MFFloat (-1, -1, 1, 1)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "nearDistance",      new Fields .SFFloat (-1)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "farDistance",       new Fields .SFFloat (-1)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "viewAll",           new Fields .SFBool (false)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "jump",              new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "retainUserOffsets", new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .outputOnly,  "isBound",           new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .outputOnly,  "bindTime",          new Fields .SFTime ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "navigationInfo",    new Fields .SFNode ()),
    ]),
    getTypeName: function ()
    {
@@ -108,50 +110,25 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
    {
       X3DViewpointNode .prototype .initialize .call (this);
 
-      this ._fieldOfView       .addInterest ("set_fieldOfView__", this);
-      this ._fieldOfViewOffset .addInterest ("set_fieldOfView__", this);
-      this ._fieldOfViewScale  .addInterest ("set_fieldOfView__", this);
-
       this .fieldOfViewOffsetInterpolator0 ._key = new Fields .MFFloat (0, 1);
       this .fieldOfViewOffsetInterpolator1 ._key = new Fields .MFFloat (0, 1);
       this .fieldOfViewOffsetInterpolator2 ._key = new Fields .MFFloat (0, 1);
       this .fieldOfViewOffsetInterpolator3 ._key = new Fields .MFFloat (0, 1);
-      this .fieldOfViewScaleInterpolator   ._key = new Fields .MFFloat (0, 1);
 
       this .fieldOfViewOffsetInterpolator0 .setup ();
       this .fieldOfViewOffsetInterpolator1 .setup ();
       this .fieldOfViewOffsetInterpolator2 .setup ();
       this .fieldOfViewOffsetInterpolator3 .setup ();
-      this .fieldOfViewScaleInterpolator   .setup ();
 
-      this .getEaseInEaseOut () ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator0 ._set_fraction);
-      this .getEaseInEaseOut () ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator1 ._set_fraction);
-      this .getEaseInEaseOut () ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator2 ._set_fraction);
-      this .getEaseInEaseOut () ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator3 ._set_fraction);
-      this .getEaseInEaseOut () ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewScaleInterpolator   ._set_fraction);
+      this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator0 ._set_fraction);
+      this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator1 ._set_fraction);
+      this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator2 ._set_fraction);
+      this .easeInEaseOut ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewOffsetInterpolator3 ._set_fraction);
 
       this .fieldOfViewOffsetInterpolator0 ._value_changed .addInterest ("set_fieldOfViewOffset__", this);
       this .fieldOfViewOffsetInterpolator1 ._value_changed .addInterest ("set_fieldOfViewOffset__", this);
       this .fieldOfViewOffsetInterpolator2 ._value_changed .addInterest ("set_fieldOfViewOffset__", this);
       this .fieldOfViewOffsetInterpolator3 ._value_changed .addInterest ("set_fieldOfViewOffset__", this);
-
-      this .fieldOfViewScaleInterpolator ._value_changed .addFieldInterest (this ._fieldOfViewScale);
-
-      this .set_fieldOfView__ ();
-   },
-   set_fieldOfView__: function ()
-   {
-      const
-         length           = this ._fieldOfView .length,
-         fieldOfViewScale = this ._fieldOfViewScale .getValue ();
-
-      this .minimumX = ((length > 0 ? this ._fieldOfView [0] : -1) + this ._fieldOfViewOffset [0]) * fieldOfViewScale;
-      this .minimumY = ((length > 1 ? this ._fieldOfView [1] : -1) + this ._fieldOfViewOffset [1]) * fieldOfViewScale;
-      this .maximumX = ((length > 2 ? this ._fieldOfView [2] :  1) + this ._fieldOfViewOffset [2]) * fieldOfViewScale;
-      this .maximumY = ((length > 3 ? this ._fieldOfView [3] :  1) + this ._fieldOfViewOffset [3]) * fieldOfViewScale;
-
-      this .sizeX = this .maximumX - this .minimumX;
-      this .sizeY = this .maximumY - this .minimumY;
    },
    set_fieldOfViewOffset__: function ()
    {
@@ -160,33 +137,50 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
       this ._fieldOfViewOffset [2] = this .fieldOfViewOffsetInterpolator2 ._value_changed .getValue ();
       this ._fieldOfViewOffset [3] = this .fieldOfViewOffsetInterpolator3 ._value_changed .getValue ();
    },
-   setInterpolators: function (fromViewpointNode, toViewpointNode)
+   resetUserOffsets: function ()
    {
-      if (fromViewpointNode .getType () .includes (X3DConstants .OrthoViewpoint))
+      X3DViewpointNode .prototype .resetUserOffsets .call (this);
+
+      this ._fieldOfViewOffset [0] = 0;
+      this ._fieldOfViewOffset [1] = 0;
+      this ._fieldOfViewOffset [2] = 0;
+      this ._fieldOfViewOffset [3] = 0;
+   },
+   getRelativeTransformation: function (fromViewpointNode)
+   {
+      const relative = X3DViewpointNode .prototype .getRelativeTransformation .call (this, fromViewpointNode);
+
+      if (fromViewpointNode .constructor === this .constructor)
       {
-         const
-            toLength   = toViewpointNode   ._fieldOfView .length,
-            fromLength = fromViewpointNode ._fieldOfView .length;
+         relative .userMinimumX = fromViewpointNode .getUserMinimumX ();
+         relative .userMinimumY = fromViewpointNode .getUserMinimumY ();
+         relative .userMaximumX = fromViewpointNode .getUserMaximumX ();
+         relative .userMaximumY = fromViewpointNode .getUserMaximumY ();
+      }
 
+      return relative;
+   },
+   setInterpolators: function (fromViewpointNode, toViewpointNode, relative)
+   {
+      if (fromViewpointNode .constructor === toViewpointNode .constructor)
+      {
          const
-            offset0 = (fromLength > 0 ? fromViewpointNode ._fieldOfView [0] : -1) - (toLength > 0 ? toViewpointNode ._fieldOfView [0] : -1),
-            offset1 = (fromLength > 1 ? fromViewpointNode ._fieldOfView [1] : -1) - (toLength > 1 ? toViewpointNode ._fieldOfView [1] : -1),
-            offset2 = (fromLength > 2 ? fromViewpointNode ._fieldOfView [2] :  1) - (toLength > 2 ? toViewpointNode ._fieldOfView [2] :  1),
-            offset3 = (fromLength > 3 ? fromViewpointNode ._fieldOfView [3] :  1) - (toLength > 3 ? toViewpointNode ._fieldOfView [3] :  1);
+            offset0 = relative .userMinimumX - toViewpointNode .getMinimumX (),
+            offset1 = relative .userMinimumY - toViewpointNode .getMinimumY (),
+            offset2 = relative .userMaximumX - toViewpointNode .getMaximumX (),
+            offset3 = relative .userMaximumY - toViewpointNode .getMaximumY ();
 
          this .fieldOfViewOffsetInterpolator0 ._keyValue = new Fields .MFFloat (offset0, toViewpointNode ._fieldOfViewOffset [0]);
          this .fieldOfViewOffsetInterpolator1 ._keyValue = new Fields .MFFloat (offset1, toViewpointNode ._fieldOfViewOffset [1]);
          this .fieldOfViewOffsetInterpolator2 ._keyValue = new Fields .MFFloat (offset2, toViewpointNode ._fieldOfViewOffset [2]);
          this .fieldOfViewOffsetInterpolator3 ._keyValue = new Fields .MFFloat (offset3, toViewpointNode ._fieldOfViewOffset [3]);
+         this .fieldOfViewScaleInterpolator   ._keyValue = new Fields .MFFloat (1, toViewpointNode ._fieldOfViewScale .getValue ());
 
-         this .fieldOfViewScaleInterpolator ._keyValue = new Fields .MFFloat (fromViewpointNode ._fieldOfViewScale .getValue (), toViewpointNode ._fieldOfViewScale .getValue ());
-
-         this ._fieldOfViewOffset [0] = offset0;
-         this ._fieldOfViewOffset [1] = offset1;
-         this ._fieldOfViewOffset [2] = offset2;
-         this ._fieldOfViewOffset [3] = offset3;
-
-         this ._fieldOfViewScale = fromViewpointNode ._fieldOfViewScale .getValue ();
+         this ._fieldOfViewOffset [0] = relative .offset0;
+         this ._fieldOfViewOffset [1] = relative .offset1;
+         this ._fieldOfViewOffset [2] = relative .offset2;
+         this ._fieldOfViewOffset [3] = relative .offset3;
+         this ._fieldOfViewScale      = 1;
       }
       else
       {
@@ -194,11 +188,10 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
          this .fieldOfViewOffsetInterpolator1 ._keyValue = new Fields .MFFloat (toViewpointNode ._fieldOfViewOffset [1], toViewpointNode ._fieldOfViewOffset [1]);
          this .fieldOfViewOffsetInterpolator2 ._keyValue = new Fields .MFFloat (toViewpointNode ._fieldOfViewOffset [2], toViewpointNode ._fieldOfViewOffset [2]);
          this .fieldOfViewOffsetInterpolator3 ._keyValue = new Fields .MFFloat (toViewpointNode ._fieldOfViewOffset [3], toViewpointNode ._fieldOfViewOffset [3]);
-
-         this .fieldOfViewScaleInterpolator ._keyValue = new Fields .MFFloat (toViewpointNode ._fieldOfViewScale .getValue (), toViewpointNode ._fieldOfViewScale .getValue ());
+         this .fieldOfViewScaleInterpolator   ._keyValue = new Fields .MFFloat (1, toViewpointNode ._fieldOfViewOffset .getValue ());
 
          this ._fieldOfViewOffset = toViewpointNode ._fieldOfViewOffset .getValue ();
-         this ._fieldOfViewScale  = toViewpointNode ._fieldOfViewScale  .getValue ();
+         this ._fieldOfViewScale  = 1;
       }
    },
    getLogarithmicDepthBuffer: function ()
@@ -207,27 +200,51 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
    },
    getMinimumX: function ()
    {
-      return this .minimumX;
+      return this ._fieldOfView .length > 0 ? this ._fieldOfView [0] : -1;
+   },
+   getUserMinimumX: function ()
+   {
+      return (this .getMinimumX () + this ._fieldOfViewOffset [0]) * this ._fieldOfViewScale .getValue ();
    },
    getMinimumY: function ()
    {
-      return this .minimumY;
+      return this ._fieldOfView .length > 1 ? this ._fieldOfView [1] : -1;
+   },
+   getUserMinimumY: function ()
+   {
+      return (this .getMinimumY () + this ._fieldOfViewOffset [1]) * this ._fieldOfViewScale .getValue ();
    },
    getMaximumX: function ()
    {
-      return this .maximumX;
+      return this ._fieldOfView .length > 2 ? this ._fieldOfView [2] : 1;
+   },
+   getUserMaximumX: function ()
+   {
+      return (this .getMaximumX () + this ._fieldOfViewOffset [2]) * this ._fieldOfViewScale .getValue ();
    },
    getMaximumY: function ()
    {
-      return this .maximumY;
+      return this ._fieldOfView .length > 3 ? this ._fieldOfView [3] : 1;
+   },
+   getUserMaximumY: function ()
+   {
+      return (this .getMaximumY () + this ._fieldOfViewOffset [3]) * this ._fieldOfViewScale .getValue ();
    },
    getSizeX: function ()
    {
-      return this .sizeX;
+      return this .getMaximumX () - this .getMinimumX ();
+   },
+   getUserSizeX: function ()
+   {
+      return this .getUserMaximumX () - this .getUserMinimumX ();
    },
    getSizeY: function ()
    {
-      return this .sizeY;
+      return this .getMaximumY () - this .getMinimumY ();
+   },
+   getUserSizeY: function ()
+   {
+      return this .getUserMaximumY () - this .getUserMinimumY ();
    },
    getMaxFarValue: function ()
    {
@@ -238,8 +255,8 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
       const
          width  = viewport [2],
          height = viewport [3],
-         sizeX  = this .sizeX,
-         sizeY  = this .sizeY,
+         sizeX  = this .getUserSizeX (),
+         sizeY  = this .getUserSizeY (),
          aspect = width / height;
 
       if (aspect > sizeX / sizeY)
@@ -264,8 +281,8 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
          const
             width  = viewport [2],
             height = viewport [3],
-            sizeX  = this .sizeX,
-            sizeY  = this .sizeY,
+            sizeX  = this .getUserSizeX (),
+            sizeY  = this .getUserSizeY (),
             aspect = width / height;
 
          if (aspect > sizeX / sizeY)
@@ -284,26 +301,41 @@ OrthoViewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .pr
          width  = viewport [2],
          height = viewport [3],
          aspect = width / height,
-         sizeX  = this .sizeX,
-         sizeY  = this .sizeY;
+         sizeX  = this .getUserSizeX (),
+         sizeY  = this .getUserSizeY ();
 
       if (aspect > sizeX / sizeY)
       {
          const
-            center  = (this .minimumX + this .maximumX) / 2,
+            center  = (this .getUserMinimumX () + this .getUserMaximumX ()) / 2,
             size1_2 = (sizeY * aspect) / 2;
 
-         return Camera .ortho (center - size1_2, center + size1_2, this .minimumY, this .maximumY, nearValue, farValue, this .projectionMatrix);
+         return Camera .ortho (center - size1_2, center + size1_2, this .getUserMinimumY (), this .getUserMaximumY (), nearValue, farValue, this .projectionMatrix);
       }
       else
       {
          const
-            center  = (this .minimumY + this .maximumY) / 2,
+            center  = (this .getUserMinimumY () + this .getUserMaximumY ()) / 2,
             size1_2 = (sizeX / aspect) / 2;
 
-         return Camera .ortho (this .minimumX, this .maximumX, center - size1_2, center + size1_2, nearValue, farValue, this .projectionMatrix);
+         return Camera .ortho (this .getUserMinimumX (), this .getUserMaximumX (), center - size1_2, center + size1_2, nearValue, farValue, this .projectionMatrix);
       }
    },
+   viewAll: function (bbox)
+   {
+      const
+         size   = bbox .size,
+         scaleX = size .x / this .getSizeX (),
+         scaleY = size .y / this .getSizeY (),
+         scale  = Math .max (scaleX, scaleY) * 1.1;
+
+      this ._fieldOfViewOffset [0] = this .getMinimumX () * scale - this .getMinimumX ();
+      this ._fieldOfViewOffset [1] = this .getMinimumY () * scale - this .getMinimumY ();
+      this ._fieldOfViewOffset [2] = this .getMaximumX () * scale - this .getMaximumX ();
+      this ._fieldOfViewOffset [3] = this .getMaximumY () * scale - this .getMaximumY ();
+
+      X3DViewpointNode .prototype .viewAll .call (this, bbox);
+   },
 });
 
 export default OrthoViewpoint;

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

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -49,11 +49,9 @@ import Fields               from "../../Fields.js";
 import X3DFieldDefinition   from "../../Base/X3DFieldDefinition.js";
 import FieldDefinitionArray from "../../Base/FieldDefinitionArray.js";
 import X3DViewpointNode     from "./X3DViewpointNode.js";
-import ScalarInterpolator   from "../Interpolation/ScalarInterpolator.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 import Camera               from "../../../standard/Math/Geometry/Camera.js";
 import Vector2              from "../../../standard/Math/Numbers/Vector2.js";
-import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
 import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
 
 function Viewpoint (executionContext)
@@ -66,8 +64,7 @@ function Viewpoint (executionContext)
    this ._centerOfRotation .setUnit ("length");
    this ._fieldOfView      .setUnit ("angle");
 
-   this .projectionMatrix        = new Matrix4 ();
-   this .fieldOfViewInterpolator = new ScalarInterpolator (this .getBrowser () .getPrivateScene ());
+   this .projectionMatrix = new Matrix4 ();
 }
 
 Viewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototype),
@@ -81,10 +78,14 @@ Viewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototy
       new X3DFieldDefinition (X3DConstants .inputOutput, "orientation",       new Fields .SFRotation ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "centerOfRotation",  new Fields .SFVec3f ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "fieldOfView",       new Fields .SFFloat (0.7854)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "nearDistance",      new Fields .SFFloat (-1)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "farDistance",       new Fields .SFFloat (-1)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "viewAll",           new Fields .SFBool (false)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "jump",              new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "retainUserOffsets", new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .outputOnly,  "isBound",           new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .outputOnly,  "bindTime",          new Fields .SFTime ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "navigationInfo",    new Fields .SFNode ()),
    ]),
    getTypeName: function ()
    {
@@ -98,29 +99,28 @@ Viewpoint .prototype = Object .assign (Object .create (X3DViewpointNode .prototy
    {
       return "children";
    },
-   initialize: function ()
+   getRelativeTransformation: function (fromViewpointNode)
    {
-      X3DViewpointNode .prototype .initialize .call (this);
+      const relative = X3DViewpointNode .prototype .getRelativeTransformation .call (this, fromViewpointNode);
 
-      this .fieldOfViewInterpolator ._key = new Fields .MFFloat (0, 1);
-      this .fieldOfViewInterpolator .setup ();
+      if (fromViewpointNode .constructor === this .constructor)
+         relative .fieldOfView = fromViewpointNode .getFieldOfView ();
 
-      this .getEaseInEaseOut () ._modifiedFraction_changed .addFieldInterest (this .fieldOfViewInterpolator ._set_fraction);
-      this .fieldOfViewInterpolator ._value_changed .addFieldInterest (this ._fieldOfViewScale);
+      return relative;
    },
-   setInterpolators: function (fromViewpointNode, toViewpointNode)
+   setInterpolators: function (fromViewpointNode, toViewpointNode, relative)
    {
-      if (fromViewpointNode .getType () .includes (X3DConstants .Viewpoint) || fromViewpointNode .getType () .includes (X3DConstants .GeoViewpoint))
+      if (fromViewpointNode .constructor === toViewpointNode .constructor)
       {
-         const scale = fromViewpointNode .getFieldOfView () / toViewpointNode .getFieldOfView ();
+         const scale = relative .fieldOfView / toViewpointNode .getFieldOfView ();
 
-         this .fieldOfViewInterpolator ._keyValue = new Fields .MFFloat (scale, toViewpointNode ._fieldOfViewScale .getValue ());
+         this .fieldOfViewScaleInterpolator ._keyValue = new Fields .MFFloat (scale, toViewpointNode ._fieldOfViewScale .getValue ());
 
          this ._fieldOfViewScale = scale;
       }
       else
       {
-         this .fieldOfViewInterpolator ._keyValue = new Fields .MFFloat (toViewpointNode ._fieldOfViewScale .getValue (), toViewpointNode ._fieldOfViewScale .getValue ());
+         this .fieldOfViewScaleInterpolator ._keyValue = new Fields .MFFloat (toViewpointNode ._fieldOfViewScale .getValue (), toViewpointNode ._fieldOfViewScale .getValue ());
 
          this ._fieldOfViewScale = toViewpointNode ._fieldOfViewScale .getValue ();
       }