x_ite 8.7.2 → 8.7.4

package/src/x_ite/Parser/XMLParser.js

@@ -47,6 +47,7 @@
 
 import X3DField                  from "../Base/X3DField.js";
 import X3DBaseNode               from "../Base/X3DBaseNode.js";
+import X3DNode                   from "../Components/Core/X3DNode.js";
 import X3DPrototypeInstance      from "../Components/Core/X3DPrototypeInstance.js";
 import Fields                    from "../Fields.js";
 import X3DParser                 from "./X3DParser.js";
@@ -330,10 +331,10 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             componentSupportLevel = parseInt (xmlElement .getAttribute ("level"));
 
          if (componentNameIdCharacters === null)
-            return console .warn ("XML Parser Error: Bad component statement: Expected name attribute.");
+            return console .warn ("XML Parser Error: Bad component statement. Expected name attribute.");
 
          if (componentSupportLevel === null)
-            return console .warn ("XML Parser Error: Bad component statement: Expected level attribute.");
+            return console .warn ("XML Parser Error: Bad component statement. Expected level attribute.");
 
          var component = this .getBrowser () .getComponent (componentNameIdCharacters, componentSupportLevel);
 
@@ -352,13 +353,13 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          conversionFactor = xmlElement .getAttribute ("conversionFactor"); //works for html5 as well
 
       if (category === null)
-         return console .warn ("XML Parser Error: Bad unit statement: Expected category attribute.");
+         return console .warn ("XML Parser Error: Bad unit statement. Expected category attribute.");
 
       if (name === null)
-         return console .warn ("XML Parser Error: Bad unit statement: Expected name attribute.");
+         return console .warn ("XML Parser Error: Bad unit statement. Expected name attribute.");
 
       if (conversionFactor === null)
-         return console .warn ("XML Parser Error: Bad unit statement: Expected conversionFactor attribute.");
+         return console .warn ("XML Parser Error: Bad unit statement. Expected conversionFactor attribute.");
 
       this .getScene () .updateUnit (category, name, parseFloat (conversionFactor));
    },
@@ -369,10 +370,10 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          metavalue = xmlElement .getAttribute ("content");
 
       if (metakey === null)
-         return console .warn ("XML Parser Error: Bad meta statement: Expected name attribute.");
+         return console .warn ("XML Parser Error: Bad meta statement. Expected name attribute.");
 
       if (metavalue === null)
-         return console .warn ("XML Parser Error: Bad meta statement: Expected content attribute.");
+         return console .warn ("XML Parser Error: Bad meta statement. Expected content attribute.");
 
       this .getScene () .addMetaData (metakey, metavalue);
    },
@@ -449,19 +450,19 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
    },
    externProtoDeclareElement: function (xmlElement)
    {
-      var name = xmlElement .getAttribute ("name");
+      const name = xmlElement .getAttribute ("name");
 
       if (this .id (name))
       {
-         var url = xmlElement .getAttribute ("url");
+         const url = xmlElement .getAttribute ("url");
 
-         if (url === null)
-            return console .warn ("XML Parser Error: Bad ExternProtoDeclare statement: Expected url attribute.");
+         this .parser .setInput (url ?? "");
+         this .parser .sfstringValues (this .url);
 
-         this .parser .setInput (url);
-         VRMLParser .prototype .sfstringValues .call (this .parser, this .url);
+         if (!this .url .length)
+            console .warn ("XML Parser Error: Bad ExternProtoDeclare statement. Expected url attribute with value.");
 
-         var externproto = new X3DExternProtoDeclaration (this .getExecutionContext (), this .url);
+         const externproto = new X3DExternProtoDeclaration (this .getExecutionContext (), this .url);
 
          this .pushParent (externproto);
          this .protoInterfaceElement (xmlElement);
@@ -653,10 +654,10 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          protoFieldName = xmlElement .getAttribute ("protoField");
 
       if (nodeFieldName === null)
-         return console .warn ("XML Parser Error: Bad connect statement: Expected nodeField attribute.");
+         return console .warn ("XML Parser Error: Bad connect statement. Expected nodeField attribute.");
 
       if (protoFieldName === null)
-         return console .warn ("XML Parser Error: Bad connect statement: Expected protoField attribute.");
+         return console .warn ("XML Parser Error: Bad connect statement. Expected protoField attribute.");
 
       try
       {
@@ -667,7 +668,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             node  = this .getParent (),
             proto = this .getPrototype ();
 
-         if (! (node instanceof X3DBaseNode))
+         if (! (node instanceof X3DNode))
             return;
 
          var
@@ -686,7 +687,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       }
       catch (error)
       {
-         console .warn ("XML Parser Error: Couldn't create IS reference: " + error .message);
+         console .warn ("XML Parser Error: Couldn't create IS reference. " + error .message);
       }
    },
    protoInstanceElement: function (xmlElement)
@@ -764,7 +765,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       }
       catch (error)
       {
-         console .warn ("XML Parser Error: Couldn't assign field value: " + error .message);
+         console .warn ("XML Parser Error: Couldn't assign field value. " + error .message);
       }
    },
    nodeElement: function (xmlElement)
@@ -932,17 +933,10 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       if (this .getParents () .length === 0)
          return;
 
-      var node = this .getParent ();
-
-      if (node instanceof X3DBaseNode)
-      {
-         var field = node .getSourceText ();
+      const node = this .getParent ();
 
-         if (field)
-         {
-            field .push (xmlElement .data);
-         }
-      }
+      if (node instanceof X3DNode)
+         node .getSourceText () ?.push (xmlElement .data);
    },
    useAttribute: function (xmlElement)
    {

package/src/x_ite/Prototype/ExternProtoDeclarationArray.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DInfoArray              from "../Base/X3DInfoArray.js";
+import X3DExternProtoDeclaration from "./X3DExternProtoDeclaration.js"
 
 function ExternProtoDeclarationArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   return X3DInfoArray .call (this, values, X3DExternProtoDeclaration);
 }
 
 ExternProtoDeclarationArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Prototype/ProtoDeclarationArray.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DInfoArray        from "../Base/X3DInfoArray.js";
+import X3DProtoDeclaration from "./X3DProtoDeclaration.js"
 
-function ProtoDeclarationArray (array)
+function ProtoDeclarationArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   return X3DInfoArray .call (this, values, X3DProtoDeclaration);
 }
 
 ProtoDeclarationArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Routing/RouteArray.js

@@ -46,10 +46,11 @@
  ******************************************************************************/
 
 import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DRoute     from "./X3DRoute.js";
 
-function RouteArray ()
+function RouteArray (values)
 {
-   return X3DInfoArray .call (this);
+   return X3DInfoArray .call (this, values, X3DRoute);
 }
 
 RouteArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/X3D.js

@@ -163,7 +163,7 @@ Object .assign (X3D,
    })(),
    getBrowser: function (element)
    {
-      return $(element || "x3d-canvas, X3DCanvas") .data ("browser");
+      return $(element || "x3d-canvas, X3DCanvas") .prop ("browser");
    },
    createBrowser: function (url, parameter)
    {

package/src/x_ite/X3DCanvasElement.js

@@ -46,36 +46,13 @@
  ******************************************************************************/
 
 import X3DBrowser from "./Browser/X3DBrowser.js";
-import URLs       from "./Browser/Networking/URLs.js";
 
 class X3DCanvasElement extends HTMLElement
 {
-   static define ()
-   {
-      customElements .define ("x3d-canvas", X3DCanvasElement);
-   }
-
    constructor ()
    {
       super ();
 
-      const
-         shadow = this .attachShadow ({ mode: "open", delegatesFocus: true }),
-         link   = document .createElement ("link");
-
-      $(this) .data ("shadow", $(shadow));
-      $(this) .data ("loaded", new Promise (function (resolve, reject)
-      {
-         link .onload  = resolve;
-         link .onerror = reject;
-      }));
-
-      link .setAttribute ("rel", "stylesheet");
-      link .setAttribute ("type", "text/css");
-      link .setAttribute ("href", new URL ("x_ite.css", URLs .getScriptUrl ()) .href);
-
-      shadow .appendChild (link);
-
       new X3DBrowser (this)
    }
 
@@ -98,7 +75,6 @@ class X3DCanvasElement extends HTMLElement
          "debug",
          "multisampling",
          "notifications",
-         "onerror",
          "oninitialized",
          "onshutdown",
          "splashScreen",

package/src/x_ite.js

@@ -53,7 +53,7 @@ import shim             from "./shim.js";
 
 window [Symbol .for ("X_ITE.X3D")] = X3D;
 
-X3DCanvasElement .define ();
+customElements .define ("x3d-canvas", X3DCanvasElement);
 
 X3D ();