x_ite 4.7.9 → 4.7.10

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

package/docs/_config.yml

@@ -20,7 +20,7 @@ github: [metadata]
 author:
   name: *title
   avatar: "assets/images/logo.png"
-  bio: "Version 4.7.9"
+  bio: "Version 4.7.10"
   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.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>
+<link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/4.7.10/dist/x_ite.css"/>
+<script type="text/javascript" src="https://create3000.github.io/code/x_ite/4.7.10/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.9",
-	"revision": "1135",
+	"version": "4.7.10",
+	"revision": "1136",
 	"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",
@@ -70,8 +72,5 @@
 		"lint": "jshint **",
 		"build": "make",
 		"-prebuild:js": "npm run lint"
-	},
-	"dependencies": {
-		"sprintf-js": "^1.1.2"
 	}
 }

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

@@ -61,9 +61,6 @@ define (function ()
 				if (getScriptURL () .match (/\.min\.js$/))
 					file += ".min";
 
-				if (typeof globalRequire === "function" && typeof __filename === "string")
-					return this .getPath ("assets", "components", file + ".js");
-
 				return new URL ("assets/components/" + file + ".js", getScriptURL ()) .href;
 			}
 
@@ -71,42 +68,20 @@ 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.9";
+	return "4.7.10";
 });

package/src/x_ite/InputOutput/Generator.js

@@ -60,7 +60,7 @@ function (X3DConstants)
 		this .indentChar          = "  ";
 		this .precision           = 6;
 		this .doublePrecision     = 14;
-		this .removeTrailingZeros = /\.?0*$|\.?0*(?=e|E)/;
+		this .removeTrailingZeros = /\.?0*(?=$|[eE])/;
 
 		this .executionContextStack = [ null ];
 		this .importedNodesIndex    = new Map ();

package/src/x_ite/Parser/X3DParser.js

@@ -133,7 +133,7 @@ define (function ()
 				if (typeof globalRequire === "function" && typeof __filename === "string")
 				{
 					for (const url of providerUrls)
-						globalRequire (url);
+						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/X3D.js

@@ -109,7 +109,7 @@ function ($,
 		const url = urls .getProviderUrl (name);
 
 		if (typeof globalRequire === "function" && typeof __filename === "string")
-			globalRequire (url);
+			globalRequire (globalRequire ("url") .fileURLToPath (url));
 
 		return url;
 	}

package/src/x_ite.css

@@ -335,12 +335,6 @@ X3DCanvas #context-menu-layer {
 	letter-spacing: unset;
 }
 
-.x_ite-private-menu .context-menu-separator {
-	padding-top: 0;
-	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;
@@ -360,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;
 }
@@ -445,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.js

@@ -70,8 +70,8 @@ const getScriptURL = (function ()
 {
 	if (document .currentScript)
 		var src = document .currentScript .src;
-	else if (typeof __filename === "string")
-		var src = __filename;
+	else if (typeof globalRequire === "function" && typeof __filename === "string")
+		var src = globalRequire ("url") .pathToFileURL (__filename) .href;
 
 	return function ()
 	{