x_ite 4.7.5 → 4.7.9

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

@@ -61,6 +61,9 @@ define (function ()
 				if (getScriptURL () .match (/\.min\.js$/))
 					file += ".min";
 
+				if (typeof globalRequire === "function" && typeof __filename === "string")
+					return this .getPath ("assets", "components", file + ".js");
+
 				return new URL ("assets/components/" + file + ".js", getScriptURL ()) .href;
 			}
 
@@ -68,20 +71,42 @@ define (function ()
 		},
 		getShaderUrl: function (file)
 		{
+			if (typeof globalRequire === "function" && typeof __filename === "string")
+				return this .getPath ("assets", "shaders", file);
+
 			return new URL ("assets/shaders/" + file, getScriptURL ()) .href;
 		},
 		getFontsUrl: function (file)
 		{
+			if (typeof globalRequire === "function" && typeof __filename === "string")
+				return this .getPath ("assets", "fonts", file);
+
 			return new URL ("assets/fonts/" + file, getScriptURL ()) .href;
 		},
 		getLinetypeUrl: function (index)
 		{
+			if (typeof globalRequire === "function" && typeof __filename === "string")
+				return this .getPath ("assets", "linetype", index + ".png");
+
 			return new URL ("assets/linetype/" + index + ".png", getScriptURL ()) .href;
 		},
 		getHatchingUrl: function (index)
 		{
+			if (typeof globalRequire === "function" && typeof __filename === "string")
+				return this .getPath ("assets", "hatching", index + ".png");
+
 			return new URL ("assets/hatching/" + index + ".png", getScriptURL ()) .href;
 		},
+		getPath: function ()
+		{
+			const
+				path = globalRequire ("path"),
+				args = Array .prototype .slice .call (arguments);
+
+			args .unshift (path .dirname (getScriptURL ()));
+
+			return path .join .apply (path, args);
+		},
 	};
 
 	return new URLs ();

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.5";
+	return "4.7.9";
 });

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/Grouping/Switch.js

@@ -72,7 +72,7 @@ function (Fields,
 
 		this .addType (X3DConstants .Switch);
 
-		if (executionContext .getSpecificationVersion () == "2.0")
+		if (executionContext .getSpecificationVersion () === "2.0")
 			this .addAlias ("choice", this .children_);
 
 		this .childNode     = null;

package/src/x_ite/Components/Lighting/DirectionalLight.js

@@ -273,7 +273,7 @@ function (Fields,
 
 		this .addType (X3DConstants .DirectionalLight);
 
-		if (executionContext .getSpecificationVersion () == "2.0")
+		if (executionContext .getSpecificationVersion () === "2.0")
 			this .global_ = true;
 	}
 

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

@@ -75,7 +75,7 @@ function (Fields,
 
 		this .addType (X3DConstants .Collision);
 
-		if (executionContext .getSpecificationVersion () == "2.0")
+		if (executionContext .getSpecificationVersion () === "2.0")
 			this .addAlias ("collide", this .enabled_); // VRML2
 	}
 

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

@@ -76,7 +76,7 @@ function (Fields,
 
 		this .addType (X3DConstants .LOD);
 
-		if (executionContext .getSpecificationVersion () == "2.0")
+		if (executionContext .getSpecificationVersion () === "2.0")
 			this .addAlias ("level", this .children_); // VRML2
 
 		this .center_ .setUnit ("length");

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/Rendering/X3DGeometryNode.js

@@ -912,7 +912,7 @@ function (Fields,
 					backMaterialNode = appearanceNode .backMaterialNode,
 					frontShaderNode  = appearanceNode .shaderNode || materialNode .getShader (context .browser, context .shadow);
 
-				if (this .solid || !backMaterialNode || context .wireframe)
+				if (this .solid || !backMaterialNode || frontShaderNode .wireframe)
 				{
 					this .displayGeometry (gl, context, appearanceNode, frontShaderNode, true, true);
 				}
@@ -962,12 +962,19 @@ function (Fields,
 
 				// Draw depending on wireframe, solid and transparent.
 
-				if (context .wireframe)
+				if (shaderNode .wireframe)
 				{
-					// Wireframes are always solid so only one drawing call is needed.
+					// Points and Wireframes.
 
-					for (let i = 0, length = this .vertexCount; i < length; i += 3)
-						gl .drawArrays (shaderNode .primitiveMode, i, 3);
+					if (shaderNode .primitiveMode === gl .POINTS)
+					{
+						gl .drawArrays (shaderNode .primitiveMode, 0, this .vertexCount);
+					}
+					else
+					{
+						for (let i = 0, length = this .vertexCount; i < length; i += 3)
+							gl .drawArrays (shaderNode .primitiveMode, i, 3);
+					}
 				}
 				else
 				{
@@ -983,7 +990,7 @@ function (Fields,
 
 						// Render back.
 
-						if (back)
+						if (back && !this .solid)
 						{
 							gl .cullFace (gl .FRONT);
 							gl .drawArrays (shaderNode .primitiveMode, 0, this .vertexCount);
@@ -1071,7 +1078,7 @@ function (Fields,
 					backMaterialNode = appearanceNode .backMaterialNode,
 					frontShaderNode  = appearanceNode .shaderNode || materialNode .getShader (context .browser, context .shadow);
 
-				if (this .solid || !backMaterialNode || context .wireframe)
+				if (this .solid || !backMaterialNode || frontShaderNode .wireframe)
 				{
 					this .displayParticlesGeometry (gl, context, appearanceNode, frontShaderNode, true, true, particles, numParticles);
 				}
@@ -1131,7 +1138,7 @@ function (Fields,
 
 				if (shaderNode .wireframe)
 				{
-					// Wireframes are always solid so only one drawing call is needed.
+					// Points and Wireframes.
 
 					for (let p = 0; p < numParticles; ++ p)
 					{
@@ -1145,8 +1152,15 @@ function (Fields,
 
 						shaderNode .setParticle (gl, particle, modelViewMatrix);
 
-						for (let i = 0, length = this .vertexCount; i < length; i += 3)
-							gl .drawArrays (shaderNode .primitiveMode, i, 3);
+						if (shaderNode .primitiveMode === gl .POINTS)
+						{
+							gl .drawArrays (shaderNode .primitiveMode, 0, this .vertexCount);
+						}
+						else
+						{
+							for (let i = 0, length = this .vertexCount; i < length; i += 3)
+								gl .drawArrays (shaderNode .primitiveMode, i, 3);
+						}
 					}
 				}
 				else
@@ -1173,7 +1187,7 @@ function (Fields,
 
 							gl .enable (gl .CULL_FACE);
 
-							if (back)
+							if (back && !this .solid)
 							{
 								gl .cullFace (gl .FRONT);
 								gl .drawArrays (shaderNode .primitiveMode, 0, this .vertexCount);

package/src/x_ite/Components/Rendering/X3DLineGeometryNode.js

@@ -80,6 +80,35 @@ function (X3DGeometryNode,
 		{
 			return false;
 		},
+		transfer: function ()
+		{
+			// Line stipple support.
+
+			if (this .getGeometryType () === 1)
+			{
+				const
+					texCoords = this .getTexCoords (),
+					vertices  = this .getVertices ();
+
+				this .getMultiTexCoords () .push (texCoords);
+
+				for (let i = 0, length = vertices .length; i < length; i += 8)
+				{
+					texCoords .push (vertices [i],
+					                 vertices [i + 1],
+					                 vertices [i + 2],
+					                 vertices [i + 3],
+					                 vertices [i],
+					                 vertices [i + 1],
+					                 vertices [i + 2],
+					                 vertices [i + 3]);
+				}
+
+				texCoords .shrinkToFit ();
+			}
+
+			X3DGeometryNode .prototype .transfer .call (this);
+		},
 		display: function (gl, context)
 		{
 			try
@@ -115,6 +144,9 @@ function (X3DGeometryNode,
 					if (this .colorMaterial)
 						shaderNode .enableColorAttribute (gl, this .colorBuffer);
 
+					if (this .getMultiTexCoords () .length)
+						shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers, true);
+
 					shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
 
 					// Wireframes are always solid so only one drawing call is needed.
@@ -130,7 +162,9 @@ function (X3DGeometryNode,
 					if (this .colorMaterial)
 						shaderNode .disableColorAttribute (gl);
 
-					shaderNode .disableTexCoordAttribute (gl);
+					if (this .getMultiTexCoords () .length)
+						shaderNode .disableTexCoordAttribute (gl);
+
 					shaderNode .disable (gl);
 
 					if (blendModeNode)

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)
 		{