x_ite 4.7.8 → 4.7.9

package/docs/_config.yml

@@ -20,7 +20,7 @@ github: [metadata]
 author:
   name: *title
   avatar: "assets/images/logo.png"
-  bio: "Version 4.7.8"
+  bio: "Version 4.7.9"
   links:
     - label: "GitHub"
       icon: "fab fa-2x fa-fw fa-github"

package/docs/index.md

@@ -838,8 +838,8 @@ If you are a developer or you always wanna be up to date:
 If you are on production and everything works fine, then use a numbered version.
 
 ```html
-<link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/4.7.8/dist/x_ite.css"/>
-<script type="text/javascript" src="https://create3000.github.io/code/x_ite/4.7.8/dist/x_ite.min.js"></script>
+<link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/4.7.9/dist/x_ite.css"/>
+<script type="text/javascript" src="https://create3000.github.io/code/x_ite/4.7.9/dist/x_ite.min.js"></script>
 ```
 
 ### jsDelivr CDN

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "x_ite",
-	"version": "4.7.8",
-	"revision": "1134",
+	"version": "4.7.9",
+	"revision": "1135",
 	"description": "X_ITE X3D Browser, a framework for integrating and manipulating X3D and VRML scenes in HTML.",
 	"main": "dist/x_ite.js",
 	"repository": {
@@ -64,12 +64,14 @@
 		"require": "^0.4.4",
 		"requirejs": ">=2.3.6",
 		"requirejs-text": ">=2.0.15",
-		"sprintf-js": ">=1.1.2",
 		"uglify-js-es6": ">=2.8.9"
 	},
 	"scripts": {
 		"lint": "jshint **",
 		"build": "make",
 		"-prebuild:js": "npm run lint"
+	},
+	"dependencies": {
+		"sprintf-js": "^1.1.2"
 	}
 }

package/src/locale/de.po

@@ -153,11 +153,11 @@ msgstr "Auf Objekte zielen"
 msgid "None Viewer"
 msgstr "Kein Betrachter"
 
-msgid "Loading %d file"
-msgstr "Lade %d Datei"
+msgid "Loading %1 file"
+msgstr "Lade %1 Datei"
 
-msgid "Loading %d files"
-msgstr "Lade %d Dateien"
+msgid "Loading %1 files"
+msgstr "Lade %1 Dateien"
 
 msgid "Loading done"
 msgstr "Fertig mit Laden"

package/src/locale/fr.po

@@ -153,11 +153,11 @@ msgstr "Regarder un objet de près"
 msgid "None Viewer"
 msgstr "Pas de visionneur"
 
-msgid "Loading %d file"
-msgstr "Télécharger %d fichier"
+msgid "Loading %1 file"
+msgstr "Télécharger %1 fichier"
 
-msgid "Loading %d files"
-msgstr "Télécharger %d fichiers"
+msgid "Loading %1 files"
+msgstr "Télécharger %1 fichiers"
 
 msgid "Loading done"
 msgstr "Téléchargement fini"

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

@@ -49,18 +49,16 @@
 
 define ([
 	"jquery",
-	"x_ite/Fields/SFBool",
 	"x_ite/Basic/X3DBaseNode",
 	"locale/gettext",
 ],
 function ($,
-          SFBool,
           X3DBaseNode,
           _)
 {
 "use strict";
 
-   function f2 (n) { return Math .floor (n * 100) / 100; }
+   function f2 (n) { return n .toFixed (2); }
 
 	function BrowserTimings (executionContext)
 	{

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

@@ -50,12 +50,10 @@
 define ([
 	"x_ite/Fields",
 	"x_ite/Browser/Networking/urls",
-	"sprintf",
 	"locale/gettext",
 ],
 function (Fields,
           urls,
-          sprintf,
           _)
 {
 "use strict";
@@ -176,7 +174,7 @@ function (Fields,
 
 			if (value)
 			{
-				var string = sprintf .sprintf (value == 1 ? _ ("Loading %d file") : _ ("Loading %d files"), value);
+				var string = (value == 1 ? _ ("Loading %1 file") : _ ("Loading %1 files")) .replace ("%1", value);
 			}
 			else
 			{

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

@@ -61,12 +61,8 @@ define (function ()
 				if (getScriptURL () .match (/\.min\.js$/))
 					file += ".min";
 
-				if (typeof globalProcess === "object" && globalProcess .platform === "win32")
-				{
-					const path = globalRequire ("path");
-
-					return path .join (path .dirname (getScriptURL ()), "assets\\components\\" + file + ".js");
-				}
+				if (typeof globalRequire === "function" && typeof __filename === "string")
+					return this .getPath ("assets", "components", file + ".js");
 
 				return new URL ("assets/components/" + file + ".js", getScriptURL ()) .href;
 			}
@@ -75,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/VERSION.js

@@ -49,5 +49,5 @@
 
 define (function ()
 {
-	return "4.7.8";
+	return "4.7.9";
 });

package/src/x_ite/Fields/SFColor.js

@@ -51,10 +51,12 @@ define ([
 	"standard/Math/Numbers/Color3",
 	"x_ite/Basic/X3DField",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/InputOutput/Generator",
 ],
 function (Color3,
           X3DField,
-          X3DConstants)
+          X3DConstants,
+          Generator)
 {
 "use strict";
 
@@ -136,7 +138,18 @@ function (Color3,
 		})(),
 		toStream: function (stream)
 		{
-			stream .string += this .getValue () .toString ();
+			const
+				generator = Generator .Get (stream),
+				value     = this .getValue (),
+				last      = value .length - 1;
+
+			for (let i = 0; i < last; ++ i)
+			{
+				stream .string += generator .Precision (value [i]);
+				stream .string += " ";
+			}
+
+			stream .string += generator .Precision (value [last]);
 		},
 		toVRMLStream: function (stream)
 		{

package/src/x_ite/Fields/SFDouble.js

@@ -93,7 +93,7 @@ function (X3DField,
 				generator = Generator .Get (stream),
 				category  = generator .Unit (this .getUnit ());
 
-			stream .string += String (generator .ToUnit (category, this .getValue ()));
+			stream .string += generator .DoublePrecision (generator .ToUnit (category, this .getValue ()));
 		},
 		toVRMLStream: function (stream)
 		{

package/src/x_ite/Fields/SFFloat.js

@@ -93,7 +93,7 @@ function (X3DField,
 				generator = Generator .Get (stream),
 				category  = generator .Unit (this .getUnit ());
 
-			stream .string += String (generator .ToUnit (category, this .getValue ()));
+			stream .string += generator .Precision (generator .ToUnit (category, this .getValue ()));
 		},
 		toVRMLStream: function (stream)
 		{

package/src/x_ite/Fields/SFMatrix3.js

@@ -63,7 +63,7 @@ function (X3DField,
 {
 "use strict";
 
-	function SFMatrix3Template (TypeName, Type, SFVec2)
+	function SFMatrix3Template (TypeName, Type, SFVec2, double)
 	{
 		function SFMatrix3 (m00, m01, m02,
 		                    m10, m11, m12,
@@ -87,7 +87,7 @@ function (X3DField,
 		}
 
 		SFMatrix3 .prototype = Object .assign (Object .create (X3DField .prototype),
-			SFMatrixPrototypeTemplate (Matrix3, SFVec2),
+			SFMatrixPrototypeTemplate (Matrix3, SFVec2, double),
 		{
 			constructor: SFMatrix3,
 			getTypeName: function ()
@@ -135,7 +135,7 @@ function (X3DField,
 	}
 
 	return {
-		SFMatrix3d: SFMatrix3Template ("SFMatrix3d", X3DConstants .SFMatrix3d, SFVec2 .SFVec2d),
-		SFMatrix3f: SFMatrix3Template ("SFMatrix3f", X3DConstants .SFMatrix3f, SFVec2 .SFVec2f),
+		SFMatrix3d: SFMatrix3Template ("SFMatrix3d", X3DConstants .SFMatrix3d, SFVec2 .SFVec2d, true),
+		SFMatrix3f: SFMatrix3Template ("SFMatrix3f", X3DConstants .SFMatrix3f, SFVec2 .SFVec2f, false),
 	};
 });

package/src/x_ite/Fields/SFMatrix4.js

@@ -62,7 +62,7 @@ function (X3DField,
 {
 "use strict";
 
-	function SFMatrix4Template (TypeName, Type, SFVec3)
+	function SFMatrix4Template (TypeName, Type, SFVec3, double)
 	{
 		function SFMatrix4 (m00, m01, m02, m03,
 		                    m10, m11, m12, m13,
@@ -88,7 +88,7 @@ function (X3DField,
 		}
 
 		SFMatrix4 .prototype = Object .assign (Object .create (X3DField .prototype),
-			SFMatrixPrototypeTemplate (Matrix4, SFVec3),
+			SFMatrixPrototypeTemplate (Matrix4, SFVec3, double),
 		{
 			constructor: SFMatrix4,
 			getTypeName: function ()
@@ -126,8 +126,8 @@ function (X3DField,
 	}
 
 	return {
-		SFMatrix4d: SFMatrix4Template ("SFMatrix4d", X3DConstants .SFMatrix4d, SFVec3 .SFVec3d),
-		SFMatrix4f: SFMatrix4Template ("SFMatrix4f", X3DConstants .SFMatrix4f, SFVec3 .SFVec3f),
-		VrmlMatrix: SFMatrix4Template ("VrmlMatrix", X3DConstants .VrmlMatrix, SFVec3 .SFVec3f),
+		SFMatrix4d: SFMatrix4Template ("SFMatrix4d", X3DConstants .SFMatrix4d, SFVec3 .SFVec3d, true),
+		SFMatrix4f: SFMatrix4Template ("SFMatrix4f", X3DConstants .SFMatrix4f, SFVec3 .SFVec3f, false),
+		VrmlMatrix: SFMatrix4Template ("VrmlMatrix", X3DConstants .VrmlMatrix, SFVec3 .SFVec3f, false),
 	};
 });

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -54,7 +54,7 @@ function (X3DField)
 {
 "use strict";
 
-	return function (Matrix, SFVec)
+	return function (Matrix, SFVec, double)
 	{
 		return Object .assign (Object .create (X3DField .prototype),
 		{
@@ -132,9 +132,20 @@ function (X3DField)
 			},
 			toStream: function (stream)
 			{
-				stream .string += this .getValue () .toString ();
+				const
+					generator = Generator .Get (stream),
+					value     = this .getValue (),
+					last      = value .length - 1;
+
+				for (let i = 0; i < last; ++ i)
+				{
+					stream .string += double ? generator .DoublePrecision (value [i]) : generator .Precision (value [i]);
+					stream .string += " ";
+				}
+
+				stream .string += double ? generator .DoublePrecision (value [last]) : generator .Precision (value [last]);
 			},
-			toVRMLStream: function (stream)
+				toVRMLStream: function (stream)
 			{
 				this .toStream (stream);
 			},

package/src/x_ite/Fields/SFRotation.js

@@ -145,10 +145,10 @@ function (SFVec3,
 				generator = Generator .Get (stream),
 				rotation  = this .getValue ();
 
-			stream .string +=  rotation .x + " " +
-			                   rotation .y + " " +
-			                   rotation .z + " " +
-			                   generator .ToUnit ("angle", rotation .angle);
+			stream .string += generator .DoublePrecision (rotation .x) + " " +
+			                  generator .DoublePrecision (rotation .y) + " " +
+			                  generator .DoublePrecision (rotation .z) + " " +
+			                  generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle));
 		},
 		toVRMLStream: function (stream)
 		{

package/src/x_ite/Fields/SFTime.js

@@ -87,7 +87,7 @@ function (X3DField,
 		valueOf: X3DField .prototype .getValue,
 		toStream: function (stream)
 		{
-			stream .string += String (this .getValue ());
+			stream .string += this .getValue ();
 		},
 		toVRMLStream: function (stream)
 		{

package/src/x_ite/Fields/SFVec2.js

@@ -57,7 +57,7 @@ function (X3DField, SFVecPrototypeTemplate, X3DConstants, Vector2)
 {
 "use strict";
 
-	function SFVec2Template (TypeName, Type)
+	function SFVec2Template (TypeName, Type, double)
 	{
 		function SFVec2 (x, y)
 		{
@@ -77,7 +77,7 @@ function (X3DField, SFVecPrototypeTemplate, X3DConstants, Vector2)
 		}
 
 		SFVec2 .prototype = Object .assign (Object .create (X3DField .prototype),
-			SFVecPrototypeTemplate (Vector2),
+			SFVecPrototypeTemplate (Vector2, double),
 		{
 			constructor: SFVec2,
 			getTypeName: function ()
@@ -131,7 +131,7 @@ function (X3DField, SFVecPrototypeTemplate, X3DConstants, Vector2)
 	}
 
 	return {
-		SFVec2d: SFVec2Template ("SFVec2d", X3DConstants .SFVec2d),
-		SFVec2f: SFVec2Template ("SFVec2f", X3DConstants .SFVec2f),
+		SFVec2d: SFVec2Template ("SFVec2d", X3DConstants .SFVec2d, true),
+		SFVec2f: SFVec2Template ("SFVec2f", X3DConstants .SFVec2f, false),
 	};
 });

package/src/x_ite/Fields/SFVec3.js

@@ -60,7 +60,7 @@ function (X3DField,
 {
 "use strict";
 
-	function SFVec3Template (TypeName, Type)
+	function SFVec3Template (TypeName, Type, double)
 	{
 		function SFVec3 (x, y, z)
 		{
@@ -80,7 +80,7 @@ function (X3DField,
 		}
 
 		SFVec3 .prototype = Object .assign (Object .create (X3DField .prototype),
-			SFVecPrototypeTemplate (Vector3),
+			SFVecPrototypeTemplate (Vector3, double),
 		{
 			constructor: SFVec3,
 			getTypeName: function ()
@@ -155,7 +155,7 @@ function (X3DField,
 	}
 
 	return {
-		SFVec3d: SFVec3Template ("SFVec3d", X3DConstants .SFVec3d),
-		SFVec3f: SFVec3Template ("SFVec3f", X3DConstants .SFVec3f),
+		SFVec3d: SFVec3Template ("SFVec3d", X3DConstants .SFVec3d, true),
+		SFVec3f: SFVec3Template ("SFVec3f", X3DConstants .SFVec3f, false),
 	};
 });

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*$|\.?0*(?=e|E)/;
+
 		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 (url);
 				}
 
 				return Array .from (providerUrls);

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 (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 {
@@ -336,6 +336,7 @@ X3DCanvas #context-menu-layer {
 }
 
 .x_ite-private-menu .context-menu-separator {
+	padding-top: 0;
 	padding-bottom: 0;
 	border-bottom: 1px solid #111;
 }

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;
-	}
+		var src = __filename;
 
 	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;
 }