x_ite 4.7.6 → 4.7.7

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

@@ -50,29 +50,31 @@
 define ([
 	"jquery",
 	"x_ite/Fields",
+	"x_ite/Browser/Core/BrowserTimings",
 	"x_ite/Browser/Core/BrowserOptions",
 	"x_ite/Browser/Core/BrowserProperties",
 	"x_ite/Browser/Core/RenderingProperties",
 	"x_ite/Browser/Core/Notification",
-	"x_ite/Browser/Core/BrowserTimings",
 	"x_ite/Browser/Core/ContextMenu",
 	"x_ite/Execution/Scene",
 	"x_ite/Parser/Parser",
 	"standard/Utility/DataStorage",
-	"x_ite/DEBUG",
+	"standard/Math/Numbers/Vector3",
+	"locale/gettext",
 ],
 function ($,
           Fields,
+          BrowserTimings,
           BrowserOptions,
           BrowserProperties,
           RenderingProperties,
           Notification,
-          BrowserTimings,
           ContextMenu,
           Scene,
           Parser,
           DataStorage,
-          DEBUG)
+          Vector3,
+          _)
 {
 "use strict";
 
@@ -178,11 +180,11 @@ function ($,
 		return gl;
 	}
 
-	let browserId = 0;
+	let browserNumber = 0;
 
 	function X3DCoreContext (element)
 	{
-		this .number  = ++ browserId;
+		this .number  = ++ browserNumber;
 		this .element = element;
 
 		// Get canvas & context.
@@ -212,16 +214,16 @@ function ($,
 		},
 		this);
 
+		this .localStorage = new DataStorage (localStorage, "X_ITE.X3DBrowser(" + this .number + ").");
+		this .mobile       = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i .test (navigator .userAgent);
+
+		this .browserTimings      = new BrowserTimings      (this .getPrivateScene ());
 		this .browserOptions      = new BrowserOptions      (this .getPrivateScene ());
 		this .browserProperties   = new BrowserProperties   (this .getPrivateScene ());
 		this .renderingProperties = new RenderingProperties (this .getPrivateScene ());
 		this .notification        = new Notification        (this .getPrivateScene ());
-		this .browserTimings      = new BrowserTimings      (this .getPrivateScene ());
 		this .contextMenu         = new ContextMenu         (this .getPrivateScene ());
 
-		this .localStorage = new DataStorage (localStorage, "X_ITE.X3DBrowser(" + this .number + ").");
-		this .mobile       = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i .test (navigator .userAgent);
-
 		$(".x_ite-console") .empty ();
 
 		this .addChildObjects ("controlKey",  new Fields .SFBool (),
@@ -236,11 +238,11 @@ function ($,
 		{
 			// Setup browser nodes.
 
+			this .browserTimings      .setup ();
 			this .browserOptions      .setup ()
 			this .browserProperties   .setup ()
 			this .renderingProperties .setup ();
 			this .notification        .setup ();
-			this .browserTimings      .setup ();
 			this .contextMenu         .setup ();
 
 			// Observe Element's attributes.
@@ -333,6 +335,18 @@ function ($,
 		{
 			return this .extensions [name];
 		},
+		getMobile: function ()
+		{
+			return this .mobile;
+		},
+		getLocalStorage: function ()
+		{
+			return this .localStorage;
+		},
+		getBrowserTimings: function ()
+		{
+			return this .browserTimings;
+		},
 		getBrowserOptions: function ()
 		{
 			return this .browserOptions;
@@ -349,17 +363,9 @@ function ($,
 		{
 			return this .notification;
 		},
-		getBrowserTimings: function ()
-		{
-			return this .browserTimings;
-		},
-		getLocalStorage: function ()
-		{
-			return this .localStorage;
-		},
-		getMobile: function ()
+		getContextMenu: function ()
 		{
-			return this .mobile;
+			return this .contextMenu;
 		},
 		getPrivateScene: function ()
 		{
@@ -627,7 +633,7 @@ function ($,
 					if (this .getControlKey ())
 					{
 						event .preventDefault ();
-						this .getBrowserTimings () .setEnabled (! this .getBrowserTimings () .getEnabled ());
+						this .setBrowserOption ("Timings", !this .getBrowserOption ("Timings"));
 					}
 
 					break;
@@ -664,21 +670,69 @@ function ($,
 
 						const viewpoint = this .getActiveViewpoint ();
 
-						if (! viewpoint)
+						if (!viewpoint)
 							break;
 
-						let text = "";
+						const vp = this .getPrivateScene () .createNode (viewpoint .getTypeName ());
+
+						switch (viewpoint .getTypeName ())
+						{
+							case "Viewpoint":
+							{
+								vp .position         = viewpoint .getUserPosition ();
+								vp .orientation      = viewpoint .getUserOrientation ();
+								vp .centerOfRotation = viewpoint .getUserCenterOfRotation ();
+								vp .fieldOfView      = viewpoint .getFieldOfView ();
+								break;
+							}
+							case "OrthoViewpoint":
+							{
+								vp .position         = viewpoint .getUserPosition ();
+								vp .orientation      = viewpoint .getUserOrientation ();
+								vp .centerOfRotation = viewpoint .getUserCenterOfRotation ();
+								vp .fieldOfView      = new Fields .MFFloat (viewpoint .getMinimumX (), viewpoint .getMinimumY (), viewpoint .getMaximumX (), viewpoint .getMaximumY ());
+								break;
+							}
+							case "GeoViewpoint":
+							{
+								const
+									geoOrigin = viewpoint .geoOrigin_,
+									geoCoord  = new Vector3 (0, 0, 0);
+
+								if (geoOrigin .getValue () && geoOrigin .getNodeTypeName () === "GeoOrigin")
+								{
+									const go = this .getPrivateScene () .createNode ("GeoOrigin");
+
+									vp .geoOrigin = go;
+									go .geoSystem = geoOrigin .geoSystem;
+									go .geoCoords = geoOrigin .geoCoords;
+									go .rotateYUp = geoOrigin .rotateYUp;
+								}
+
+								vp .geoSystem        = viewpoint .geoSystem_;
+								vp .position         = viewpoint .getGeoCoord (viewpoint .getUserPosition (), geoCoord);
+								vp .orientation      = viewpoint .getUserOrientation ();
+								vp .centerOfRotation = viewpoint .getGeoCoord (viewpoint .getUserCenterOfRotation (), geoCoord);
+								vp .fieldOfView      = viewpoint .getFieldOfView ();
+								break;
+							}
+						}
 
-						text += "Viewpoint {\n";
-						text += "  position " + viewpoint .getUserPosition () + "\n";
-						text += "  orientation " + viewpoint .getUserOrientation () + "\n";
-						text += "  centerOfRotation " + viewpoint .getUserCenterOfRotation () + "\n";
-						text += "}";
+						let text;
 
-						console .log (text);
-						copyToClipboard (text);
+						switch (this .getExecutionContext () .getEncoding ())
+						{
+							case "ASCII":
+							case "VRML": text = vp .toVRMLString (); break;
+							case "JSON": text = vp .toVRMLString (); break;
+							default:     text = vp .toXMLString ();  break;
+						}
+
+						text += "\n";
 
-						this .getNotification () .string_ = "Copied viewpoint to clipboard.";
+						console .log (text);
+						this .copyToClipboard (text);
+						this .getNotification () .string_ = _ ("Viewpoint is copied to clipboard.");
 					}
 
 					break;
@@ -722,17 +776,16 @@ function ($,
 				}
 			}
 		},
+		copyToClipboard: function (text)
+		{
+			// The textarea must be visible to make copy work.
+			const $temp = $("<textarea></textarea>");
+			this .getElement () .find (".x_ite-private-browser") .prepend ($temp);
+			$temp .text (text) .select ();
+			document .execCommand ("copy");
+			$temp .remove ();
+		},
 	};
 
-	function copyToClipboard (text)
-	{
-		const $temp = $("<textarea>");
-
-		$("body") .append ($temp);
-		$temp .val (text) .select ();
-		document .execCommand ("copy");
-		$temp .remove ();
-	}
-
 	return X3DCoreContext;
 });

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

@@ -173,6 +173,9 @@ function ($,
 		},
 		mousedown: function (event)
 		{
+			if (this .getBrowser () .getContextMenu () .getActive ())
+				return;
+
 			if (this .button >= 0)
 				return;
 

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

@@ -139,6 +139,9 @@ function ($,
 		},
 		mousedown: function (event)
 		{
+			if (this .getBrowser () .getContextMenu () .getActive ())
+				return;
+
 			if (this .button >= 0)
 				return;
 

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

@@ -108,6 +108,9 @@ function ($,
 		},
 		mousedown: function (event)
 		{
+			if (this .getBrowser () .getContextMenu () .getActive ())
+				return;
+
 			if (this .button >= 0)
 				return;
 

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

@@ -156,6 +156,9 @@ function ($,
 		},
 		mousedown: function (event)
 		{
+			if (this .getBrowser () .getContextMenu () .getActive ())
+				return;
+
 			if (this .button >= 0)
 				return;
 

package/src/x_ite/Browser/Picking/VolumePicker.js

@@ -51,7 +51,7 @@ define ([
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Rotation4",
 	"standard/Math/Numbers/Matrix4",
-	X3D .getComponentUrl ("rigid-body-physics"),
+	require .getComponentUrl ("rigid-body-physics"),
 ],
 function (Vector3,
           Rotation4,

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

@@ -92,10 +92,13 @@ function ($,
 		},
 		mousedown: function (event)
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			browser .getElement () .focus ();
 
+			if (browser .getContextMenu () .getActive ())
+				return;
+
 			if (browser .getShiftKey () && browser .getControlKey ())
 				return;
 

package/src/x_ite/Browser/Shaders/ShaderTest.js

@@ -105,8 +105,8 @@ function (TextureBuffer,
 				// Matrices
 
 				gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix, false, new Float32Array (Camera .ortho (-1, 1, -1, 1, -1, 1, new Matrix4 ())));
-				gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, new Float32Array (new Matrix4 ()));
-				gl .uniformMatrix3fv (shaderNode .x3d_NormalMatrix,     false, new Float32Array (new Matrix3 ()));
+				gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, new Float32Array (Matrix4 .Identity));
+				gl .uniformMatrix3fv (shaderNode .x3d_NormalMatrix,     false, new Float32Array (Matrix3 .Identity));
 
 				// Set clip planes and lights to none.
 
@@ -149,7 +149,7 @@ function (TextureBuffer,
 
 				frameBuffer .unbind ();
 
-				return data [0] == 255 && data [1] == 0 && data [2] == 0 && data [3] == 255;
+				return true || (data [0] == 255 && data [1] == 0 && data [2] == 0 && data [3] == 255);
 			};
 		})(),
 	};

package/src/x_ite/Browser/VERSION.js

@@ -49,5 +49,5 @@
 
 define (function ()
 {
-	return "4.7.6";
+	return "4.7.7";
 });

package/src/x_ite/Browser/X3DBrowser.js

@@ -50,7 +50,6 @@
 define ([
 	"jquery",
 	"x_ite/Browser/VERSION",
-	"x_ite/Base/Events",
 	"x_ite/Fields",
 	"x_ite/Components",
 	"x_ite/Components/Layering/X3DLayerNode",
@@ -70,7 +69,6 @@ define ([
 ],
 function ($,
           VERSION,
-          Events,
           Fields,
           Components,
           X3DLayerNode,
@@ -143,6 +141,8 @@ function ($,
 
 			// Print welcome message.
 
+			if (this .getNumber () > 1) return;
+
 			this .print ("Welcome to " + this .name + " X3D Browser " + this .version + ":\n" +
 			             "   Current Graphics Renderer\n" +
 			             "      Name: " + this .getVendor () + " " + this .getRenderer () + "\n" +
@@ -247,9 +247,6 @@ function ($,
 				this .callBrowserEventHandler ("onshutdown");
 			}
 
-			// Clear event cache.
-			Events .clear ();
-
 			// Replace world.
 
 			if (scene instanceof Fields .MFNode)
@@ -402,68 +399,91 @@ function ($,
 		},
 		loadURL: function (url, parameter)
 		{
-			// Cancel any loading.
+			const promise = new Promise (function (resolve, reject)
+			{
+				// Cancel any loading.
 
-			this .loadCount_       .removeInterest ("set_loadCount__", this);
-			this .prepareEvents () .removeInterest ("bind", this);
+				this .loadCount_       .removeInterest ("set_loadCount__", this);
+				this .prepareEvents () .removeInterest ("bind", this);
 
-			if (this .loader)
-				this .loader .abort ();
+				if (this .loader)
+					this .loader .abort ();
 
-			// Start loading.
+				// Start loading.
 
-			this .setBrowserLoading (true);
-			this .addLoadCount (this);
+				this .setBrowserLoading (true);
+				this .addLoadCount (this);
 
-			const loader = this .loader = new FileLoader (this .getWorld ());
+				const loader = this .loader = new FileLoader (this .getWorld ());
 
-			loader .createX3DFromURL (url, parameter,
-			function (scene)
-			{
-				if (loader !== this .loader)
-					return;
+				loader .createX3DFromURL (url, parameter,
+				function (scene)
+				{
+					if (loader !== this .loader)
+					{
+						reject ();
+						return;
+					}
 
-				if (! this .getBrowserOptions () .getSplashScreen ())
-					this .getCanvas () .fadeIn (0);
+					if (! this .getBrowserOptions () .getSplashScreen ())
+						this .getCanvas () .fadeIn (0);
 
-				if (scene)
-				{
-					this .replaceWorld (scene);
-					this .removeLoadCount (this);
+					if (scene)
+					{
+						this .replaceWorld (scene);
+						this .removeLoadCount (this);
+
+						resolve ();
+					}
+					else
+					{
+						this .callBrowserCallbacks (X3DConstants .CONNECTION_ERROR);
+						this .callBrowserEventHandler ("onerror");
+
+						setTimeout (function () { this .getSplashScreen () .find (".x_ite-private-spinner-text") .text (_ ("Failed loading world.")); } .bind (this), 31);
+
+						reject ();
+					}
 				}
-				else
+				.bind (this),
+				function (fragment)
 				{
-					this .callBrowserCallbacks (X3DConstants .CONNECTION_ERROR);
-					this .callBrowserEventHandler ("onerror");
+					if (loader !== this .loader)
+					{
+						reject ();
+						return;
+					}
 
-					setTimeout (function () { this .getSplashScreen () .find (".x_ite-private-spinner-text") .text (_ ("Failed loading world.")); } .bind (this), 31);
+					this .changeViewpoint (fragment);
+					this .removeLoadCount (this);
+					this .setBrowserLoading (false);
+
+					resolve ();
 				}
-			}
-			.bind (this),
-			function (fragment)
-			{
-				if (loader !== this .loader)
-					return;
+				.bind (this),
+				function (url, target)
+				{
+					if (loader !== this .loader)
+					{
+						reject ();
+						return;
+					}
 
-				this .changeViewpoint (fragment);
-				this .removeLoadCount (this);
-				this .setBrowserLoading (false);
-			}
-			.bind (this),
-			function (url, target)
-			{
-				if (loader !== this .loader)
-					return;
+					if (target)
+						window .open (url, target);
+					else
+						location = url;
 
-				if (target)
-					window .open (url, target);
-				else
-					location = url;
+					this .removeLoadCount (this);
+					this .setBrowserLoading (false);
 
-				this .removeLoadCount (this);
-				this .setBrowserLoading (false);
+					resolve ();
+				}
+				.bind (this));
 			}
 			.bind (this));
+
+			return promise;
 		},
 		addBrowserListener: function (callback, object)
 		{

package/src/x_ite/Components/Picking/PointPickSensor.js

@@ -59,7 +59,7 @@ define ([
 	"standard/Math/Numbers/Vector3",
 	"standard/Math/Numbers/Rotation4",
 	"standard/Math/Geometry/Box3",
-	X3D .getComponentUrl ("rigid-body-physics"),
+	require .getComponentUrl ("rigid-body-physics"),
 ],
 function (Fields,
           X3DFieldDefinition,

package/src/x_ite/Components/Scripting/Script.js

@@ -221,9 +221,10 @@ function ($,
 				text += "\n;var " + callbacks .join (",") + ";";
 				text += "\n[" + callbacks .join (",") + "];";
 
+				this .global = this .getGlobal ();
+
 				const
-					global  = this .getGlobal (),
-					result  = evaluate (global, text),
+					result  = this .evaluate (text),
 					context = { };
 
 				for (let i = 0; i < callbacks .length; ++ i)
@@ -238,6 +239,10 @@ function ($,
 				return { };
 			}
 		},
+		evaluate: function (text)
+		{
+			return evaluate (this .global, text);
+		},
 		getGlobal: function ()
 		{
 			const

package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js

@@ -383,10 +383,6 @@ function (X3DCast,
 
 				if (location)
 				{
-					field ._uniformLocation = location;
-
-					field .addInterest ("set_field__", this);
-
 					switch (field .getType ())
 					{
 						case X3DConstants .SFImage:
@@ -480,6 +476,13 @@ function (X3DCast,
 						}
 					}
 
+					if (location .array)
+						field ._uniformLocation = location .array .length ? location : null;
+					else
+						field ._uniformLocation = location;
+
+					field .addInterest ("set_field__", this);
+
 					this .set_field__ (field);
 				}
 			},
@@ -686,12 +689,7 @@ function (X3DCast,
 						}
 						case X3DConstants .MFImage:
 						{
-							let array = location .array;
-
-							const numImages = this .getImagesLength (field);
-
-							if (numImages !== array .length)
-								array = location .array = new Int32Array (numImages);
+							const array = location .array;
 
 							for (let i = 0, a = 0, length = field .length; i < length; ++ i)
 							{
@@ -864,8 +862,8 @@ function (X3DCast,
 
 			let length = 3 * images .length;
 
-			for (let i = 0, l = images .length; i < l; ++ i)
-				length += images [i] .array .length;
+			for (const image of images)
+				length += image .array .length;
 
 			return length;
 		},

package/src/x_ite/Components/Shaders.js

@@ -52,10 +52,10 @@ define ([
 	"x_ite/Components/Shaders/FloatVertexAttribute",
 	"x_ite/Components/Shaders/Matrix3VertexAttribute",
 	"x_ite/Components/Shaders/Matrix4VertexAttribute",
-//	"x_ite/Components/Shaders/PackagedShader",
-//	"x_ite/Components/Shaders/ProgramShader",
+	"x_ite/Components/Shaders/PackagedShader",
+	"x_ite/Components/Shaders/ProgramShader",
 	"x_ite/Components/Shaders/ShaderPart",
-//	"x_ite/Components/Shaders/ShaderProgram",
+	"x_ite/Components/Shaders/ShaderProgram",
 	"x_ite/Components/Shaders/X3DProgrammableShaderObject",
 	"x_ite/Components/Shaders/X3DShaderNode",
 	"x_ite/Components/Shaders/X3DVertexAttributeNode",
@@ -65,10 +65,10 @@ function (SupportedNodes,
           FloatVertexAttribute,
           Matrix3VertexAttribute,
           Matrix4VertexAttribute,
-//          PackagedShader,
-//          ProgramShader,
+          PackagedShader,
+          ProgramShader,
           ShaderPart,
-//          ShaderProgram,
+          ShaderProgram,
           X3DProgrammableShaderObject,
           X3DShaderNode,
           X3DVertexAttributeNode)
@@ -81,10 +81,10 @@ function (SupportedNodes,
 		FloatVertexAttribute:   FloatVertexAttribute,
 		Matrix3VertexAttribute: Matrix3VertexAttribute,
 		Matrix4VertexAttribute: Matrix4VertexAttribute,
-//		PackagedShader:         PackagedShader,
-//		ProgramShader:          ProgramShader,
+		PackagedShader:         PackagedShader,
+		ProgramShader:          ProgramShader,
 		ShaderPart:             ShaderPart,
-//		ShaderProgram:          ShaderProgram,
+		ShaderProgram:          ShaderProgram,
 	};
 
 	const AbstractTypes =

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -80,7 +80,8 @@ function (Fields,
 	{
 		X3DBaseNode .call (this, executionContext);
 
-		this .addChildObjects ("rootNodes", new Fields .MFNode ());
+		this .addChildObjects ("rootNodes",  new Fields .MFNode (),
+		                       "worldInfos", new Fields .MFNode ());
 
 		this .rootNodes_ .setAccessType (X3DConstants .initializeOnly);
 		this .rootNodes_ .addCloneCount (1);
@@ -91,7 +92,6 @@ function (Fields,
 		this ._externprotos   = new ExternProtoDeclarationArray ();
 		this ._routes         = new RouteArray ();
 		this ._routeIndex     = new Map ();
-		this ._worldInfoNodes = [ ];
 	}
 
 	X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -639,22 +639,20 @@ function (Fields,
 		{
 			return this ._routes;
 		},
-		getWorldInfo: function ()
+		getWorldInfos: function ()
 		{
-			const length = this ._worldInfoNodes .length;
-
-			if (length)
-				return this ._worldInfoNodes [length - 1];
-
-			return null;
+			return this .worldInfos_;
 		},
 		addWorldInfo: function (worldInfoNode)
 		{
-			this ._worldInfoNodes .push (worldInfoNode);
+			this .worldInfos_ .push (worldInfoNode);
 		},
 		removeWorldInfo: function (worldInfoNode)
 		{
-			this ._worldInfoNodes = this ._worldInfoNodes .filter (function (node) { return node !== worldInfoNode; });
+			const index = this .worldInfos_ .getValue () .indexOf (worldInfoNode);
+
+			if (index !== -1)
+				this .worldInfos_ .splice (index, 1);
 		},
 		toVRMLStream: function (stream)
 		{