x_ite 4.7.6 → 4.7.10

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -56,7 +56,7 @@ function (X3DField,
 {
 "use strict";
 
-	return function (Type)
+	return function (Type, double)
 	{
 		return Object .assign (Object .create (X3DField .prototype),
 		{
@@ -126,18 +126,19 @@ function (X3DField,
 			},
 			toStream: function (stream)
 			{
-				var
+				const
 					generator = Generator .Get (stream),
 					value     = this .getValue (),
-					category  = generator .Unit (this .getUnit ());
+					category  = generator .Unit (this .getUnit ()),
+					last      = value .length - 1;
 
-				for (var i = 0, l = value .length - 1; i < l; ++ i)
+				for (let i = 0; i < last; ++ i)
 				{
-					stream .string += String (generator .ToUnit (category, value [i]));
+					stream .string += double ? generator .DoublePrecision (generator .ToUnit (category, value [i])) : generator .Precision (generator .ToUnit (category, value [i]));
 					stream .string += " ";
 				}
 
-				stream .string += String (generator .ToUnit (category, value [i]));
+				stream .string += double ? generator .DoublePrecision (generator .ToUnit (category, value [last])) : generator .Precision (generator .ToUnit (category, value [last]));
 			},
 			toVRMLStream: function (stream)
 			{

package/src/x_ite/InputOutput/Generator.js

@@ -47,7 +47,6 @@
  ******************************************************************************/
 
 
-
 define ([
 	"x_ite/Bits/X3DConstants",
 ],
@@ -57,8 +56,12 @@ function (X3DConstants)
 
 	function Generator ()
 	{
-		this .indent                = "";
-		this .indentChar            = "  ";
+		this .indent              = "";
+		this .indentChar          = "  ";
+		this .precision           = 6;
+		this .doublePrecision     = 14;
+		this .removeTrailingZeros = /\.?0*(?=$|[eE])/;
+
 		this .executionContextStack = [ null ];
 		this .importedNodesIndex    = new Map ();
 		this .exportedNodesIndex    = new Map ();
@@ -93,11 +96,19 @@ 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;
 		},
+		Precision: function (value)
+		{
+			return Math .fround (value) .toPrecision (this .precision) .replace (this .removeTrailingZeros, "");
+		},
+		DoublePrecision: function (value)
+		{
+			return value .toPrecision (this .doublePrecision) .replace (this .removeTrailingZeros, "");
+		},
 		PushExecutionContext: function (executionContext)
 		{
 			this .executionContextStack .push (executionContext);
@@ -145,7 +156,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 +170,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 +208,79 @@ function (X3DConstants)
 		{
 			return this .nodes .has (baseNode);
 		},
-		Name: function (baseNode)
+		Name: (function ()
 		{
-			// Is the node already in index
-
-			var name = this .namesByNode .get (baseNode);
-
-			if (name !== undefined)
-				return name;
-
-			var names = this .names .get (this .ExecutionContext ());
-
-			// The node has no name
+			const _TrailingNumbers = /(_\d+$)/;
 
-			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 +289,7 @@ function (X3DConstants)
 			if (baseNode .hasRoutes ())
 				return true;
 
-			var
+			const
 				executionContext = baseNode .getExecutionContext (),
 				index            = this .importedNodesIndex .get (executionContext);
 
@@ -280,24 +298,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 +327,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 +393,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" && typeof __filename === "string")
+				{
+					for (const url of providerUrls)
+						globalRequire (globalRequire ("url") .fileURLToPath (url));
+				}
+
 				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/Prototype/X3DExternProtoDeclaration.js

@@ -164,7 +164,7 @@ function ($,
 				this .setInternalScene (value);
 
 			else
-				this .setError ();
+				this .setError (new Error ("File could not be loaded."));
 
 			this .getScene () .removeInitLoadCount (this);
 		},

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" && typeof __filename === "string")
+			globalRequire (globalRequire ("url") .fileURLToPath (url));
+
+		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.config.js

@@ -36,11 +36,6 @@ require .config ({
 			"location": "../node_modules/opentype.js",
 			"main": "dist/opentype.js"
 		},
-		{
-			"name": "sprintf",
-			"location": "../node_modules/sprintf-js",
-			"main": "dist/sprintf.min.js"
-		},
 		{
 			"name": "contextMenu",
 			"location": "../node_modules/jquery-contextmenu",

package/src/x_ite.css

@@ -93,7 +93,7 @@ X3DCanvas .x_ite-private-notification {
 
 X3DCanvas .x_ite-private-notification span {
 	padding: 0px 24px 0px 20px;
-	background: url(assets/images/icon.bw.png) no-repeat 0px 3px;
+	background: url(assets/images/icon.bw.png) no-repeat 0px 2px;
 }
 
 X3DCanvas .x_ite-private-browser-timings {
@@ -335,11 +335,6 @@ X3DCanvas #context-menu-layer {
 	letter-spacing: unset;
 }
 
-.x_ite-private-menu .context-menu-separator {
-	padding-bottom: 0;
-	border-bottom: 1px solid #111;
-}
-
 .x_ite-private-menu .context-menu-item > label > input,
 .x_ite-private-menu .context-menu-item > label > textarea {
 	all: revert;
@@ -359,13 +354,24 @@ X3DCanvas #context-menu-layer {
 	-moz-appearance: radio;
 }
 
-.x_ite-private-menu .context-menu-hover {
+.x_ite-private-menu .context-menu-item:hover {
 	cursor: pointer;
 	background-color: #444;
 	border-top: 1px solid #eee;
 	border-bottom: 1px solid #eee;
 }
 
+.x_ite-private-menu .context-menu-item.context-menu-separator {
+	padding-top: 0;
+	padding-bottom: 0;
+	border-top: 0;
+	border-bottom: 1px solid #111;
+}
+
+.x_ite-private-menu .context-menu-separator + .context-menu-separator {
+	display: none !important;
+}
+
 .x_ite-private-menu .context-menu-disabled {
 	color: #666;
 }
@@ -444,7 +450,7 @@ X3DCanvas #context-menu-layer {
 }
 
 .x_ite-private-menu .context-menu-item > .context-menu-list {
-	top: 5px;
+	top: -9px;
 	/* re-positioned by js */
 	right: -5px;
 	display: none;

package/src/x_ite.html

@@ -34,7 +34,7 @@ body {
 	padding-bottom: 100px;
 	background: black;
 	color: white;
-	font-family: PT Sans, sans;
+	font-family: PT Sans, sans-serif;
 	line-height: 1.3;
 }
 
@@ -114,7 +114,7 @@ main.color-management .browser {
 	background: #313131;
 	color: white;
 	vertical-align: middle;
-	font-family: PT Sans;
+	font-family: PT Sans, sans-serif;
 	font-size: 10pt;
 }
 
@@ -130,7 +130,7 @@ main.color-management .browser {
 	background: #313131;
 	color: white;
 	vertical-align: middle;
-	font-family: PT Sans;
+	font-family: PT Sans, sans-serif;
 	font-size: 10pt;
 }
 

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 globalRequire === "function" && typeof __filename === "string")
+		var src = globalRequire ("url") .pathToFileURL (__filename) .href;
 
 	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/x_ite.min.html

@@ -32,7 +32,7 @@ body {
 	padding-bottom: 100px;
 	background: black;
 	color: white;
-	font-family: PT Sans, sans;
+	font-family: PT Sans, sans-serif;
 	line-height: 1.3;
 }
 
@@ -112,7 +112,7 @@ main.color-management .browser {
 	background: #313131;
 	color: white;
 	vertical-align: middle;
-	font-family: PT Sans;
+	font-family: PT Sans, sans-serif;
 	font-size: 10pt;
 }
 
@@ -128,7 +128,7 @@ main.color-management .browser {
 	background: #313131;
 	color: white;
 	vertical-align: middle;
-	font-family: PT Sans;
+	font-family: PT Sans, sans-serif;
 	font-size: 10pt;
 }
 

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 = { };