x_ite 4.7.8 → 4.7.12

package/src/x_ite/Fields/SFVec4.js

@@ -60,7 +60,7 @@ function (X3DField,
 {
 "use strict";
 
-	function SFVec4Template (TypeName, Type)
+	function SFVec4Template (TypeName, Type, double)
 	{
 		function SFVec4 (x, y, z, w)
 		{
@@ -80,7 +80,7 @@ function (X3DField,
 		}
 
 		SFVec4 .prototype = Object .assign (Object .create (X3DField .prototype),
-			SFVecPrototypeTemplate (Vector4),
+			SFVecPrototypeTemplate (Vector4, double),
 		{
 			constructor: SFVec4,
 			getTypeName: function ()
@@ -168,7 +168,7 @@ function (X3DField,
 	}
 
 	return {
-		SFVec4d: SFVec4Template ("SFVec4d", X3DConstants .SFVec4d),
-		SFVec4f: SFVec4Template ("SFVec4f", X3DConstants .SFVec4f),
+		SFVec4d: SFVec4Template ("SFVec4d", X3DConstants .SFVec4d, true),
+		SFVec4f: SFVec4Template ("SFVec4f", X3DConstants .SFVec4f, false),
 	};
 });

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),
 		{
@@ -129,15 +129,16 @@ function (X3DField,
 				const
 					generator = Generator .Get (stream),
 					value     = this .getValue (),
-					category  = generator .Unit (this .getUnit ());
+					category  = generator .Unit (this .getUnit ()),
+					last      = value .length - 1;
 
-				for (let 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 [value .length - 1]));
+				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 ();
@@ -98,6 +101,14 @@ function (X3DConstants)
 
 			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);

package/src/x_ite/Parser/X3DParser.js

@@ -125,22 +125,15 @@ define (function ()
 				for (const component of components)
 				{
 					const providerUrl = component .providerUrl;
-				if (providerUrl .match (componentsUrl))
+
+					if (providerUrl .match (componentsUrl))
 						providerUrls .add (providerUrl);
 				}
 
-				if (typeof globalRequire === "function")
+				if (typeof globalRequire === "function" && typeof __filename === "string")
 				{
-					if (typeof globalProcess === "object" && globalProcess .platform === "win32")
-					{
-						for (const url of providerUrls)
-							globalRequire (url);
-					}
-					else
-					{
-						for (const url of providerUrls)
-							globalRequire (new URL (url) .pathname);
-					}
+					for (const url of providerUrls)
+						globalRequire (globalRequire ("url") .fileURLToPath (url));
 				}
 
 				return Array .from (providerUrls);

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/Prototype/X3DProtoDeclaration.js

@@ -315,7 +315,7 @@ function (Fields,
 
 			generator .IncIndent ();
 
-			this .body .toXMLStream .call (stream);
+			this .body .toXMLStream (stream);
 
 			generator .DecIndent ();
 

package/src/x_ite/X3D.js

@@ -108,13 +108,8 @@ function ($,
 	{
 		const url = urls .getProviderUrl (name);
 
-		if (typeof globalRequire === "function")
-		{
-			if (typeof globalProcess === "object" && globalProcess .platform === "win32")
-				globalRequire (url);
-			else
-				globalRequire (new URL (url) .pathname);
-		}
+		if (typeof globalRequire === "function" && typeof __filename === "string")
+			globalRequire (globalRequire ("url") .fileURLToPath (url));
 
 		return url;
 	}

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

@@ -69,16 +69,9 @@ define .hide = function ()
 const getScriptURL = (function ()
 {
 	if (document .currentScript)
-	{
 		var src = document .currentScript .src;
-	}
-	else if (typeof __filename === "string")
-	{
-		if (typeof globalProcess === "object" && globalProcess .platform === "win32")
-			var src = __filename;
-		else
-			var src = "file://" + __filename;
-	}
+	else if (typeof globalRequire === "function" && typeof __filename === "string")
+		var src = globalRequire ("url") .pathToFileURL (__filename) .href;
 
 	return function ()
 	{

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