x_ite 4.7.6 → 4.7.7

package/src/x_ite/InputOutput/Generator.js

@@ -93,7 +93,7 @@ function (X3DConstants)
 		},
 		PadRight: function (string, pad)
 		{
-			for (var i = 0, length = pad - string .length; i < length; ++ i)
+			for (let i = 0, length = pad - string .length; i < length; ++ i)
 				string += " ";
 
 			return string;
@@ -145,7 +145,7 @@ function (X3DConstants)
 		},
 		ExportedNodes: function (exportedNodes)
 		{
-			var index = this .exportedNodesIndex .get (this .ExecutionContext ());
+			const index = this .exportedNodesIndex .get (this .ExecutionContext ());
 
 			exportedNodes .forEach (function (exportedNode)
 			{
@@ -159,7 +159,7 @@ function (X3DConstants)
 		},
 		ImportedNodes: function (importedNodes)
 		{
-			var index = this .importedNodesIndex .get (this .ExecutionContext ());
+			const index = this .importedNodesIndex .get (this .ExecutionContext ());
 
 			importedNodes .forEach (function (importedNode)
 			{
@@ -197,72 +197,79 @@ function (X3DConstants)
 		{
 			return this .nodes .has (baseNode);
 		},
-		Name: function (baseNode)
+		Name: (function ()
 		{
-			// Is the node already in index
+			const _TrailingNumbers = /(_\d+$)/;
 
-			var name = this .namesByNode .get (baseNode);
-
-			if (name !== undefined)
-				return name;
-
-			var names = this .names .get (this .ExecutionContext ());
-
-			// The node has no name
-
-			if (baseNode .getName () .length === 0)
+			return function (baseNode)
 			{
-				if (this .NeedsName (baseNode))
-				{
-					var name = this .UniqueName ();
+				// Is the node already in index
 
-					names .set (name, baseNode);
-					this .namesByNode .set (baseNode, name);
+				const name = this .namesByNode .get (baseNode);
 
+				if (name !== undefined)
+				{
 					return name;
 				}
+				else
+				{
+					const names = this .names .get (this .ExecutionContext ());
 
-				// The node doesn't need a name
+					// The node has no name
 
-				return baseNode .getName ();
-			}
+					if (baseNode .getName () .length === 0)
+					{
+						if (this .NeedsName (baseNode))
+						{
+							const name = this .UniqueName ();
 
-			// The node has a name
+							names .set (name, baseNode);
+							this .namesByNode .set (baseNode, name);
 
-			var _TrailingNumbers = /(_\d+$)/;
+							return name;
+						}
 
-			var name      = baseNode .getName ();
-			var hasNumber = name .match (_TrailingNumbers) !== null;
+						// The node doesn't need a name
 
-			name = name .replace (_TrailingNumbers, "");
+						return baseNode .getName ();
+					}
 
-			if (name .length === 0)
-			{
-				if (this .NeedsName (baseNode))
-					name = this .UniqueName ();
+					// The node has a name
 
-				else
-					return "";
-			}
-			else
-			{
-				var
-					i       = 0,
-					newName = hasNumber ? name + '_' + (++ i) : name;
+					let   name      = baseNode .getName ();
+					const hasNumber = name .match (_TrailingNumbers) !== null;
 
-				while (names .has (newName))
-				{
-					newName = name + '_' + (++ i);
-				}
+					name = name .replace (_TrailingNumbers, "");
 
-				name = newName;
-			}
+					if (name .length === 0)
+					{
+						if (this .NeedsName (baseNode))
+							name = this .UniqueName ();
 
-			names .set (name, baseNode);
-			this .namesByNode .set (baseNode, name);
+						else
+							return "";
+					}
+					else
+					{
+						let
+							i       = 0,
+							newName = hasNumber ? name + '_' + (++ i) : name;
 
-			return name;
-		},
+						while (names .has (newName))
+						{
+							newName = name + '_' + (++ i);
+						}
+
+						name = newName;
+					}
+
+					names .set (name, baseNode);
+					this .namesByNode .set (baseNode, name);
+
+					return name;
+				}
+			};
+		})(),
 		NeedsName: function (baseNode)
 		{
 			if (baseNode .getCloneCount () > 1)
@@ -271,7 +278,7 @@ function (X3DConstants)
 			if (baseNode .hasRoutes ())
 				return true;
 
-			var
+			const
 				executionContext = baseNode .getExecutionContext (),
 				index            = this .importedNodesIndex .get (executionContext);
 
@@ -280,24 +287,26 @@ function (X3DConstants)
 				if (index .has (baseNode))
 					return true;
 			}
+			else
+			{
+				const index = this .exportedNodesIndex .get (executionContext);
 
-			var index = this .exportedNodesIndex .get (executionContext);
+				if (index)
+				{
+					if (index .has (baseNode))
+						return true;
+				}
 
-			if (index)
-			{
-				if (index .has (baseNode))
-					return true;
+				return false;
 			}
-
-			return false;
 		},
 		UniqueName: function ()
 		{
-			var names = this .names .get (this .ExecutionContext ());
+			const names = this .names .get (this .ExecutionContext ());
 
 			for (; ;)
 			{
-				var name = '_' + (++ this .newName);
+				const name = '_' + (++ this .newName);
 
 				if (names .has (name))
 					continue;
@@ -307,7 +316,7 @@ function (X3DConstants)
 		},
 		LocalName: function (baseNode)
 		{
-			var importedName = this .importedNames .get (baseNode);
+			const importedName = this .importedNames .get (baseNode);
 
 			if (importedName !== undefined)
 				return importedName;
@@ -373,7 +382,7 @@ function (X3DConstants)
 		{
 			if (this .units)
 			{
-				var executionContext = this .ExecutionContext ();
+				const executionContext = this .ExecutionContext ();
 
 				if (executionContext)
 					return executionContext .toUnit (category, value);

package/src/x_ite/Parser/X3DParser.js

@@ -130,6 +130,12 @@ define (function ()
 						providerUrls .add (providerUrl);
 				}
 
+				if (typeof globalRequire === "function")
+				{
+					for (const url of providerUrls)
+						globalRequire (new URL (url) .pathname);
+				}
+
 				return Array .from (providerUrls);
 			};
 		})(),

package/src/x_ite/Parser/XMLParser.js

@@ -995,7 +995,7 @@ function ($,
 			}
 			catch (error)
 			{
-				//console .warn (error .message);
+				//console .warn (error);
 			}
 		},
 		fieldValue: function (field, value)

package/src/x_ite/X3D.js

@@ -106,7 +106,12 @@ function ($,
 
 	function getComponentUrl (name)
 	{
-		return urls .getProviderUrl (name);
+		const url = urls .getProviderUrl (name);
+
+		if (typeof globalRequire === "function")
+			 globalRequire (new URL (url) .pathname);
+
+		return url;
 	}
 
 	function createBrowser (url, parameter)
@@ -180,11 +185,12 @@ function ($,
 		});
 	}
 
+	require .getComponentUrl = getComponentUrl;
+
 	Object .assign (X3D,
 	{
 		require:                     require,
 		define:                      define,
-		getComponentUrl:             getComponentUrl,
 
 		getBrowser:                  getBrowser,
 		createBrowser:               createBrowser,

package/src/x_ite.js

@@ -46,9 +46,6 @@
  *
  ******************************************************************************/
 
-if (typeof module === 'undefined')
-	var module = { };
-
 require .config ({
 	"waitSeconds": 0,
 });
@@ -71,7 +68,10 @@ define .hide = function ()
 
 const getScriptURL = (function ()
 {
-	const src = document .currentScript .src;
+	if (document .currentScript)
+		var src = document .currentScript .src;
+	else if (typeof __filename === "string")
+		var src = "file://" + __filename;
 
 	return function ()
 	{
@@ -85,15 +85,21 @@ const getScriptURL = (function ()
 
 	function X_ITE (callback, fallback)
 	{
-		if (PrivateX3D)
-		{
-			PrivateX3D (callback, fallback);
-		}
-		else
+		const promise = new Promise (function (resolve, reject)
 		{
-			callbacks .push (callback);
-			fallbacks .push (fallback);
-		}
+			if (PrivateX3D)
+			{
+				PrivateX3D (resolve, reject);
+				PrivateX3D (callback, fallback);
+			}
+			else
+			{
+				callbacks .push (resolve, callback);
+				fallbacks .push (reject,  fallback);
+			}
+		});
+
+		return promise;
 	}
 
 	function fallback (error)
@@ -129,6 +135,9 @@ const getScriptURL = (function ()
 	// Now assign temporary X3D.
 	window .X3D = X_ITE;
 
+	if (typeof globalModule === "object" && typeof globalModule .exports === "object")
+		globalModule .exports = X_ITE;
+
 	// IE fix.
 	document .createElement ("X3DCanvas");
 

package/build/parts/default.end.frag

@@ -1,2 +0,0 @@
-
-}());

package/build/parts/default.start.frag

@@ -1,6 +0,0 @@
-(function () {
-
-	var
-		define  = X3D .define,
-		require = X3D .require,
-		module  = { };

package/build/parts/x_ite.start.frag

@@ -1,8 +0,0 @@
-(function () {
-
-var x_iteNoConfict = {
-	sprintf:  window .sprintf,
-	vsprintf: window .vsprintf,
-};
-
-var module = { };