x_ite 4.2.17 → 4.7.7

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

@@ -49,6 +49,10 @@
 
 define ([
 	"jquery",
+	"x_ite/Fields",
+	"x_ite/Basic/X3DFieldDefinition",
+	"x_ite/Basic/FieldDefinitionArray",
+	"x_ite/Bits/X3DConstants",
 	"x_ite/Browser/Navigation/X3DViewer",
 	"x_ite/Components/Followers/PositionChaser",
 	"x_ite/Components/Followers/OrientationChaser",
@@ -58,6 +62,10 @@ define ([
 	"jquery-mousewheel",
 ],
 function ($,
+          Fields,
+          X3DFieldDefinition,
+          FieldDefinitionArray,
+          X3DConstants,
           X3DViewer,
           PositionChaser,
           OrientationChaser,
@@ -67,12 +75,14 @@ function ($,
 {
 "use strict";
 
+	var macOS = /Mac OS X/i .test (navigator .userAgent)
+
 	var
 		MOTION_TIME       = 0.05 * 1000,
 		SPIN_RELEASE_TIME = 0.04 * 1000,
 		SPIN_ANGLE        = 0.003,
 		SPIN_FACTOR       = 0.6,
-		SCROLL_FACTOR     = 1.0 / 20.0,
+		SCROLL_FACTOR     = macOS ? 1 / 120 : 1 / 20,
 		MOVE_TIME         = 0.2,
 		ROTATE_TIME       = 0.2,
 		MAX_ANGLE         = 0.97;
@@ -91,6 +101,7 @@ function ($,
 		this .pressTime                = 0;
 		this .motionTime               = 0;
 
+		this .touchMode                = 0;
 		this .touch1                   = new Vector2 (0, 0);
 		this .touch2                   = new Vector2 (0, 0);
 		this .tapStart                 = 0;
@@ -106,13 +117,16 @@ function ($,
 	ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
 	{
 		constructor: ExamineViewer,
+		fieldDefinitions: new FieldDefinitionArray ([
+			new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
+		]),
 		initialize: function ()
 		{
 			X3DViewer .prototype .initialize .call (this);
 
 			var
 			   browser = this .getBrowser (),
-			   element = browser .getElement ();
+			   element = browser .getSurface ();
 
 			// Disconnect from spin.
 
@@ -147,7 +161,7 @@ function ($,
 		},
 		set_activeViewpoint__: function ()
 		{
-			if (this .getBrowser () .getBrowserOption ("StraightenHorizon"))
+			if (this .getStraightenHorizon ())
 			{
 				var viewpoint = this .getActiveViewpoint ();
 
@@ -159,17 +173,20 @@ function ($,
 		},
 		mousedown: function (event)
 		{
+			if (this .getBrowser () .getContextMenu () .getActive ())
+				return;
+
 			if (this .button >= 0)
 				return;
-		
+
 			this .pressTime = performance .now ();
 
 			var
-				offset = this .getBrowser () .getElement () .offset (),
+				offset = this .getBrowser () .getSurface () .offset (),
 				x      = event .pageX - offset .left,
 				y      = event .pageY - offset .top;
 
-			switch (event .button)
+			switch (this .getButton (event .button))
 			{
 				case 0:
 				{
@@ -193,7 +210,9 @@ function ($,
 					this .trackballProjectToSphere (x, y, this .fromVector);
 					this .rotation .assign (Rotation4 .Identity);
 
-					this .motionTime = 0;			
+					this .motionTime = 0;
+
+					this .isActive_ = true;
 					break;
 				}
 				case 1:
@@ -210,12 +229,14 @@ function ($,
 					$(document) .bind ("mousemove.ExamineViewer" + this .getId (), this .mousemove .bind (this));
 					$(document) .bind ("touchend.ExamineViewer"  + this .getId (), this .touchend  .bind (this));
 					$(document) .bind ("touchmove.ExamineViewer" + this .getId (), this .touchmove .bind (this));
-		
+
 					this .disconnect ();
 					this .getActiveViewpoint () .transitionStop ();
 					this .getBrowser () .setCursor ("MOVE");
 
 					this .getPointOnCenterPlane (x, y, this .fromPoint);
+
+					this .isActive_ = true;
 					break;
 				}
 			}
@@ -226,10 +247,10 @@ function ($,
 				return;
 
 			this .button = -1;
-		
+
 			$(document) .unbind (".ExamineViewer" + this .getId ());
 
-			switch (event .button)
+			switch (this .getButton (event .button))
 			{
 				case 0:
 				{
@@ -245,12 +266,13 @@ function ($,
 
 					if (Math .abs (this .rotation .angle) > SPIN_ANGLE && performance .now () - this .motionTime < SPIN_RELEASE_TIME)
 					{
-						if (this .getBrowser () .getBrowserOption ("StraightenHorizon") && viewpoint .getTypeName () !== "GeoViewpoint")
+						if (this .getStraightenHorizon () && viewpoint .getTypeName () !== "GeoViewpoint")
 							this .rotation = this .getHorizonRotation (this .rotation);
 
 						this .addSpinning (this .rotation);
 					}
 
+					this .isActive_ = false;
 					break;
 				}
 				case 1:
@@ -262,6 +284,8 @@ function ($,
 					event .stopImmediatePropagation ();
 
 					this .getBrowser () .setCursor ("DEFAULT");
+
+					this .isActive_ = false;
 					break;
 				}
 			}
@@ -272,13 +296,14 @@ function ($,
 			event .preventDefault ();
 			event .stopImmediatePropagation ();
 
-			var
-				offset = this .getBrowser () .getElement () .offset (), 
-				x      = event .pageX - offset .left,
-				y      = this .getBrowser () .getElement () .height () - (event .pageY - offset .top);
+			const
+				element = this .getBrowser () .getSurface (),
+				offset  = element .offset (),
+				x       = event .pageX - offset .left - parseFloat (element .css ('borderLeftWidth')),
+				y       = element .innerHeight () - (event .pageY - offset .top - parseFloat (element .css ('borderTopWidth')));
 
 			this .disconnect ();
-			this .lookAtBBox (x, y, this .getBrowser () .getBrowserOption ("StraightenHorizon"));
+			this .lookAtBBox (x, y, this .getStraightenHorizon ());
 		},
 		mousemove: (function ()
 		{
@@ -287,11 +312,11 @@ function ($,
 			return function (event)
 			{
 				var
-					offset = this .getBrowser () .getElement () .offset (),
+					offset = this .getBrowser () .getSurface () .offset (),
 					x      = event .pageX - offset .left,
 					y      = event .pageY - offset .top;
-	
-				switch (this .button)
+
+				switch (this .getButton (this .button))
 				{
 					case 0:
 					{
@@ -300,16 +325,16 @@ function ($,
 						// Stop event propagation.
 						event .preventDefault ();
 						event .stopImmediatePropagation ();
-	
+
 						var toVector = this .trackballProjectToSphere (x, y, this .toVector);
-	
+
 						this .rotation .setFromToVec (toVector, this .fromVector);
-	
+
 						if (Math .abs (this .rotation .angle) < SPIN_ANGLE && performance .now () - this .pressTime < MOTION_TIME)
 							return;
-	
+
 						this .addRotate (this .rotation);
-	
+
 						this .fromVector .assign (toVector);
 						this .motionTime = performance .now ();
 						break;
@@ -321,14 +346,14 @@ function ($,
 						// Stop event propagation.
 						event .preventDefault ();
 						event .stopImmediatePropagation ();
-	
+
 						var
 							viewpoint   = this .getActiveViewpoint (),
 							toPoint     = this .getPointOnCenterPlane (x, y, this .toPoint),
 							translation = viewpoint .getUserOrientation () .multVecRot (fromPoint .assign (this .fromPoint) .subtract (toPoint));
-	
+
 						this .addMove (translation, translation);
-	
+
 						this .fromPoint .assign (toPoint);
 						break;
 					}
@@ -346,22 +371,22 @@ function ($,
 				// Stop event propagation.
 				event .preventDefault ();
 				event .stopImmediatePropagation ();
-	
+
 				// Change viewpoint position.
-	
+
 				var
 					browser   = this .getBrowser (),
 					viewpoint = this .getActiveViewpoint ();
-	
+
 				browser .prepareEvents () .removeInterest ("spin", this);
 				viewpoint .transitionStop ();
 
 				step        = this .getDistanceToCenter (step) .multiply (event .zoomFactor || SCROLL_FACTOR),
 				translation = viewpoint .getUserOrientation () .multVecRot (translation .set (0, 0, step .abs ()));
-	
+
 				if (event .deltaY > 0)
-					this .addMove (translation .negate (), Vector3 .Zero);		
-				
+					this .addMove (translation .negate (), Vector3 .Zero);
+
 				else if (event .deltaY < 0)
 					this .addMove (translation, Vector3 .Zero);
 			};
@@ -379,7 +404,7 @@ function ($,
 					event .button = 0;
 					event .pageX  = touches [0] .pageX;
 					event .pageY  = touches [0] .pageY;
-		
+
 					this .mousedown (event);
 
 					// Remember tap.
@@ -422,7 +447,9 @@ function ($,
 				case 0:
 				{
 					// End rotate (button 0).
+
 					event .button = 0;
+
 					this .mouseup (event);
 
 					// Start dblclick (button 0).
@@ -442,7 +469,10 @@ function ($,
 				case 1:
 				{
 					// End move (button 1).
-					event .button = 1;
+
+					this .touchMode = 0;
+					event .button   = 1;
+
 					this .mouseup (event);
 					break;
 				}
@@ -459,16 +489,16 @@ function ($,
 			return function (event)
 			{
 				var touches = event .originalEvent .touches;
-	
+
 				switch (touches .length)
 				{
 					case 1:
 					{
 						// Rotate (button 0).
-	
+
 						event .pageX = touches [0] .pageX;
 						event .pageY = touches [0] .pageY;
-			
+
 						this .mousemove (event);
 						break;
 					}
@@ -479,36 +509,48 @@ function ($,
 
 						var
 							move = touch1Change .dot (touch2Change) > MOVE_ANGLE,
-							zoom = touch1Change .dot (touch2Change) < ZOOM_ANGLE;
+							zoom = touch1Change .dot (touch2Change) < ZOOM_ANGLE,
+							mode = this .touchMode || (move ? 1 : (zoom ? 2 : 0));
 
-						if (move)
+						switch (mode)
 						{
-							// Move (button 1).
-		
-							event .pageX = (touches [0] .pageX + touches [1] .pageX) / 2;
-							event .pageY = (touches [0] .pageY + touches [1] .pageY) / 2;
-		
-							this .mousemove (event);
-						}
-						else if (zoom)
-						{	
-							// Zoom (mouse wheel).
-		
-							var distance1 = this .touch1 .distance (this .touch2);
-			
-							this .touch1 .set (touches [0] .pageX, touches [0] .pageY);
-							this .touch2 .set (touches [1] .pageX, touches [1] .pageY);
-			
-							var
-								distance2 = this .touch1 .distance (this .touch2),
-								delta     = distance2 - distance1;
-			
-							event .deltaY     = delta;
-							event .zoomFactor = Math .abs (delta) / $(window) .width ();
-
-							this .mousewheel (event);
+							case 1:
+							{
+								// Move (button 1).
+
+								this .touchMode = 1;
+
+								event .pageX = (touches [0] .pageX + touches [1] .pageX) / 2;
+								event .pageY = (touches [0] .pageY + touches [1] .pageY) / 2;
+
+								this .mousemove (event);
+
+								break;
+							}
+							case 2:
+							{
+								// Zoom (mouse wheel).
+
+								this .touchMode = 2;
+
+								var distance1 = this .touch1 .distance (this .touch2);
+
+								this .touch1 .set (touches [0] .pageX, touches [0] .pageY);
+								this .touch2 .set (touches [1] .pageX, touches [1] .pageY);
+
+								var
+									distance2 = this .touch1 .distance (this .touch2),
+									delta     = distance2 - distance1;
+
+								event .deltaY     = delta;
+								event .zoomFactor = Math .abs (delta) / $(window) .width ();
+
+								this .mousewheel (event);
+
+								break;
+							}
 						}
-		
+
 						this .touch1 .set (touches [0] .pageX, touches [0] .pageY);
 						this .touch2 .set (touches [1] .pageX, touches [1] .pageY);
 						break;
@@ -540,7 +582,7 @@ function ($,
 		set_rotation__: function (value)
 		{
 			var viewpoint = this .getActiveViewpoint ();
-	
+
 			viewpoint .orientationOffset_ = this .getOrientationOffset (value .getValue (), this .initialOrientationOffset, false);
 			viewpoint .positionOffset_    = this .getPositionOffset (this .initialPositionOffset, this .initialOrientationOffset, viewpoint .orientationOffset_ .getValue ());
 		},
@@ -551,14 +593,14 @@ function ($,
 			return function (rotationChange)
 			{
 				var viewpoint = this .getActiveViewpoint ();
-	
+
 				if (this .rotationChaser .isActive_ .getValue () && this .rotationChaser .value_changed_ .hasInterest ("set_rotation__", this))
 				{
 					try
 					{
 						destination .assign (this .rotationChaser .set_destination_ .getValue ())
 							.multLeft (rotationChange);
-	
+
 						// Check for critical angle.
 						this .getOrientationOffset (destination, this .initialOrientationOffset, true);
 
@@ -582,10 +624,10 @@ function ($,
 					{
 						this .initialOrientationOffset .assign (viewpoint .orientationOffset_ .getValue ());
 						this .initialPositionOffset    .assign (viewpoint .positionOffset_    .getValue ());
-	
+
 						// Check for critical angle.
 						this .getOrientationOffset (rotationChange, this .initialOrientationOffset, true);
-	
+
 						this .rotationChaser .set_value_       = Rotation4 .Identity;
 						this .rotationChaser .set_destination_ = rotationChange;
 					}
@@ -597,7 +639,7 @@ function ($,
 						this .rotationChaser .set_destination_ = this .getHorizonRotation (rotationChange);
 					}
 				}
-	
+
 				this .disconnect ();
 				this .rotationChaser .value_changed_ .addInterest ("set_rotation__", this);
 			};
@@ -612,7 +654,7 @@ function ($,
 				{
 					this .disconnect ();
 					this .getBrowser () .prepareEvents () .addInterest ("spin", this);
-	
+
 					this .rotation .assign (rotation .assign (Rotation4 .Identity) .slerp (rotationChange, SPIN_FACTOR));
 				}
 				catch (error)
@@ -630,13 +672,13 @@ function ($,
 			return function (positionOffsetChange, centerOfRotationOffsetChange)
 			{
 				var viewpoint = this .getActiveViewpoint ();
-	
+
 				if (this .positionChaser .isActive_ .getValue () && this .positionChaser .value_changed_ .hasInterest ("set_positionOffset__", this))
 				{
 					positionOffset
 						.assign (this .positionChaser .set_destination_ .getValue ())
 						.add (positionOffsetChange);
-	
+
 					this .positionChaser .set_destination_ = positionOffset;
 				}
 				else
@@ -644,11 +686,11 @@ function ($,
 					positionOffset
 						.assign (viewpoint .positionOffset_ .getValue ())
 						.add (positionOffsetChange);
-	
+
 					this .positionChaser .set_value_       = viewpoint .positionOffset_;
 					this .positionChaser .set_destination_ = positionOffset;
 				}
-	
+
 				if (this .centerOfRotationChaser .isActive_ .getValue () && this .centerOfRotationChaser .value_changed_ .hasInterest ("set_centerOfRotationOffset__", this))
 				{
 					centerOfRotationOffset
@@ -666,7 +708,7 @@ function ($,
 					this .centerOfRotationChaser .set_value_       = viewpoint .centerOfRotationOffset_;
 					this .centerOfRotationChaser .set_destination_ = centerOfRotationOffset;
 				}
-	
+
 				this .disconnect ();
 				this .positionChaser         .value_changed_ .addInterest ("set_positionOffset__",         this);
 				this .centerOfRotationChaser .value_changed_ .addInterest ("set_centerOfRotationOffset__", this);
@@ -682,7 +724,7 @@ function ($,
 			return function (positionOffsetBefore, orientationOffsetBefore, orientationOffsetAfter)
 			{
 				this .getDistanceToCenter (distance, positionOffsetBefore);
-	
+
 				return (oob
 					.assign (orientationOffsetBefore)
 					.inverse ()
@@ -703,16 +745,16 @@ function ($,
 			{
 				var
 					viewpoint         = this .getActiveViewpoint (),
-					straightenHorizon = this .getBrowser () .getBrowserOption ("StraightenHorizon");
-	
+					straightenHorizon = this .getStraightenHorizon ();
+
 				userOrientation
 					.assign (rotation)
 					.multRight (viewpoint .getOrientation ())
 					.multRight (orientationOffsetBefore);
-	
+
 				if (straightenHorizon && viewpoint .getTypeName () !== "GeoViewpoint")
 					viewpoint .straightenHorizon (userOrientation);
-	
+
 				var orientationOffsetAfter = orientationOffset
 					.assign (viewpoint .getOrientation ())
 					.inverse ()
@@ -768,7 +810,7 @@ function ($,
 
 			this .disconnect ();
 			browser .activeViewpoint_ .removeInterest ("set_activeViewpoint__", this);
-			browser .getElement () .unbind (".ExamineViewer");
+			browser .getSurface () .unbind (".ExamineViewer");
 			$(document) .unbind (".ExamineViewer" + this .getId ());
 		},
 	});

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

@@ -48,16 +48,24 @@
 
 
 define ([
+	"x_ite/Fields",
+	"x_ite/Basic/X3DFieldDefinition",
+	"x_ite/Basic/FieldDefinitionArray",
+	"x_ite/Bits/X3DConstants",
 	"x_ite/Browser/Navigation/X3DFlyViewer",
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Rotation4",
 ],
-function (X3DFlyViewer,
+function (Fields,
+          X3DFieldDefinition,
+          FieldDefinitionArray,
+          X3DConstants,
+          X3DFlyViewer,
           Vector3,
           Rotation4)
 {
 "use strict";
-	
+
 	function FlyViewer (executionContext)
 	{
 		X3DFlyViewer .call (this, executionContext);
@@ -66,6 +74,9 @@ function (X3DFlyViewer,
 	FlyViewer .prototype = Object .assign (Object .create (X3DFlyViewer .prototype),
 	{
 		constructor: FlyViewer,
+		fieldDefinitions: new FieldDefinitionArray ([
+			new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
+		]),
 		addCollision: function ()
 		{
 			this .getBrowser () .addCollision (this);
@@ -76,13 +87,7 @@ function (X3DFlyViewer,
 		},
 		getFlyDirection: function (fromVector, toVector, direction)
 		{
-			direction .assign (toVector) .subtract (fromVector);
-
-			direction .x =  direction .x / 20;
-			direction .y = -direction .z / 20;
-			direction .z = -50;
-
-			return direction;
+			return direction .assign (toVector) .subtract (fromVector);
 		},
 		getTranslationOffset: function (velocity)
 		{