x_ite 8.7.8 → 8.7.9

package/src/x_ite/Components/Shaders.js

@@ -78,9 +78,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Shape.js

@@ -86,9 +86,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Sound.js

@@ -108,9 +108,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Texturing.js

@@ -90,9 +90,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components/Time.js

@@ -60,9 +60,9 @@ const AbstractTypes =
 };
 
 for (const typeName in Types)
-   SupportedNodes .addType (typeName, Types [typeName]);
+   SupportedNodes .addNodeType (typeName, Types [typeName]);
 
 for (const typeName in AbstractTypes)
-   SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   SupportedNodes .addAbstractNodeType (typeName, AbstractTypes [typeName]);
 
 export default undefined;

package/src/x_ite/Components.js

@@ -74,13 +74,13 @@ class Components
       if (types)
       {
          for (const [typeName, type] of Object .entries (types))
-            SupportedNodes .addType (typeName, type);
+            SupportedNodes .addNodeType (typeName, type);
       }
 
       if (abstractTypes)
       {
          for (const [typeName, type] of Object .entries (abstractTypes))
-            SupportedNodes .addAbstractType (typeName, type);
+            SupportedNodes .addAbstractNodeType (typeName, type);
       }
 
       if (browserContext)

package/src/x_ite/Configuration/NodeTypeArray.js

@@ -0,0 +1,68 @@
+/*******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011 - 2022.
+ *
+ * All rights reserved. Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * The copyright notice above does not evidence any actual of intended
+ * publication of such source code, and is an unpublished work by create3000.
+ * This material contains CONFIDENTIAL INFORMATION that is the property of
+ * create3000.
+ *
+ * No permission is granted to copy, distribute, or create derivative works from
+ * the contents of this software, in whole or in part, without the prior written
+ * permission of create3000.
+ *
+ * NON-MILITARY USE ONLY
+ *
+ * All create3000 software are effectively free software with a non-military use
+ * restriction. It is free. Well commented source is provided. You may reuse the
+ * source in any way you please with the exception anything that uses it must be
+ * marked to indicate is contains 'non-military use only' components.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2011 - 2022, Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * This file is part of the X_ITE Project.
+ *
+ * X_ITE is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License version 3 only, as published by the
+ * Free Software Foundation.
+ *
+ * X_ITE is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License version 3 for more
+ * details (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version 3
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DNode      from "../Components/Core/X3DNode.js";
+
+function NodeTypeArray (values)
+{
+   return X3DInfoArray .call (this, values, X3DNode);
+}
+
+NodeTypeArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),
+{
+   constructor: NodeTypeArray,
+   getTypeName: function ()
+   {
+      return "NodeTypeArray";
+   },
+});
+
+for (const key of Reflect .ownKeys (NodeTypeArray .prototype))
+   Object .defineProperty (NodeTypeArray .prototype, key, { enumerable: false });
+
+export default NodeTypeArray;

package/src/x_ite/Configuration/SupportedNodes.js

@@ -45,24 +45,25 @@
  *
  ******************************************************************************/
 
-import X3DConstants from "../Base/X3DConstants.js";
-import HTMLSupport  from "../Parser/HTMLSupport.js";
+import NodeTypeArray from "./NodeTypeArray.js";
+import X3DConstants  from "../Base/X3DConstants.js";
+import HTMLSupport   from "../Parser/HTMLSupport.js";
 
 const _fieldDefinitions = Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions");
 
 const
-   types         = new Map (),
-   abstractTypes = new Map ();
+   nodeTypes         = new NodeTypeArray (),
+   abstractNodeTypes = new NodeTypeArray ();
 
 let nodeType = X3DConstants .X3DBaseNode;
 
 const SupportedNodes =
 {
-   addType: function (typeName, Type)
+   addNodeType: function (typeName, Type)
    {
       X3DConstants [typeName] = ++ nodeType; // Start with 1, as X3DBaseNode is 0.
 
-      types .set (typeName, Type);
+      nodeTypes .add (typeName, Type);
 
       HTMLSupport .addNodeTypeName (typeName);
 
@@ -74,27 +75,19 @@ const SupportedNodes =
             HTMLSupport .addFieldName (name)
       }
    },
-   getType: function (typeName)
+   getNodeTypes ()
    {
-      return types .get (typeName);
+      return nodeTypes;
    },
-   getTypes ()
-   {
-      return Array .from (types .values ());
-   },
-   addAbstractType: function (typeName, Type)
+   addAbstractNodeType: function (typeName, Type)
    {
       X3DConstants [typeName] = ++ nodeType;
 
-      abstractTypes .set (typeName, Type);
-   },
-   getAbstractType: function (typeName)
-   {
-      return abstractTypes .get (typeName);
+      abstractNodeTypes .add (typeName, Type);
    },
-   getAbstractTypes ()
+   getAbstractNodeTypes ()
    {
-      return Array .from (abstractTypes .values ());
+      return abstractNodeTypes;
    },
 };
 

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -62,7 +62,7 @@ import X3DCast                     from "../Base/X3DCast.js";
 import X3DConstants                from "../Base/X3DConstants.js";
 import SFNodeCache                 from "../Fields/SFNodeCache.js";
 
-SupportedNodes .addAbstractType ("X3DExecutionContext", X3DExecutionContext);
+SupportedNodes .addAbstractNodeType ("X3DExecutionContext", X3DExecutionContext);
 
 const
    _namedNodes     = Symbol (),
@@ -218,15 +218,10 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       for (;;)
       {
-         const proto = executionContext .protos .get (name);
+         const protoNode = executionContext .protos .get (name) ?? executionContext .externprotos .get (name);
 
-         if (proto)
-            return proto .createInstance (this, setup);
-
-         const externproto = executionContext .externprotos .get (name);
-
-         if (externproto)
-            return externproto .createInstance (this, setup);
+         if (protoNode)
+            return protoNode .createInstance (this, setup);
 
          if (executionContext .isScene ())
             break;
@@ -241,10 +236,31 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    },
    addNamedNode: function (name, node)
    {
+      name = String (name);
+      node = X3DCast (X3DConstants .X3DNode, node, false);
+
+      if (!node)
+         throw new Error ("Couldn't add named node: node must be of type X3DNode.");
+
+      if (node .getExecutionContext () !== this)
+         throw new Error ("Couldn't add named node: node does not belong to this execution context.");
+
+      if (name .length === 0)
+         throw new Error ("Couldn't add named node: node name is empty.");
+
       if (this [_namedNodes] .has (name))
          throw new Error ("Couldn't add named node: node named '" + name + "' is already in use.");
 
-      this .updateNamedNode (name, node);
+      if (this [_namedNodes] .get (node .getName ()) ?.getValue () === node)
+         throw new Error ("Couldn't add named node: node named '" + node .getName () + "' is already added.");
+
+      // Add named node.
+
+      node .setName (name);
+
+      this [_namedNodes] .add (name, SFNodeCache .get (node));
+
+      this ._namedNodes_changed = this .getBrowser () .getCurrentTime ();
    },
    updateNamedNode: function (name, node)
    {
@@ -269,7 +285,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       node .setName (name);
 
-      this [_namedNodes] .add (name, node);
+      this [_namedNodes] .add (name, SFNodeCache .get (node));
 
       this ._namedNodes_changed = this .getBrowser () .getCurrentTime ();
    },
@@ -279,10 +295,10 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       const node = this [_namedNodes] .get (name);
 
-      if (!node)
+      if (!node || !node .getValue ())
          return;
 
-      node .setName ("");
+      node .getValue () .setName ("");
 
       this [_namedNodes] .remove (name);
 
@@ -295,7 +311,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       const node = this [_namedNodes] .get (name);
 
       if (node)
-         return SFNodeCache .get (node);
+         return node;
 
       throw new Error ("Named node '" + name + "' not found.");
    },
@@ -307,11 +323,8 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return getUniqueName (this [_namedNodes], name);
    },
-   addImportedNode: function (inlineNode, exportedName, importedName)
+   addImportedNode: function (inlineNode, exportedName, importedName = exportedName)
    {
-      if (importedName === undefined)
-         importedName = exportedName;
-
       exportedName = String (exportedName);
       importedName = String (importedName);
 
@@ -444,9 +457,15 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       if (!(proto instanceof X3DProtoDeclaration))
          throw new Error ("Couldn't add proto declaration: proto must be of type X3DProtoDeclaration.");
 
+      if (proto .getExecutionContext () !== this)
+         throw new Error ("Couldn't add proto declaration: proto does not belong to this execution context.");
+
       if (this [_protos] .get (name))
          throw new Error ("Couldn't add proto declaration: proto '" + name + "' already in use.");
 
+      if (this [_protos] .get (proto .getName ()) === proto)
+         throw new Error ("Couldn't add proto declaration: proto '" + proto .getName () + "' already added.");
+
       name = String (name);
 
       if (name .length === 0)
@@ -462,12 +481,15 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       name = String (name);
 
       if (!(proto instanceof X3DProtoDeclaration))
-         throw new Error ("Couldn't add proto declaration: proto must be of type X3DProtoDeclaration.");
+         throw new Error ("Couldn't update proto declaration: proto must be of type X3DProtoDeclaration.");
+
+      if (proto .getExecutionContext () !== this)
+         throw new Error ("Couldn't update proto declaration: proto does not belong to this execution context.");
 
       name = String (name);
 
       if (name .length === 0)
-         throw new Error ("Couldn't add proto declaration: proto name is empty.");
+         throw new Error ("Couldn't update proto declaration: proto name is empty.");
 
       this [_protos] .update (proto .getName (), name, proto);
       proto .setName (name);
@@ -508,9 +530,15 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       if (!(externproto instanceof X3DExternProtoDeclaration))
          throw new Error ("Couldn't add extern proto declaration: extern proto must be of type X3DExternProtoDeclaration.");
 
+      if (externproto .getExecutionContext () !== this)
+         throw new Error ("Couldn't add extern proto declaration: extern proto does not belong to this execution context.");
+
       if (this [_externprotos] .get (name))
          throw new Error ("Couldn't add extern proto declaration: extern proto '" + name + "' already in use.");
 
+      if (this [_externprotos] .get (externproto .getName ()) === externproto)
+         throw new Error ("Couldn't add extern proto declaration: extern proto '" + externproto .getName () + "' already added.");
+
       name = String (name);
 
       if (name .length === 0)
@@ -526,12 +554,15 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       name = String (name);
 
       if (!(externproto instanceof X3DExternProtoDeclaration))
-         throw new Error ("Couldn't add extern proto declaration: extern proto must be of type X3DExternProtoDeclaration.");
+         throw new Error ("Couldn't update extern proto declaration: extern proto must be of type X3DExternProtoDeclaration.");
+
+      if (externproto .getExecutionContext () !== this)
+         throw new Error ("Couldn't update extern proto declaration: extern proto does not belong to this execution context.");
 
       name = String (name);
 
       if (name .length === 0)
-         throw new Error ("Couldn't add extern proto declaration: extern proto name is empty.");
+         throw new Error ("Couldn't update extern proto declaration: extern proto name is empty.");
 
       this [_externprotos] .update (externproto .getName (), name, externproto);
       externproto .setName (name);
@@ -638,7 +669,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
          if (sourceField .getType () !== destinationField .getType ())
             throw new Error ("ROUTE types " + sourceField .getTypeName () + " and " + destinationField .getTypeName () + " do not match.");
 
-         const id = sourceField .getId () + "." + destinationField .getId ();
+         const id = X3DRoute .getId (sourceField, destinationField);
 
          let route = this [_routes] .get (id);
 
@@ -662,37 +693,26 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       // sourceNode, sourceField, destinationNode, destinationField
       if (arguments .length === 4)
-      {
-         route = this .getRoute .apply (this, arguments);
+         route = this .getRoute (... arguments);
 
-         if (!route)
-            return false;
-      }
+      if (!(route instanceof X3DRoute))
+         return;
 
-      if (this .deleteSimpleRoute (route))
-         this .deleteImportedRoute (route .sourceNode, route .destinationNode, route);
+      if (route .getExecutionContext () !== this)
+         return;
+
+      this .deleteSimpleRoute (route);
+      this .deleteImportedRoute (route .sourceNode, route .destinationNode, route);
    },
    deleteSimpleRoute: function (route)
    {
-      try
-      {
-         const
-            sourceField      = route .getSourceField (),
-            destinationField = route .getDestinationField (),
-            id               = sourceField .getId () + "." + destinationField .getId ();
+      const id = X3DRoute .getId (route .getSourceField (), route .getDestinationField ());
 
-         this [_routes] .remove (id);
-         route .disconnect ();
+      this [_routes] .remove (id);
 
-         this ._routes_changed = this .getBrowser () .getCurrentTime ();
+      route .disconnect ();
 
-         return true;
-      }
-      catch (error)
-      {
-         console .error (error);
-         return false;
-      }
+      this ._routes_changed = this .getBrowser () .getCurrentTime ();
    },
    deleteImportedRoute (sourceNode, destinationNode, route)
    {
@@ -754,9 +774,7 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       sourceField      = sourceNode      .getField (sourceField);
       destinationField = destinationNode .getField (destinationField);
 
-      const id = sourceField .getId () + "." + destinationField .getId ();
-
-      return this [_routes] .get (id);
+      return this [_routes] .get (X3DRoute .getId (sourceField, destinationField));
    },
    getRoutes: function ()
    {

package/src/x_ite/Execution/X3DScene.js

@@ -58,7 +58,7 @@ import X3DCast             from "../Base/X3DCast.js";
 import X3DConstants        from "../Base/X3DConstants.js";
 import SFNodeCache         from "../Fields/SFNodeCache.js";
 
-SupportedNodes .addAbstractType ("X3DScene", X3DScene);
+SupportedNodes .addAbstractNodeType ("X3DScene", X3DScene);
 
 const
    _browser              = Symbol .for ("X_ITE.X3DEventObject.browser"),

package/src/x_ite/Execution/X3DWorld.js

@@ -53,7 +53,7 @@ import Layer          from "../Components/Layering/Layer.js";
 import X3DCast        from "../Base/X3DCast.js";
 import X3DConstants   from "../Base/X3DConstants.js";
 
-SupportedNodes .addAbstractType ("X3DWorld", X3DWorld);
+SupportedNodes .addAbstractNodeType ("X3DWorld", X3DWorld);
 
 function X3DWorld (executionContext)
 {

package/src/x_ite/InputOutput/FileLoader.js

@@ -141,7 +141,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
          if (error)
             error (exception);
          else
-            throw error;
+            throw exception;
       }
    },
    setScene: function (scene, success, error)

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -54,7 +54,7 @@ import X3DProtoDeclarationNode from "./X3DProtoDeclarationNode.js";
 import X3DConstants            from "../Base/X3DConstants.js";
 import FileLoader              from "../InputOutput/FileLoader.js";
 
-SupportedNodes .addAbstractType ("X3DExternProtoDeclaration", X3DExternProtoDeclaration);
+SupportedNodes .addAbstractNodeType ("X3DExternProtoDeclaration", X3DExternProtoDeclaration);
 
 const
    _proto = Symbol (),

package/src/x_ite/Prototype/X3DProtoDeclaration.js

@@ -53,7 +53,7 @@ import X3DExecutionContext     from "../Execution/X3DExecutionContext.js";
 import X3DProtoDeclarationNode from "./X3DProtoDeclarationNode.js";
 import X3DConstants            from "../Base/X3DConstants.js";
 
-SupportedNodes .addAbstractType ("X3DProtoDeclaration", X3DProtoDeclaration);
+SupportedNodes .addAbstractNodeType ("X3DProtoDeclaration", X3DProtoDeclaration);
 
 const
    _body = Symbol ();

package/src/x_ite/Prototype/X3DProtoDeclarationNode.js

@@ -52,7 +52,7 @@ import X3DPrototypeInstance from "../Components/Core/X3DPrototypeInstance.js";
 import SFNodeCache          from "../Fields/SFNodeCache.js";
 import X3DConstants         from "../Base/X3DConstants.js";
 
-SupportedNodes .addAbstractType ("X3DProtoDeclarationNode", X3DProtoDeclarationNode);
+SupportedNodes .addAbstractNodeType ("X3DProtoDeclarationNode", X3DProtoDeclarationNode);
 
 function X3DProtoDeclarationNode (executionContext)
 {

package/src/x_ite/Routing/X3DRoute.js

@@ -297,4 +297,12 @@ Object .defineProperties (X3DRoute .prototype,
    },
 });
 
+Object .assign (X3DRoute,
+{
+   getId: function (sourceField, destinationField)
+   {
+      return sourceField .getId () + "." + destinationField .getId ();
+   },
+});
+
 export default X3DRoute;