x_ite 8.3.0 → 8.3.2

package/src/x_ite/Base/X3DArrayField.js

@@ -57,6 +57,7 @@ X3DArrayField .prototype = Object .assign (Object .create (X3DField .prototype),
    constructor: X3DArrayField,
    at: Array .prototype .at,
    concat: Array .prototype .concat,
+   //Array.prototype.copyWithin,
    entries: Array .prototype .entries,
    every: Array .prototype .every,
    fill: Array .prototype .fill,
@@ -76,8 +77,10 @@ X3DArrayField .prototype = Object .assign (Object .create (X3DField .prototype),
    map: Array .prototype .map,
    reduce: Array .prototype .reduce,
    reduceRight: Array .prototype .reduceRight,
+   //Array.prototype.reverse
    slice: Array .prototype .slice,
    some: Array .prototype .some,
+   //Array.prototype.sort
    values: Array .prototype .values,
 });
 

package/src/x_ite/Base/X3DBaseNode.js

@@ -51,6 +51,7 @@ import FieldDefinitionArray from "./FieldDefinitionArray.js";
 import FieldArray           from "./FieldArray.js";
 import Fields               from "../Fields.js";
 import X3DConstants         from "./X3DConstants.js";
+import HTMLSupport          from "../Parser/HTMLSupport.js";
 
 const
    _executionContext  = Symbol (),
@@ -390,6 +391,9 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
          enumerable: true,
          configurable: false,
       });
+
+      if (field .isInitializable ())
+         HTMLSupport .addFieldName (alias);
    },
    removeField: function (name)
    {

package/src/x_ite/Base/X3DInfoArray.js

@@ -201,24 +201,28 @@ X3DInfoArray .prototype = {
    },
    at: Array .prototype .at,
    concat: Array .prototype .concat,
-   //entries: function () { return iterator -> [index, value]; },
+   entries: Array .prototype .entries,
    every: Array .prototype .every,
    fill: Array .prototype .fill,
    filter: Array .prototype .filter,
    find: Array .prototype .find,
    findIndex: Array .prototype .findIndex,
+   findLast: Array .prototype .findLast,
+   findLastIndex: Array .prototype .findLastIndex,
+   flat: Array .prototype .flat,
+   flatMap: Array .prototype .flatMap,
    forEach: Array .prototype .forEach,
    includes: Array .prototype .includes,
    indexOf: Array .prototype .indexOf,
    join: Array .prototype .join,
-   keys: function () { return Array (this .length) .keys (); },
+   keys: Array .prototype .keys,
    lastIndexOf: Array .prototype .lastIndexOf,
    map: Array .prototype .map,
    reduce: Array .prototype .reduce,
    reduceRight: Array .prototype .reduceRight,
    slice: Array .prototype .slice,
    some: Array .prototype .some,
-   values: function () { return this [Symbol .iterator]; },
+   values: Array .prototype .values,
    toString: function (scene)
    {
       const stream = { string: "" };

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

@@ -25,31 +25,28 @@
 
 import XMLParser    from "../Parser/XMLParser.js"
 import X3DConstants from "../Base/X3DConstants.js";
-import SFNodeCache  from "../Fields/SFNodeCache.js";
 
 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 +59,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 +97,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 +110,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 +134,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 +152,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 +252,8 @@ class DOMIntegration
 			return;
 
 		node ._loadState .addInterest ("appendInlineChildElement", this, element);
+
+		this .appendInlineChildElement (element);
 	}
 
 	appendInlineChildElement (element)
@@ -309,12 +288,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: node .valueOf () },
+				});
+
+				element .dispatchEvent (event);
+				break;
+			}
+			case X3DConstants .FAILED_STATE:
+			{
+				const event = new CustomEvent ("error",
+				{
+					detail: { node: node .valueOf () },
+				});
+
+				element .dispatchEvent (event);
+				break;
+			}
+		}
 	}
 
 	addEventDispatchersAll (element)
@@ -356,9 +359,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: node .valueOf (),
 				value: field .valueOf (),
 			},
 		});

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.3.0";
+export default "8.3.2";

package/src/x_ite/Browser/X3DBrowser.js

@@ -333,7 +333,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);

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")

package/src/x_ite/Components/Core/X3DPrototypeInstance.js

@@ -291,7 +291,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
    },
    getInnerNode: function ()
    {
-      const rootNodes = this [_body] .getRootNodes () .getValue ();
+      const rootNodes = this [_body] .getRootNodes ();
 
       if (rootNodes .length)
       {

package/src/x_ite/Components/Networking/Inline.js

@@ -135,18 +135,28 @@ Inline .prototype = Object .assign (Object .create (X3DChildNode .prototype),
    },
    unLoadNow: function ()
    {
+      this .abortLoading ();
       this .setInternalScene (this .getBrowser () .getDefaultScene ());
    },
    loadNow: function ()
    {
-      new FileLoader (this) .createX3DFromURL (this ._url, null, this .setInternalSceneAsync .bind (this));
+      this .abortLoading ();
+      this .fileLoader = new FileLoader (this) .createX3DFromURL (this ._url, null, this .setInternalSceneAsync .bind (this));
+   },
+   abortLoading: function ()
+   {
+      this .scene ._loadCount .removeInterest ("checkLoadCount", this);
+
+      if (this .fileLoader)
+         this .fileLoader .abort ();
    },
    setInternalSceneAsync: function (scene)
    {
       if (scene)
       {
+         scene ._loadCount .addInterest ("checkLoadCount", this);
          this .setInternalScene (scene);
-         this .setLoadState (X3DConstants .COMPLETE_STATE);
+         this .checkLoadCount (scene ._loadCount);
       }
       else
       {
@@ -154,6 +164,15 @@ Inline .prototype = Object .assign (Object .create (X3DChildNode .prototype),
          this .setLoadState (X3DConstants .FAILED_STATE);
       }
    },
+   checkLoadCount: function (loadCount)
+   {
+      if (loadCount .getValue ())
+         return;
+
+      loadCount .removeInterest ("checkLoadCount", this);
+
+      this .setLoadState (X3DConstants .COMPLETE_STATE);
+   },
    setInternalScene: function (scene)
    {
       this .scene .setLive (false);

package/src/x_ite/Configuration/SupportedNodes.js

@@ -68,12 +68,8 @@ const SupportedNodes =
 
       // HTML Support
 
-      for (const fieldDefinition of Type .prototype [_fieldDefinitions])
+      for (const { name, accessType } of Type .prototype [_fieldDefinitions])
       {
-         const
-            name       = fieldDefinition .name,
-            accessType = fieldDefinition .accessType;
-
          if (accessType & X3DConstants .initializeOnly)
             HTMLSupport .addFieldName (name)
       }

package/src/x_ite/Execution/X3DScene.js

@@ -374,7 +374,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       stream .string += " ";
       stream .string += this .getBrowser () .name;
       stream .string += " ";
-      stream .string += "v";
+      stream .string += "V";
       stream .string += this .getBrowser () .version;
       stream .string += "\n";
       stream .string += "\n";
@@ -472,7 +472,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       stream .string += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
       stream .string += "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D ";
       stream .string += LATEST_VERSION;
-      stream .string += "//EN\" \"https://www.web3d.org/specifications/x3d-";
+      stream .string += "//EN\" \"http://www.web3d.org/specifications/x3d-";
       stream .string += LATEST_VERSION;
       stream .string += ".dtd\">\n";
 
@@ -486,92 +486,108 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       stream .string += LATEST_VERSION;
       stream .string += "'";
       stream .string += " ";
-      stream .string += "xmlns:xsd='https://www.w3.org/2001/XMLSchema-instance'";
+      stream .string += "xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance'";
       stream .string += " ";
-      stream .string += "xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-";
+      stream .string += "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-";
       stream .string += LATEST_VERSION;
       stream .string += ".xsd'>\n";
 
       generator .IncIndent ();
 
-      stream .string += generator .Indent ();
-      stream .string += "<head>\n";
+      if (this .getComponents () .length ||
+          this .getUnits () .some (unit => unit .conversionFactor !== 1) ||
+          this .getMetaDatas () .size)
+      {
+         stream .string += generator .Indent ();
+         stream .string += "<head>\n";
 
-      generator .IncIndent ();
+         generator .IncIndent ();
 
-      // <head>
+         // <head>
 
-      this .getComponents () .toXMLStream (stream);
+         this .getComponents () .toXMLStream (stream);
 
-      for (const unit of this .getUnits ())
-      {
-         if (unit .conversionFactor !== 1)
+         for (const unit of this .getUnits ())
          {
-            unit .toXMLStream (stream);
+            if (unit .conversionFactor !== 1)
+            {
+               unit .toXMLStream (stream);
 
-            stream .string += "\n";
+               stream .string += "\n";
+            }
          }
+
+         this .getMetaDatas () .forEach (function (value, key)
+         {
+            stream .string += generator .Indent ();
+            stream .string += "<meta";
+            stream .string += " ";
+            stream .string += "name='";
+            stream .string += generator .XMLEncode (key);
+            stream .string += "'";
+            stream .string += " ";
+            stream .string += "content='";
+            stream .string += generator .XMLEncode (value);
+            stream .string += "'";
+            stream .string += "/>\n";
+         });
+
+         // </head>
+
+         generator .DecIndent ();
+
+         stream .string += generator .Indent ();
+         stream .string += "</head>\n";
       }
 
-      this .getMetaDatas () .forEach (function (value, key)
+      if (this .getExternProtoDeclarations () .length ||
+          this .getProtoDeclarations () .length ||
+          this .getRootNodes () .length)
       {
          stream .string += generator .Indent ();
-         stream .string += "<meta";
-         stream .string += " ";
-         stream .string += "name='";
-         stream .string += generator .XMLEncode (key);
-         stream .string += "'";
-         stream .string += " ";
-         stream .string += "content='";
-         stream .string += generator .XMLEncode (value);
-         stream .string += "'";
-         stream .string += "/>\n";
-      });
-
-      // </head>
-
-      generator .DecIndent ();
+         stream .string += "<Scene>\n";
 
-      stream .string += generator .Indent ();
-      stream .string += "</head>\n";
-      stream .string += generator .Indent ();
-      stream .string += "<Scene>\n";
+         generator .IncIndent ();
 
-      generator .IncIndent ();
-
-      // <Scene>
+         // <Scene>
 
-      const exportedNodes = this .getExportedNodes ();
+         const exportedNodes = this .getExportedNodes ();
 
-      generator .PushExecutionContext (this);
-      generator .EnterScope ();
-      generator .ExportedNodes (exportedNodes);
+         generator .PushExecutionContext (this);
+         generator .EnterScope ();
+         generator .ExportedNodes (exportedNodes);
 
-      X3DExecutionContext .prototype .toXMLStream .call (this, stream);
+         X3DExecutionContext .prototype .toXMLStream .call (this, stream);
 
-      for (const exportedNode of exportedNodes)
-      {
-         try
+         for (const exportedNode of exportedNodes)
          {
-            exportedNode .toXMLStream (stream);
+            try
+            {
+               exportedNode .toXMLStream (stream);
 
-            stream .string += "\n";
-         }
-         catch (error)
-         {
-            console .error (error);
+               stream .string += "\n";
+            }
+            catch (error)
+            {
+               console .error (error);
+            }
          }
-      }
 
-      generator .LeaveScope ();
-      generator .PopExecutionContext ();
+         generator .LeaveScope ();
+         generator .PopExecutionContext ();
 
-      // </Scene>
+         // </Scene>
 
-      generator .DecIndent ();
+         generator .DecIndent ();
 
-      stream .string += generator .Indent ();
-      stream .string += "</Scene>\n";
+         stream .string += generator .Indent ();
+         stream .string += "</Scene>\n";
+      }
+      else
+      {
+         stream .string += generator .Indent ();
+         stream .string += "<Scene/>\n";
+      }
 
       generator .DecIndent ();
 

package/src/x_ite/Parser/JSONParser.js

@@ -54,7 +54,7 @@ function JSONParser (scene)
 {
    X3DParser .call (this, scene);
 
-   this .namespace = "https://www.web3d.org/specifications/x3d-namespace";
+   this .namespace = "http://www.web3d.org/specifications/x3d-namespace";
 }
 
 JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),