x_ite 4.2.17 → 4.7.7

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

@@ -124,19 +124,21 @@ function (Fields,
 			this .getEaseInEaseOut () .modifiedFraction_changed_ .addFieldInterest (this .fieldOfViewInterpolator .set_fraction_);
 			this .fieldOfViewInterpolator .value_changed_ .addFieldInterest (this .fieldOfViewScale_);
 		},
-		setInterpolators: function (fromViewpoint)
+		setInterpolators: function (fromViewpointNode, toViewpointNode)
 		{
-			if (fromViewpoint .getType () .indexOf (X3DConstants .Viewpoint) < 0)
+			if (fromViewpointNode .getType () .indexOf (X3DConstants .Viewpoint) >= 0)
 			{
-				this .fieldOfViewInterpolator .keyValue_ = new Fields .MFFloat (this .fieldOfViewScale_ .getValue (), this .fieldOfViewScale_ .getValue ());
+				const scale = fromViewpointNode .getFieldOfView () / toViewpointNode .getFieldOfView ();
+
+				this .fieldOfViewInterpolator .keyValue_ = new Fields .MFFloat (scale, toViewpointNode .fieldOfViewScale_ .getValue ());
+
+				this .fieldOfViewScale_ = scale;
 			}
 			else
 			{
-				var scale = fromViewpoint .getFieldOfView () / this .fieldOfView_ .getValue ();
-	
-				this .fieldOfViewInterpolator .keyValue_ = new Fields .MFFloat (scale, this .fieldOfViewScale_ .getValue ());
-	
-				this .fieldOfViewScale_ = scale;
+				this .fieldOfViewInterpolator .keyValue_ = new Fields .MFFloat (toViewpointNode .fieldOfViewScale_ .getValue (), toViewpointNode .fieldOfViewScale_ .getValue ());
+
+				this .fieldOfViewScale_ = toViewpointNode .fieldOfViewScale_ .getValue ();
 			}
 		},
 		getFieldOfView: function ()
@@ -152,17 +154,17 @@ function (Fields,
 			return function (point, viewport)
 			{
 			   // Returns the screen scale in meter/pixel for on pixel.
-	
+
 				var
 					width  = viewport [2],
 					height = viewport [3],
 					size   = Math .abs (point .z) * Math .tan (this .getFieldOfView () / 2) * 2;
-	
+
 				if (width > height)
 					size /= height;
 				else
 					size /= width;
-	
+
 				return screenScale .set (size, size, size);
 			};
 		})(),
@@ -173,7 +175,7 @@ function (Fields,
 			return function (viewport, nearValue)
 			{
 				// Returns viewport size in meters.
-	
+
 				var
 					width  = viewport [2],
 					height = viewport [3],
@@ -182,7 +184,7 @@ function (Fields,
 
 				if (aspect > 1)
 					return viewportSize .set (size * aspect, size);
-	
+
 				return viewportSize .set (size, size / aspect);
 			};
 		})(),
@@ -198,5 +200,3 @@ function (Fields,
 
 	return Viewpoint;
 });
-
-

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

@@ -87,8 +87,8 @@ function (Fields,
 		constructor: ViewpointGroup,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",          new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "displayed",         new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "description",       new Fields .SFString ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "displayed",         new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "retainUserOffsets", new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "size",              new Fields .SFVec3f ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "center",            new Fields .SFVec3f ()),
@@ -139,14 +139,21 @@ function (Fields,
 
 			if (displayed && proxy)
 			{
-				this .proximitySensor .isCameraObject_ .addFieldInterest (this .isCameraObject_);
-				this .setCameraObject (this .proximitySensor .getCameraObject ());
+				this .proximitySensor .isCameraObject_   .addFieldInterest (this .isCameraObject_);
+				this .proximitySensor .isPickableObject_ .addFieldInterest (this .isPickableObject_);
+
+				this .setCameraObject   (this .proximitySensor .getCameraObject ());
+				this .setPickableObject (this .proximitySensor .getPickableObject ());
+
 				this .traverse = traverseWithProximitySensor;
 			}
 			else
 			{
-				this .proximitySensor .isCameraObject_ .removeFieldInterest (this .isCameraObject_);
-				this .setCameraObject (displayed);
+				this .proximitySensor .isCameraObject_    .removeFieldInterest (this .isCameraObject_);
+				this .proximitySensor .isPickableObject_ .removeFieldInterest (this .isPickableObject_);
+
+				this .setCameraObject   (displayed);
+				this .setPickableObject (false);
 
 				if (displayed)
 					this .traverse = traverse;

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

@@ -56,7 +56,6 @@ define ([
 	"x_ite/Components/Interpolation/OrientationInterpolator",
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
-	"standard/Math/Numbers/Vector2",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Rotation4",
 	"standard/Math/Numbers/Matrix4",
@@ -69,7 +68,6 @@ function (Fields,
           OrientationInterpolator,
           TraverseType,
           X3DConstants,
-          Vector2,
           Vector3,
           Rotation4,
           Matrix4)
@@ -89,14 +87,14 @@ function (Fields,
 		                       "centerOfRotationOffset", new Fields .SFVec3f (),
 		                       "fieldOfViewScale",       new Fields .SFFloat (1));
 
-	   this .userPosition             = new Vector3 (0, 1, 0);
-	   this .userOrientation          = new Rotation4 (0, 0, 1, 0);
-	   this .userCenterOfRotation     = new Vector3 (0, 0, 0);
-		this .modelMatrix              = new Matrix4 ();
-		this .cameraSpaceMatrix        = new Matrix4 (1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0,  10, 1);
-		this .inverseCameraSpaceMatrix = new Matrix4 (1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, -10, 1);
+	   this .userPosition         = new Vector3 (0, 1, 0);
+	   this .userOrientation      = new Rotation4 (0, 0, 1, 0);
+	   this .userCenterOfRotation = new Vector3 (0, 0, 0);
+		this .modelMatrix          = new Matrix4 ();
+		this .cameraSpaceMatrix    = new Matrix4 (1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0,  10, 1);
+		this .viewMatrix           = new Matrix4 (1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, -10, 1);
 
-		var browser = this .getBrowser ();
+		const browser = this .getBrowser ();
 
 		this .timeSensor                   = new TimeSensor              (browser .getPrivateScene ());
 		this .easeInEaseOut                = new EaseInEaseOut           (browser .getPrivateScene ());
@@ -112,7 +110,7 @@ function (Fields,
 		initialize: function ()
 		{
 			X3DBindableNode .prototype .initialize .call (this);
-		
+
 			this .timeSensor .stopTime_ = 1;
 			this .timeSensor .setup ();
 
@@ -130,6 +128,7 @@ function (Fields,
 			this .scaleInterpolator            .setup ();
 			this .scaleOrientationInterpolator .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_);
@@ -149,18 +148,6 @@ function (Fields,
 			return this .easeInEaseOut;
 		},
 		setInterpolators: function () { },
-		bindToLayer: function (layer)
-		{
-			layer .getViewpointStack () .push (this);
-		},
-		unbindFromLayer: function (layer)
-		{
-			layer .getViewpointStack () .pop (this);
-		},
-		removeFromLayer: function (layer)
-		{
-			layer .getViewpointStack () .remove (this);
-		},
 		getPosition: function ()
 		{
 			return this .position_ .getValue ();
@@ -187,7 +174,7 @@ function (Fields,
 		},
 		getProjectionMatrix: function (renderObject)
 		{
-			var navigationInfo = renderObject .getNavigationInfo ();
+			const navigationInfo = renderObject .getNavigationInfo ();
 
 			return this .getProjectionMatrixWithLimits (navigationInfo .getNearValue (),
                                                      navigationInfo .getFarValue (this),
@@ -197,9 +184,9 @@ function (Fields,
 		{
 			return this .cameraSpaceMatrix;
 		},
-		getInverseCameraSpaceMatrix: function ()
+		getViewMatrix: function ()
 		{
-			return this .inverseCameraSpaceMatrix;
+			return this .viewMatrix;
 		},
 		getModelMatrix: function ()
 		{
@@ -219,67 +206,76 @@ function (Fields,
 		{
 			return 1;
 		},
-		setAnimate: function (value)
+		setVRMLTransition: function (value)
 		{
 			// VRML behaviour support.
-			this .animate = value;
+			this .VRMLTransition = value;
 		},
-		getAnimate: function ()
+		getVRMLTransition: function ()
 		{
 			// VRML behaviour support.
-			return this .animate;
+			return this .VRMLTransition;
 		},
 		transitionStart: (function ()
 		{
-			var
+			const
 				relativePosition         = new Vector3 (0, 0, 0),
 				relativeOrientation      = new Rotation4 (0, 0, 1, 0),
 				relativeScale            = new Vector3 (0, 0, 0),
 				relativeScaleOrientation = new Rotation4 (0, 0, 1, 0);
 
-			return function (fromViewpoint)
+			return function (layerNode, fromViewpointNode, toViewpointNode)
 			{
 				try
 				{
-					if (this .jump_ .getValue ())
+					this .to = toViewpointNode;
+
+					if (toViewpointNode .jump_ .getValue ())
 					{
-						var layers = this .getLayers ();
-	
-						if (! this .retainUserOffsets_ .getValue ())
-							this .resetUserOffsets ();
-		
-						for (var i = 0; i < layers .length; ++ i)
-						{
-							var navigationInfo = layers [i] .getNavigationInfo ();
-	
-							navigationInfo .transitionStart_ = true;
+						if (! toViewpointNode .retainUserOffsets_ .getValue ())
+							toViewpointNode .resetUserOffsets ();
+
+						// Copy from toViewpointNode all fields.
 
-							var
-								transitionType = navigationInfo .getTransitionType (),
-								transitionTime = navigationInfo .transitionTime_ .getValue ();
+						if (this !== toViewpointNode)
+						{
+							toViewpointNode .getFields () .forEach (function (field)
+							{
+								this .getFields () .get (field .getName ()) .assign (field);
+							}
+							.bind (this));
 						}
 
-						// VRML behaviour
+						// Respect NavigationInfo.
+
+						const
+							navigationInfoNode = layerNode .getNavigationInfo (),
+							transitionTime     = navigationInfoNode .transitionTime_ .getValue ();
+
+						let transitionType = navigationInfoNode .getTransitionType ();
+
+						// VRML behavior
 
 						if (this .getExecutionContext () .getSpecificationVersion () == "2.0")
 						{
-							if (this .getAnimate ())
+							if (toViewpointNode .getVRMLTransition ())
 								transitionType = "LINEAR";
 							else
 								transitionType = "TELEPORT";
 						}
 
-						this .setAnimate (false); // VRML
+						toViewpointNode .setVRMLTransition (false);
 
-						// End VRML behaviour
+						// End VRML behavior
+
+						if (transitionTime <= 0)
+							transitionType = "TELEPORT";
 
 						switch (transitionType)
 						{
 							case "TELEPORT":
 							{
-								for (var i = 0; i < layers .length; ++ i)
-									layers [i] .getNavigationInfo () .transitionComplete_ = true;
-	
+								navigationInfoNode .transitionComplete_ = true;
 								return;
 							}
 							case "ANIMATE":
@@ -294,36 +290,39 @@ function (Fields,
 								break;
 							}
 						}
-						
+
 						this .timeSensor .cycleInterval_ = transitionTime;
 						this .timeSensor .stopTime_      = this .getBrowser () .getCurrentTime ();
 						this .timeSensor .startTime_     = this .getBrowser () .getCurrentTime ();
-						this .timeSensor .isActive_ .addInterest ("set_active__", this);
-	
-						this .getRelativeTransformation (fromViewpoint, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
-	
-						this .positionInterpolator         .keyValue_ = new Fields .MFVec3f    (relativePosition,         this .positionOffset_);
-						this .orientationInterpolator      .keyValue_ = new Fields .MFRotation (relativeOrientation,      this .orientationOffset_);
-						this .scaleInterpolator            .keyValue_ = new Fields .MFVec3f    (relativeScale,            this .scaleOffset_);
-						this .scaleOrientationInterpolator .keyValue_ = new Fields .MFRotation (relativeScaleOrientation, this .scaleOrientationOffset_);
-	
+
+						this .timeSensor .isActive_ .addInterest ("set_active__", this, navigationInfoNode);
+
+						toViewpointNode .getRelativeTransformation (fromViewpointNode, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
+
+						this .positionInterpolator         .keyValue_ = new Fields .MFVec3f    (relativePosition,         toViewpointNode .positionOffset_);
+						this .orientationInterpolator      .keyValue_ = new Fields .MFRotation (relativeOrientation,      toViewpointNode .orientationOffset_);
+						this .scaleInterpolator            .keyValue_ = new Fields .MFVec3f    (relativeScale,            toViewpointNode .scaleOffset_);
+						this .scaleOrientationInterpolator .keyValue_ = new Fields .MFRotation (relativeScaleOrientation, toViewpointNode .scaleOrientationOffset_);
+
 						this .positionOffset_         = relativePosition;
 						this .orientationOffset_      = relativeOrientation;
 						this .scaleOffset_            = relativeScale;
 						this .scaleOrientationOffset_ = relativeScaleOrientation;
-	
-						this .setInterpolators (fromViewpoint);
+
+						this .setInterpolators (fromViewpointNode, toViewpointNode);
+
+						this .transitionActive_ = true;
 					}
 					else
 					{
-						this .getRelativeTransformation (fromViewpoint, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
-		 
-						this .positionOffset_         = relativePosition;
-						this .orientationOffset_      = relativeOrientation;
-						this .scaleOffset_            = relativeScale;
-						this .scaleOrientationOffset_ = relativeScaleOrientation;
-	
-						this .setInterpolators (fromViewpoint);
+						toViewpointNode .getRelativeTransformation (fromViewpointNode, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
+
+						toViewpointNode .positionOffset_         = relativePosition;
+						toViewpointNode .orientationOffset_      = relativeOrientation;
+						toViewpointNode .scaleOffset_            = relativeScale;
+						toViewpointNode .scaleOrientationOffset_ = relativeScaleOrientation;
+
+						toViewpointNode .setInterpolators (fromViewpointNode, toViewpointNode);
 					}
 				}
 				catch (error)
@@ -346,151 +345,140 @@ function (Fields,
 			this .centerOfRotationOffset_ = Vector3   .Zero;
 			this .fieldOfViewScale_       = 1;
 		},
-		getRelativeTransformation: function (fromViewpoint, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation)
+		getRelativeTransformation: function (fromViewpointNode, relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation)
 		// throw
 		{
-			var differenceMatrix = this .modelMatrix .copy () .multRight (fromViewpoint .getInverseCameraSpaceMatrix ()) .inverse ();
+			const differenceMatrix = this .modelMatrix .copy () .multRight (fromViewpointNode .getViewMatrix ()) .inverse ();
 
 			differenceMatrix .get (relativePosition, relativeOrientation, relativeScale, relativeScaleOrientation);
 
 			relativePosition .subtract (this .getPosition ());
 			relativeOrientation .assign (this .getOrientation () .copy () .inverse () .multRight (relativeOrientation));
 		},
-		lookAtPoint: function (point, factor, straighten)
+		lookAtPoint: function (layerNode, point, factor, straighten)
 		{
 			try
 			{
-				if (! this .getBrowser () .getActiveLayer ())
-					return;
-	
 				this .getCameraSpaceMatrix () .multVecMatrix (point);
 
 				Matrix4 .inverse (this .getModelMatrix ()) .multVecMatrix (point);
 
-				var minDistance = this .getBrowser () .getActiveLayer () .getNavigationInfo () .getNearValue () * 2;
-		
-				this .lookAt (point, minDistance, factor, straighten);
+				const minDistance = layerNode .getNavigationInfo () .getNearValue () * 2;
+
+				this .lookAt (layerNode, point, minDistance, factor, straighten);
 			}
 			catch (error)
 			{
 				console .error (error);
 			}
 		},
-		lookAtBBox: function (bbox, factor, straighten)
+		lookAtBBox: function (layerNode, bbox, factor, straighten)
 		{
 			try
 			{
-				if (! this .getBrowser () .getActiveLayer ())
-					return;
-
 				bbox = bbox .copy () .multRight (Matrix4 .inverse (this .getModelMatrix ()));
-		
-				var minDistance = this .getBrowser () .getActiveLayer () .getNavigationInfo () .getNearValue () * 2;
-		
-				this .lookAt (bbox .center, minDistance, factor, straighten);
+
+				const minDistance = layerNode .getNavigationInfo () .getNearValue () * 2;
+
+				this .lookAt (layerNode, bbox .center, minDistance, factor, straighten);
 			}
 			catch (error)
-			{ }
+			{
+				console .log (error);
+			}
 		},
-		lookAt: function (point, distance, factor, straighten)
+		lookAt: function (layerNode, point, distance, factor, straighten)
 		{
-			var
-				layers = this .getLayers (),
+			const
 				offset = point .copy () .add (this .getUserOrientation () .multVecRot (new Vector3 (0, 0, distance))) .subtract (this .getPosition ());
 
-			layers .forEach (function (layer)
-			{
-				layer .getNavigationInfo () .transitionStart_ = true;
-			});
-		
+			layerNode .getNavigationInfo () .transitionStart_ = true;
+
 			this .timeSensor .cycleInterval_ = 0.2;
 			this .timeSensor .stopTime_      = this .getBrowser () .getCurrentTime ();
 			this .timeSensor .startTime_     = this .getBrowser () .getCurrentTime ();
-			this .timeSensor .isActive_ .addInterest ("set_active__", this);
-	
+
+			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));
 
-			var
+			const
 				translation = Vector3 .lerp (this .positionOffset_ .getValue (), offset, factor),
-				direction   = Vector3 .add (this .getPosition (), translation) .subtract (point),
-				rotation    = Rotation4 .multRight (this .orientationOffset_ .getValue (), new Rotation4 (this .getUserOrientation () .multVecRot (new Vector3 (0, 0, 1)), direction));
-		
+				direction   = Vector3 .add (this .getPosition (), translation) .subtract (point);
+
+			let rotation = Rotation4 .multRight (this .orientationOffset_ .getValue (), new Rotation4 (this .getUserOrientation () .multVecRot (new Vector3 (0, 0, 1)), direction));
+
 			if (straighten)
+			{
 				rotation = Rotation4 .inverse (this .getOrientation ()) .multRight (this .straightenHorizon (Rotation4 .multRight (this .getOrientation (), rotation)));
-		
+			}
+
 			this .positionInterpolator         .keyValue_ = new Fields .MFVec3f (this .positionOffset_, translation);
 			this .orientationInterpolator      .keyValue_ = new Fields .MFRotation (this .orientationOffset_, rotation);
 			this .scaleInterpolator            .keyValue_ = new Fields .MFVec3f (this .scaleOffset_, this .scaleOffset_);
 			this .scaleOrientationInterpolator .keyValue_ = new Fields .MFRotation (this .scaleOrientationOffset_, this .scaleOrientationOffset_);
-			
-			this .setInterpolators (this);
+
+			this .setInterpolators (this, this);
 
 			this .centerOfRotationOffset_ = Vector3 .subtract (point, this .getCenterOfRotation ());
 			this .set_bind_               = true;
 		},
-		straighten: function (horizon)
+		straighten: function (layerNode, horizon)
 		{
-			var layers = this .getLayers ();
-
-			layers .forEach (function (layer)
-			{
-				layer .getNavigationInfo () .transitionStart_ = true;
-			});
+			layerNode .getNavigationInfo () .transitionStart_ = true;
 
 			this .timeSensor .cycleInterval_ = 0.4;
 			this .timeSensor .stopTime_      = this .getBrowser () .getCurrentTime ();
 			this .timeSensor .startTime_     = this .getBrowser () .getCurrentTime ();
-			this .timeSensor .isActive_ .addInterest ("set_active__", this);
-			
+
+			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));
-		
-			var rotation = Rotation4 .multRight (Rotation4 .inverse (this .getOrientation ()), this .straightenHorizon (this .getUserOrientation ()));
+
+			const rotation = Rotation4 .multRight (Rotation4 .inverse (this .getOrientation ()), this .straightenHorizon (this .getUserOrientation ()));
 
 			this .positionInterpolator         .keyValue_ = new Fields .MFVec3f (this .positionOffset_, this .positionOffset_);
 			this .orientationInterpolator      .keyValue_ = new Fields .MFRotation (this .orientationOffset_, rotation);
 			this .scaleInterpolator            .keyValue_ = new Fields .MFVec3f (this .scaleOffset_, this .scaleOffset_);
 			this .scaleOrientationInterpolator .keyValue_ = new Fields .MFRotation (this .scaleOrientationOffset_, this .scaleOrientationOffset_);
-	
-			this .setInterpolators (this);
-		
+
+			this .setInterpolators (this, this);
+
 			this .set_bind_ = true;
 		},
 		straightenHorizon: (function ()
 		{
-			var
-				localXAxis = new Vector3 (0, 0, 0),
-				localZAxis = new Vector3 (0, 0, 0),
-				vector     = new Vector3 (0, 0, 0),
-				rotation   = new Rotation4 (0, 0, 1, 0);
+			const
+				localXAxis  = new Vector3 (0, 0, 0),
+				localZAxis  = new Vector3 (0, 0, 0),
+				rotation    = new Rotation4 (0, 0, 1, 0);
 
 			return function (orientation)
 			{
 				orientation .multVecRot (localXAxis .assign (Vector3 .xAxis) .negate ());
 				orientation .multVecRot (localZAxis .assign (Vector3 .zAxis));
 
-				var vector = localZAxis .cross (this .getUpVector ());
+				const
+				 	upVector = this .getUpVector (),
+					vector   = localZAxis .cross (upVector);
 
 				// If viewer looks along the up vector.
-				if (vector .equals (Vector3 .Zero))
+				if (Math .abs (localZAxis .dot (upVector)) >= 1)
+					return orientation;
+
+				if (Math .abs (vector .dot (localXAxis)) >= 1)
 					return orientation;
 
 				rotation .setFromToVec (localXAxis, vector);
-	
+
 				return orientation .multRight (rotation);
 			};
 		})(),
-		set_active__: function (active)
+		set_active__: function (active, navigationInfoNode)
 		{
-			if (! active .getValue () && this .timeSensor .fraction_changed_ .getValue () === 1)
+			if (this .isBound_ .getValue () && ! active .getValue () && this .timeSensor .fraction_changed_ .getValue () === 1)
 			{
-				var layers = this .getLayers ();
-
-				for (var i = 0; i < layers .length; ++ i)
-				{
-					layers [i] .getNavigationInfo () .transitionComplete_ = true;
-				}
-
-				this .easeInEaseOut .set_fraction_ = 1;
+				navigationInfoNode .transitionComplete_ = true;
 			}
 		},
 		set_bound__: function ()
@@ -502,6 +490,9 @@ function (Fields,
 		},
 		traverse: function (type, renderObject)
 		{
+			if (type !== TraverseType .CAMERA)
+				return;
+
 			renderObject .getLayer () .getViewpoints () .push (this);
 
 			this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
@@ -511,22 +502,20 @@ function (Fields,
 			try
 			{
 				this .cameraSpaceMatrix .set (this .getUserPosition (),
-				                              this .getUserOrientation (),
-				                              this .scaleOffset_ .getValue (),
-				                              this .scaleOrientationOffset_ .getValue ());
+														this .getUserOrientation (),
+														this .scaleOffset_ .getValue (),
+														this .scaleOrientationOffset_ .getValue ());
 
-				this .cameraSpaceMatrix .multRight (this .modelMatrix);
+				this .cameraSpaceMatrix .multRight ((this .to || this) .modelMatrix);
 
-				this .inverseCameraSpaceMatrix .assign (this .cameraSpaceMatrix) .inverse ();
+				this .viewMatrix .assign (this .cameraSpaceMatrix) .inverse ();
 			}
 			catch (error)
 			{
-			   console .log (error);
+				console .log (error);
 			}
-		},
+		}
 	});
 
 	return X3DViewpointNode;
 });
-
-

package/src/x_ite/Components/Navigation.js

@@ -69,7 +69,7 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		Billboard:      Billboard,
 		Collision:      Collision,
@@ -80,17 +80,14 @@ function (SupportedNodes,
 		ViewpointGroup: ViewpointGroup,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
 		X3DViewpointNode: X3DViewpointNode,
 	};
-	
-	for (var typeName in Types)
-		SupportedNodes .addType (typeName, Types [typeName]); 
 
-	for (var typeName in AbstractTypes)
-		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]); 
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
 
-	return Types;
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
 });
-