x_ite 4.7.7 → 4.7.11

package/docs/Accessing-the-External-Browser.md

@@ -65,20 +65,6 @@ function (error)
 </script>
 ```
 
-### Using the Promise return value
-
-```js
-X3D () .then (function ()
-{
-  const Browser = X3D .getBrowser ();
-})
-.catch (function (error)
-{
-  // ooops an error.
-  console .error (error);
-});
-```
-
 ### Async use of X3D object
 
 ```js
@@ -194,7 +180,7 @@ function foo (node)
 
 #### **X3DFields**
 
-All X3DFields (SFColor, ..., MFBool, MFColor, and so on). The fields can be created using the object as construtor. **Note:** Scalar objects like SFBool, SFDouble, SFFloat, SFInt32, SFString, and SFTime have no constructor, just use the built-in JavaScript types Boolean, Number, and String.
+All X3DFields (SFColor, ..., MFBool, MFColor, and so on). The fields can be created using the object as constructor. **Note:** Scalar objects like SFBool, SFDouble, SFFloat, SFInt32, SFString, and SFTime have no constructor, just use the built-in JavaScript types Boolean, Number, and String.
 
 ```js
 // Create a new translation vector and
@@ -294,7 +280,7 @@ function spin ()
 ### The HTML
 
 ```html
-<X3DCanvas src="external-browser.x3d" onload="init ()"/>
+<X3DCanvas src="external-browser.x3d" onload="init ()"></X3DCanvas>
 
 <div class="buttons">
   <button id="center" class="button" onclick="center ()">Center</button>

package/docs/_config.yml

@@ -20,7 +20,7 @@ github: [metadata]
 author:
   name: *title
   avatar: "assets/images/logo.png"
-  bio: "Version 4.7.7"
+  bio: "Version 4.7.11"
   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.7/dist/x_ite.css"/>
-<script type="text/javascript" src="https://create3000.github.io/code/x_ite/4.7.7/dist/x_ite.min.js"></script>
+<link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/4.7.11/dist/x_ite.css"/>
+<script type="text/javascript" src="https://create3000.github.io/code/x_ite/4.7.11/dist/x_ite.min.js"></script>
 ```
 
 ### jsDelivr CDN
@@ -946,7 +946,7 @@ A Boolean value (`true` or `false`) to indicate whether files transferred over t
 
 ### contextMenu
 
-A Boolean value (`true` or `false`) to indicate whether a context menu should be displayed on right click. The default value for the contextMenu attribute is `true`.
+A Boolean value (`true` or `false`) to indicate whether a context menu should be displayed on right click. The default value for the contextMenu attribute is `true`. The context menu can also be extended, [see here](#extending-the-context-menu).
 {: .notice}
 
 ### notifications
@@ -999,6 +999,27 @@ A MFString value with urls that should be loaded on page load. If no url attribu
 
 More options can be adjusted using the [Browser Object](/x_ite/reference/Browser-Services.html#browser-object) and [Browser Options](/x_ite/reference/Browser-Services.html#browser-options) for scene specific adjustments.
 
+## Extending the Context Menu
+
+The context menu is the jQuery Context Menu plugin, and it can be extended using the `items` syntax. The full documentation [can be found here](https://swisnl.github.io/jQuery-contextMenu/docs/items.html).
+
+### Example
+
+```js
+Browser .getContextMenu () .setUserMenu (function ()
+{
+  return {
+    "command-1": {
+      name: "Command 1",
+      callback: function (key, opt)
+      {
+        console .log ("Clicked on " + key);
+      },
+    },
+  };
+});
+```
+
 ## Accessing the External Browser
 
 X\_ITE is designed to provide access to a browser and its contained scene graph via JavaScript, either within an internal X3D Script node or an external HTML script.

package/docs/reference/Browser-Services.md

@@ -189,7 +189,7 @@ Returns a browser option with the corresponding name.
       <tr>
          <td>Shading</td>
          <td>Specify shading mode for all objects.</td>
-         <td>Wireframe, Flat, Gouraud, Phong</td>
+         <td>Point, Wireframe, Flat, Gouraud, Phong</td>
          <td>Gouraud</td>
       </tr>
       <tr>
@@ -253,7 +253,7 @@ Returns a rendering property with the corresponding *name*.
       <tr>
          <td>Shading</td>
          <td>String</td>
-         <td>The type of shading algorithm in use. Typical values are Flat, Gouraud, Phong, Wireframe.</td>
+         <td>The type of shading algorithm in use. Typical values are Flat, Gouraud, Phong, Wireframe, Point.</td>
       </tr>
       <tr>
          <td>MaxTextureSize</td>

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "x_ite",
-	"version": "4.7.7",
-	"revision": "1133",
+	"version": "4.7.11",
+	"revision": "1137",
 	"description": "X_ITE X3D Browser, a framework for integrating and manipulating X3D and VRML scenes in HTML.",
 	"main": "dist/x_ite.js",
 	"repository": {
@@ -17,7 +17,9 @@
 		"wrl",
 		"JavaScript",
 		"JSON",
-		"xite"
+		"xite",
+		"node",
+		"electron"
 	],
 	"author": "Holger Seelig <holger.seelig@gmail.com>",
 	"license": "GPL-3.0",
@@ -64,7 +66,6 @@
 		"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": {

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/standard/Utility/DataStorage.js

@@ -53,7 +53,8 @@ define (function ()
 
 	const
 		storages   = new WeakMap (),
-		namespaces = new WeakMap ();
+		namespaces = new WeakMap (),
+		defaults   = new WeakMap ();
 
 	const handler =
 	{
@@ -67,7 +68,7 @@ define (function ()
 			var value = target .getStorage () [target .getNameSpace () + key];
 
 			if (value === undefined || value === "undefined" || value === null)
-			   return undefined;
+			   return target .getDefaultValue (key);
 
 			return JSON .parse (value);
 		},
@@ -89,6 +90,7 @@ define (function ()
 
 		storages   .set (this, storage);
 		namespaces .set (this, namespace);
+		defaults   .set (this, { });
 
 		return new Proxy (this, handler);
 	}
@@ -103,6 +105,18 @@ define (function ()
 		{
 			return namespaces .get (this .target);
 		},
+		addNameSpace: function (namespace)
+		{
+			return new DataStorage (this .getStorage (), this .getNameSpace () + namespace);
+		},
+		addDefaultValues: function (defaults)
+		{
+			Object .assign (defaults .get (this .target), object);
+		},
+		getDefaultValue (key)
+		{
+			return defaults .get (this .target) [key];
+		},
 		clear: function ()
 		{
 			const

package/src/x_ite/Basic/X3DBaseNode.js

@@ -954,7 +954,7 @@ function (X3DEventObject,
 				references = [ ],
 				childNodes = [ ];
 
-			const cdata = this .getSourceText ();
+			let cdata = this .getSourceText ();
 
 			if (cdata && cdata .length === 0)
 				cdata = null;

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/Core/ContextMenu.js

@@ -64,7 +64,8 @@ function ($,
 	{
 		X3DBaseNode .call (this, executionContext);
 
-		this .active = false;
+		this .userMenu = null;
+		this .active   = false;
 	}
 
 	ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -116,15 +117,57 @@ function ($,
 							},
 							1);
 						}
-
+					},
+					activated: function (options)
+					{
 						// Display submenus on left side if there is no space on right side.
 
 						if (options .$menu .hasClass ("x_ite-private-menu-submenus-left"))
 						{
-							options .$menu .find (".context-menu-item > .context-menu-list") .css ({
-								"right": options .$menu .width () + "px",
+							options .$menu .find (".context-menu-list") .each (function (i, e)
+							{
+								$(e) .css ("right", $(e) .parent () .parent () .css ("width"));
 							});
 						}
+						else
+						{
+							options .$menu .find (".context-menu-list") .each (function (i, e)
+							{
+								$(e) .css ("left", (parseInt ($(e) .parent () .parent () .css ("width")) - 2) + "px");
+							});
+						}
+
+						// If the submenu is higher than vh, add scrollbars.
+						options .$menu .find (".context-menu-list") .each (function (i, e)
+						{
+							if ($(e) .height () > $(window) .height ())
+							{
+								$(e) .css ({
+									"overflow-y": "scroll",
+									"max-height": "100vh",
+								});
+							}
+						});
+
+						// If the submenu is higher than vh, reposition it.
+						options .$menu .find (".context-menu-item") .on ("mouseenter", function (event)
+						{
+							event .stopImmediatePropagation ();
+
+							const
+								t = $(event .target),
+								e = t .children (".context-menu-list");
+
+							if (!e .length)
+								return;
+
+							e .css ("top", "");
+
+							const bottom = e .offset () .top + e .height () - $(window) .scrollTop () - $(window) .height ();
+
+							if (bottom > 0)
+								e .offset ({ "top": e .offset () .top - bottom });
+						});
 					}
 					.bind (this),
 					hide: function (options)
@@ -135,6 +178,14 @@ function ($,
 				},
 			});
 		},
+		getUserMenu: function ()
+		{
+			return this .userMenu;
+		},
+		setUserMenu: function (userMenu)
+		{
+			this .userMenu = userMenu;
+		},
 		getActive: function ()
 		{
 			return this .active;
@@ -414,9 +465,22 @@ function ($,
 							window .open (browser .getProviderUrl ());
 						},
 					},
-				}
+				},
 			};
 
+			if ($.isFunction (this .userMenu))
+			{
+				const userMenu = this .userMenu ();
+
+				if ($.isPlainObject (userMenu))
+				{
+					Object .assign (menu .items, { "separator4": "--------" });
+
+					for (const key in userMenu)
+						menu .items ["user-" + key] = userMenu [key];
+				}
+			}
+
 			if (leftSubMenus)
 				menu .className += " x_ite-private-menu-submenus-left";
 

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/VERSION.js

@@ -49,5 +49,5 @@
 
 define (function ()
 {
-	return "4.7.7";
+	return "4.7.11";
 });

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