x_ite 8.3.1 → 8.3.3

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

@@ -604,17 +604,13 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       // Menu
 
-      const
-         x = event .pageX - $(document) .scrollLeft (),
-         y = event .pageY - $(document) .scrollTop ();
-
       const ul = $("<ul></ul>")
          .hide ()
+         .addClass ("context-menu-root")
          .addClass ("context-menu-list")
          .addClass (menu .className)
-         .addClass ("context-menu-root")
-         .css ({ "left": x, "top": y })
-         .appendTo (options .appendTo);
+         .appendTo (options .appendTo)
+         .offset ({ "left": event .pageX, "top": event .pageY });
 
       for (const k in menu .items)
          ul .append (this .createItem (menu .items [k], "context-menu-root", k, level + 1, hide));
@@ -623,6 +619,8 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       // Reposition menu if to right or to low.
 
+		ul .offset ({ "left": event .pageX, "top": event .pageY }); // Do it again!
+
       if (ul .offset () .left - $(document) .scrollLeft () + ul .outerWidth () > $(window) .width ())
          ul .offset ({ "left":  $(document) .scrollLeft () + Math .max (0, $(window) .width () - ul .outerWidth ()) });
 

package/src/x_ite/Browser/DOMIntegration.js

@@ -31,25 +31,23 @@ class DOMIntegration
 {
 	constructor (browser)
 	{
-		this .browser     = browser;
-		this .rootElement = undefined;
+		this .browser        = browser;
+		this .rootElement    = undefined;
+		this .canvasObserver = new MutationObserver (() => this .processCanvasMutation (browser));
 
-		this .canvasObserver = new MutationObserver (() =>
-		{
-			this .observeRoot (this .browser .getElement () .children ("X3D") [0]);
-		});
-
-		this .canvasObserver .observe (this .browser .getElement () [0], {
+		this .canvasObserver .observe (browser .getElement () [0], {
 			childList: true,
 		});
 
-		const rootElement = this .browser .getElement () .children ("X3D") [0];
+		this .processCanvasMutation (browser)
+	}
 
-		if (rootElement)
-			this .observeRoot (rootElement);
+	processCanvasMutation (browser)
+	{
+		this .processRootElement (browser, browser .getElement () .children ("X3D") .get (-1));
 	}
 
-	async observeRoot (rootElement)
+	async processRootElement (browser, rootElement)
 	{
 		try
 		{
@@ -62,21 +60,20 @@ class DOMIntegration
 			{
 				// Display splash screen.
 
-				this .browser .setBrowserLoading (true);
-				this .browser .addLoadingObject (this);
+				browser .setBrowserLoading (true);
+				browser .addLoadingObject (this);
 
-				// Preprocess script nodes if not xhtml.
+				// Now also attached node property to each node element.
 
-				if (! location .pathname .toLowerCase () .endsWith (".xhtml"))
-					this .preprocessScriptElements (rootElement);
+				const scene = browser .createScene ();
 
-				// Now also attached x3d property to each node element.
+				this .parser = new XMLParser (scene);
 
-				const importedScene = await this .browser .importDocument (rootElement, true);
+				this .parser .setInput (rootElement);
 
-				this .browser .replaceWorld (importedScene);
+				await new Promise (this .parser .parseIntoScene .bind (this .parser));
 
-				this .parser = new XMLParser (importedScene);
+				browser .replaceWorld (scene);
 
 				// Create an observer instance.
 
@@ -101,11 +98,11 @@ class DOMIntegration
 				this .processInlineElements (rootElement);
 				this .addEventDispatchersAll (rootElement);
 
-				this .browser .removeLoadingObject (this);
+				browser .removeLoadingObject (this);
 			}
 			else
 			{
-				this .browser .replaceWorld (null);
+				browser .replaceWorld (null);
 			}
 		}
 		catch (error)
@@ -114,27 +111,6 @@ class DOMIntegration
 		}
 	}
 
-	preprocessScriptElements (rootElement)
-	{
-		const scriptElements = rootElement .querySelectorAll ("Script");
-
-		for (const scriptElement of scriptElements)
-			this .appendScriptElementChildren (scriptElement);
-	}
-
-	appendScriptElementChildren (scriptElement)
-	{
-		const
-			domParser   = new DOMParser (),
-			scriptDoc   = domParser .parseFromString (scriptElement .outerHTML, "application/xml"),
-			scriptNodes = scriptDoc .children [0] .childNodes;
-
-		scriptElement .textContent = "// Content moved into childNodes.";
-
-		for (const scriptNode of scriptNodes)
-			scriptElement .appendChild (scriptNode);
-	}
-
 	processMutation (mutation)
 	{
 		switch (mutation .type)
@@ -159,13 +135,15 @@ class DOMIntegration
 
 	processAttribute (mutation, element)
 	{
+		const parser = this .parser;
+
 		if ($.data (element, "node"))
 		{
 			const
 				attributeName = mutation .attributeName,
 				attribute     = element .attributes .getNamedItem (attributeName);
 
-			this .parser .nodeAttribute (attribute, $.data (element, "node"));
+			parser .nodeAttribute (attribute, $.data (element, "node"));
 		}
 		else
 		{
@@ -175,11 +153,11 @@ class DOMIntegration
 				parentNode = element .parentNode,
 			 	node       = $.data (parentNode, "node");
 
-			this .parser .pushExecutionContext (node .getExecutionContext ());
-			this .parser .pushParent (node);
-			this .parser .childElement (element);
-			this .parser .popParent ();
-			this .parser .popExecutionContext ();
+			parser .pushExecutionContext (node .getExecutionContext ());
+			parser .pushParent (node);
+			parser .childElement (element);
+			parser .popParent ();
+			parser .popExecutionContext ();
 		}
 	}
 
@@ -275,6 +253,8 @@ class DOMIntegration
 			return;
 
 		node ._loadState .addInterest ("appendInlineChildElement", this, element);
+
+		this .appendInlineChildElement (element);
 	}
 
 	appendInlineChildElement (element)
@@ -309,12 +289,36 @@ class DOMIntegration
 
 				// Add Inline elements, and connect to node events.
 
-				this .processInlineElements (element);
-				this .addEventDispatchersAll (element);
+				this .processInlineElements (X3DElement);
+				this .addEventDispatchersAll (X3DElement);
 
 				break;
 			}
 		}
+
+		switch (node .checkLoadState ())
+		{
+			case X3DConstants .COMPLETE_STATE:
+			{
+				const event = new CustomEvent ("load",
+				{
+					detail: { node: SFNodeCache .get (node) },
+				});
+
+				element .dispatchEvent (event);
+				break;
+			}
+			case X3DConstants .FAILED_STATE:
+			{
+				const event = new CustomEvent ("error",
+				{
+					detail: { node: SFNodeCache .get (node) },
+				});
+
+				element .dispatchEvent (event);
+				break;
+			}
+		}
 	}
 
 	addEventDispatchersAll (element)
@@ -356,9 +360,13 @@ class DOMIntegration
 	{
 		const node = $.data (element, "node");
 
-		const event = new CustomEvent (field .getName (), {
+		if (! node)
+			return;
+
+		const event = new CustomEvent (field .getName (),
+		{
 			detail: {
-				node: node ? SFNodeCache .get (node) : null,
+				node: SFNodeCache .get (node),
 				value: field .valueOf (),
 			},
 		});

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.3.1";
+export default "8.3.3";

package/src/x_ite/Browser/X3DBrowser.js

@@ -72,7 +72,8 @@ import _                   from "../../locale/gettext.js";
 const
    _DOMIntegration   = Symbol (),
    _loader           = Symbol (),
-   _browserCallbacks = Symbol ();
+   _browserCallbacks = Symbol (),
+   _console          = Symbol ();
 
 function X3DBrowser (element)
 {
@@ -86,6 +87,7 @@ function X3DBrowser (element)
    X3DBrowserContext .call (this, element);
 
    this [_browserCallbacks] = new Map ();
+   this [_console]          = document .getElementsByClassName ("x_ite-console");
 
    this .setup ();
 };
@@ -119,25 +121,28 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       if (this .getInstanceId () > 1) return;
 
-      this .print ("Welcome to " + this .name + " X3D Browser v" + this .version + ":\n" +
-                   "   Current Graphics Renderer\n" +
-                   "      Name: " + this .getVendor () + " " + this .getRenderer () + "\n" +
-                   "      WebGL version: " + this .getWebGLVersion () + "\n" +
-                   "      Shading language: " + this .getShadingLanguageVersion () + "\n" +
-                   "   Rendering Properties\n" +
-                   "      Antialiased: " + this .getAntialiased () + "\n" +
-                   "      Depth size: " + this .getDepthSize () + " bits\n" +
-                   "      Color depth: " + this .getColorDepth () + " bits\n" +
-                   "      Max clip planes per shape: " + this .getMaxClipPlanes () + "\n" +
-                   "      Max lights per shape: " + this .getMaxLights () + "\n" +
-                   "      Max multi textures per shape: " + this .getMaxTextures () + "\n" +
-                   "      Texture units: " + this .getMaxCombinedTextureUnits () + "\n" +
-                   "      Max texture size: " + this .getMaxTextureSize () + " × " + this .getMaxTextureSize () + " pixels\n" +
-                   "      Texture memory: " + this .getTextureMemory () + "\n" +
-                   "      Max vertex uniform vectors: " + this .getMaxVertexUniformVectors () + "\n" +
-                   "      Max fragment uniform vectors: " + this .getMaxFragmentUniformVectors () + "\n" +
-                   "      Max vertex attribs: " + this .getMaxVertexAttribs () + "\n" +
-                   "      Max varying vectors: " + this .getMaxVaryingVectors () + "\n");
+      $(() =>
+      {
+         this .print ("Welcome to " + this .name + " X3D Browser v" + this .version + ":\n" +
+                      "   Current Graphics Renderer\n" +
+                      "      Name: " + this .getVendor () + " " + this .getRenderer () + "\n" +
+                      "      WebGL version: " + this .getWebGLVersion () + "\n" +
+                      "      Shading language: " + this .getShadingLanguageVersion () + "\n" +
+                      "   Rendering Properties\n" +
+                      "      Antialiased: " + this .getAntialiased () + "\n" +
+                      "      Depth size: " + this .getDepthSize () + " bits\n" +
+                      "      Color depth: " + this .getColorDepth () + " bits\n" +
+                      "      Max clip planes per shape: " + this .getMaxClipPlanes () + "\n" +
+                      "      Max lights per shape: " + this .getMaxLights () + "\n" +
+                      "      Max multi textures per shape: " + this .getMaxTextures () + "\n" +
+                      "      Texture units: " + this .getMaxCombinedTextureUnits () + "\n" +
+                      "      Max texture size: " + this .getMaxTextureSize () + " × " + this .getMaxTextureSize () + " pixels\n" +
+                      "      Texture memory: " + this .getTextureMemory () + "\n" +
+                      "      Max vertex uniform vectors: " + this .getMaxVertexUniformVectors () + "\n" +
+                      "      Max fragment uniform vectors: " + this .getMaxFragmentUniformVectors () + "\n" +
+                      "      Max vertex attribs: " + this .getMaxVertexAttribs () + "\n" +
+                      "      Max varying vectors: " + this .getMaxVaryingVectors () + "\n");
+      });
    },
    getName: function ()
    {
@@ -333,7 +338,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
       if (loadCount .getValue ())
          return;
 
-      this ._loadCount .removeInterest ("checkLoadCount", this);
+      loadCount .removeInterest ("checkLoadCount", this);
       this .initialized () .set (this .getCurrentTime ());
       this .initialized () .processInterests ();
       this .callBrowserCallbacks (X3DConstants .INITIALIZED_EVENT);
@@ -781,23 +786,33 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    print: function ()
    {
-      console .log (Array .prototype .join .call (arguments, " "));
+      const string = Array .prototype .join .call (arguments, "");
+
+      console .log (string);
+
+      for (const element of this [_console])
+         element .append (document .createTextNode (string));
    },
    println: function ()
    {
-      console .log (Array .prototype .join .call (arguments, " "));
+      const string = Array .prototype .join .call (arguments, "");
+
+      console .log (string);
+
+      for (const element of this [_console])
+         element .append (document .createTextNode (string + "\n"));
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .currentScene .toVRMLStream (stream);
+      this .currentScene .toVRMLStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .currentScene .toXMLStream (stream);
+      this .currentScene .toXMLStream (generator);
    },
-   toJSONStream: function (stream)
+   toJSONStream: function (generator)
    {
-      this .currentScene .toJSONStream (stream);
+      this .currentScene .toJSONStream (generator);
    },
 });
 

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -341,6 +341,9 @@ Object .assign (X3DBrowserContext,
             X3D     = window [Symbol .for ("X_ITE.X3D")],
             browser = X3D .getBrowser (canvas);
 
+         if (! browser)
+            return;
+
          browserContext .call (browser);
 
          if (typeof browserContext .prototype .initialize === "function")