x_ite 8.6.19 → 8.6.22

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

@@ -460,6 +460,13 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             generator .string += generator .Indent ();
             generator .string += "<";
             generator .string += this .getTypeName ();
+
+            if (generator .html && this .getTypeName () === "Script")
+            {
+               generator .string += generator .Space ();
+               generator .string += "type='model/x3d+xml'";
+            }
+
             generator .string += generator .Space ();
             generator .string += "USE='";
             generator .string += generator .XMLEncode (name);
@@ -478,7 +485,16 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                }
             }
 
-            generator .string += "/>";
+            if (generator .closingTags)
+            {
+               generator .string += "></";
+               generator .string += this .getTypeName ();
+               generator .string += ">";
+            }
+            else
+            {
+               generator .string += "/>";
+            }
 
             generator .LeaveScope ();
             return;
@@ -489,6 +505,12 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       generator .string += "<";
       generator .string += this .getTypeName ();
 
+      if (generator .html && this .getTypeName () === "Script")
+      {
+         generator .string += generator .Space ();
+         generator .string += "type='model/x3d+xml'";
+      }
+
       if (name .length)
       {
          generator .AddNode (this);
@@ -522,7 +544,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       let cdata = this .getSourceText ();
 
-      if (cdata && cdata .length === 0)
+      if (cdata ?.length === 0 || (generator .html && this .getTypeName () !== "Script"))
          cdata = null;
 
       generator .IncIndent ();
@@ -572,7 +594,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                      generator .string += field .getName ();
                      generator .string += "='";
 
-                     field .toXMLStream (generator);
+                     field .toXMLStream (generator, field === this .getSourceText ());
 
                      generator .string += "'";
                      break;
@@ -591,7 +613,16 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       if ((!this .canUserDefinedFields () || !userDefinedFields .length) && (!references .length || sharedNode) && !childNodes .length && !cdata)
       {
-         generator .string += "/>";
+         if (generator .closingTags)
+         {
+            generator .string += "></";
+            generator .string += this .getTypeName ();
+            generator .string += ">";
+         }
+         else
+         {
+            generator .string += "/>";
+         }
       }
       else
       {
@@ -640,7 +671,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
                   if (!field .isInitializable () || field .isDefaultValue ())
                   {
-                     generator .string += "/>";
+                     generator .string += generator .closingTags ? "></field>" : "/>";
                      generator .string += generator .TidyBreak ();
                   }
                   else
@@ -680,7 +711,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                            field .toXMLStream (generator);
 
                            generator .string += "'";
-                           generator .string += "/>";
+                           generator .string += generator .closingTags ? "></field>" : "/>";
                            generator .string += generator .TidyBreak ();
                            break;
                         }
@@ -692,7 +723,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                   if (generator .ExecutionContext ())
                      references .push (field);
 
-                  generator .string += "/>";
+                  generator .string += generator .closingTags ? "></field>" : "/>";
                   generator .string += generator .TidyBreak ();
                }
             }
@@ -722,7 +753,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                   generator .string += "protoField='";
                   generator .string += generator .XMLEncode (protoField .getName ());
                   generator .string += "'";
-                  generator .string += "/>";
+                  generator .string += generator .closingTags ? "></connect>" : "/>";
                   generator .string += generator .TidyBreak ();
                }
             }
@@ -750,7 +781,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             for (const value of cdata)
             {
                generator .string += "<![CDATA[";
-               generator .string += generator .escapeCDATA (value);
+               generator .string += value;
                generator .string += "]]>";
                generator .string += generator .TidyBreak ();
             }

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

@@ -405,7 +405,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                }
             }
 
-            generator .string += "/>";
+            generator .string += generator .closingTags ? "></ProtoInstance>" : "/>";
 
             generator .LeaveScope ();
             return;
@@ -446,7 +446,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       if (fields .length === 0)
       {
-         generator .string += "/>";
+         generator .string += generator .closingTags ? "></ProtoInstance>" : "/>";
       }
       else
       {
@@ -494,7 +494,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
                      if (field .length === 0)
                      {
-                        generator .string += "/>";
+                        generator .string += generator .closingTags ? "></fieldValue>" : "/>";
                         generator .string += generator .TidyBreak ();
                      }
                      else
@@ -568,7 +568,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                      field .toXMLStream (generator);
 
                      generator .string += "'";
-                     generator .string += "/>";
+                     generator .string += generator .closingTags ? "></fieldValue>" : "/>";
                      generator .string += generator .TidyBreak ();
                      break;
                   }
@@ -604,7 +604,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                   generator .string += "protoField='";
                   generator .string += generator .XMLEncode (protoField .getName ());
                   generator .string += "'";
-                  generator .string += "/>";
+                  generator .string += generator .closingTags ? "></connect>" : "/>";
                   generator .string += generator .TidyBreak ();
                }
             }

package/src/x_ite/Configuration/ComponentInfo.js

@@ -68,6 +68,7 @@ ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype)
    },
    toVRMLStream: function (generator)
    {
+      generator .string += generator .Indent ();
       generator .string += "COMPONENT";
       generator .string += generator .Space ();
       generator .string += this .name;
@@ -88,7 +89,7 @@ ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype)
       generator .string += "level='";
       generator .string += this .level;
       generator .string += "'";
-      generator .string += "/>";
+      generator .string += generator .closingTags ? "></component>" : "/>";
    },
    toJSONStream: function (generator)
    {

package/src/x_ite/Configuration/ProfileInfo.js

@@ -64,6 +64,7 @@ ProfileInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
    },
    toVRMLStream: function (generator)
    {
+      generator .string += generator .Indent ();
       generator .string += "PROFILE";
       generator .string += generator .Space ();
       generator .string += this .name;

package/src/x_ite/Configuration/UnitInfo.js

@@ -51,7 +51,6 @@ function UnitInfo (category, name, conversionFactor)
 {
    Object .defineProperty (this, "category", {
        value: category,
-       writable: false,
    });
 
    this .name             = name;
@@ -67,6 +66,7 @@ UnitInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
    },
    toVRMLStream: function (generator)
    {
+      generator .string += generator .Indent ();
       generator .string += "UNIT";
       generator .string += generator .Space ();
       generator .string += this .category;
@@ -91,7 +91,7 @@ UnitInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += "conversionFactor='";
       generator .string += this .conversionFactor;
       generator .string += "'";
-      generator .string += "/>";
+      generator .string += generator .closingTags ? "></unit>" : "/>";
    },
    toJSONStream: function (generator, _throw)
    {
@@ -134,7 +134,7 @@ UnitInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += '"';
       generator .string += ':';
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (this .conversionFactor);
+      generator .string += this .conversionFactor;
       generator .string += generator .TidyBreak ();
 
       generator .string += generator .DecIndent ();
@@ -149,8 +149,6 @@ for (const key of Reflect .ownKeys (UnitInfo .prototype))
 Object .defineProperty (UnitInfo .prototype, "conversion_factor",
 {
    get: function () { return this .conversionFactor; },
-   enumerable: false,
-   configurable: false
 });
 
 export default UnitInfo;

package/src/x_ite/Execution/BindableList.js

@@ -52,10 +52,11 @@ function BindableList (executionContext, defaultNode)
 {
    X3DBaseNode .call (this, executionContext);
 
-   this .collected    = [ defaultNode ];
-   this .array        = [ defaultNode ];
-   this .updateTime   = 0;
-   this .removedNodes = [ ];
+   this .updateTime     = 0;
+   this .nodes          = [ defaultNode ];
+   this .collectedNodes = [ defaultNode ];
+   this .changedNodes   = [ ];
+   this .removedNodes   = [ ];
 }
 
 BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -67,14 +68,14 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
    },
    get: function ()
    {
-      return this .array;
+      return this .nodes;
    },
    getBound: function (name)
    {
-      const length = this .array .length;
+      const length = this .nodes .length;
 
       if (length === 1)
-         return this .array [0]; // Return default viewpoint.
+         return this .nodes [0]; // Return default viewpoint.
 
       const enableInlineBindables = false;
 
@@ -85,7 +86,7 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
          for (let i = 1; i < length; ++ i)
          {
             const
-               node  = this .array [i],
+               node  = this .nodes [i],
                scene = node .getExecutionContext () .getOuterNode () ?.getScene () ?? node .getScene ();
 
             if (!enableInlineBindables && !scene .isMainScene ())
@@ -101,7 +102,7 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
       for (let i = 1; i < length; ++ i)
       {
          const
-            node  = this .array [i],
+            node  = this .nodes [i],
             scene = node .getExecutionContext () .getOuterNode () ?.getScene () ?? node .getScene ();
 
          if (!enableInlineBindables && !scene .isMainScene ())
@@ -116,7 +117,7 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
       for (let i = 1; i < length; ++ i)
       {
          const
-            node  = this .array [i],
+            node  = this .nodes [i],
             scene = node .getExecutionContext () .getOuterNode () ?.getScene () ?? node .getScene ();
 
          if (!enableInlineBindables && !scene .isMainScene ())
@@ -125,46 +126,52 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
          return node;
       }
 
-      return this .array [0]; // Return default viewpoint.
+      return this .nodes [0]; // Return default viewpoint.
    },
    push: function (node)
    {
-      return this .collected .push (node);
+      return this .collectedNodes .push (node);
    },
    update: function (layerNode, stack)
    {
       const
-         changedNodes = this .collected .filter (node => node ._set_bind .getModificationTime () > this .updateTime),
-         removedNodes = this .removedNodes;
+         collectedNodes = this .collectedNodes,
+         changedNodes   = this .changedNodes,
+         removedNodes   = this .removedNodes;
 
-      if (! equals (this .collected, this .array))
+      for (const node of collectedNodes)
       {
-         // Unbind nodes not in current list (collected);
+         if (node ._set_bind .getModificationTime () > this .updateTime)
+            changedNodes .push (node);
+      }
+
+      if (!equals (collectedNodes, this .nodes))
+      {
+         // Unbind nodes not in current list (collectedNodes);
 
-         for (const node of this .array)
+         for (const node of this .nodes)
          {
-            if (this .collected .indexOf (node) === -1)
-            {
+            if (collectedNodes .indexOf (node) === -1)
                removedNodes .push (node);
-            }
          }
 
-         // Swap arrays.
+         // Swap nodes.
 
-         const tmp = this .array;
+         const tmp = this .nodes;
 
-         this .array     = this .collected;
-         this .collected = tmp;
+         this .nodes          = collectedNodes;
+         this .collectedNodes = tmp;
       }
 
-      // Clear collected array.
+      // Clear collected nodes.
 
-      this .collected .length = 1;
+      this .collectedNodes .length = 1;
 
       // Update stack.
 
       stack .update (layerNode, removedNodes, changedNodes)
 
+      changedNodes .length = 0;
       removedNodes .length = 0;
 
       // Advance updateTime time.
@@ -176,7 +183,7 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
 for (const key of Reflect .ownKeys (BindableList .prototype))
    Object .defineProperty (BindableList .prototype, key, { enumerable: false });
 
-// Compares two arrays.
+// Compares two nodess.
 
 function equals (lhs, rhs)
 {

package/src/x_ite/Execution/BindableStack.js

@@ -51,7 +51,7 @@ function BindableStack (executionContext, defaultNode)
 {
    X3DBaseNode .call (this, executionContext);
 
-   this .array = [ defaultNode ];
+   this .nodes = [ defaultNode ];
 }
 
 BindableStack .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -63,18 +63,18 @@ BindableStack .prototype = Object .assign (Object .create (X3DBaseNode .prototyp
    },
    get: function ()
    {
-      return this .array;
+      return this .nodes;
    },
    top: function ()
    {
-      return this .array .at (-1);
+      return this .nodes .at (-1);
    },
    pushOnTop: function (node)
    {
-      if (node !== this .array [0])
+      if (node !== this .nodes [0])
       {
-         this .array .at (-1) ._isBound = false;
-         this .array .push (node);
+         this .nodes .at (-1) ._isBound = false;
+         this .nodes .push (node);
       }
 
       // Don't do set_bind.
@@ -92,25 +92,25 @@ BindableStack .prototype = Object .assign (Object .create (X3DBaseNode .prototyp
 
       const
          fromNode  = this .top (),
-         boundNode = this .array .at (-1);
+         boundNode = this .nodes .at (-1);
 
       // Remove invisible nodes and unbind them if needed.
 
       for (const removedNode of removedNodes)
       {
-         const index = this .array .indexOf (removedNode);
+         const index = this .nodes .indexOf (removedNode);
 
          if (index > 0)
-            this .array .splice (index, 1);
+            this .nodes .splice (index, 1);
       }
 
       // Unbind nodes with set_bind false and pop top node.
 
-      if (boundNode !== this .array [0])
+      if (boundNode !== this .nodes [0])
       {
          if (changedNodes .some (node => ! node ._set_bind .getValue () && node === boundNode))
          {
-            this .array .pop ();
+            this .nodes .pop ();
          }
       }
 
@@ -120,20 +120,18 @@ BindableStack .prototype = Object .assign (Object .create (X3DBaseNode .prototyp
       {
          if (bindNode ._set_bind .getValue ())
          {
-            const index = this .array .indexOf (bindNode);
+            const index = this .nodes .indexOf (bindNode);
 
             if (index > -1)
-            {
-               this .array .splice (index, 1);
-            }
+               this .nodes .splice (index, 1);
 
-            this .array .push (bindNode);
+            this .nodes .push (bindNode);
          }
       }
 
       // Bind top node if not bound.
 
-      const top = this .array .at (-1);
+      const top = this .nodes .at (-1);
 
       if (top !== boundNode)
       {

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -942,73 +942,63 @@ for (const key of Reflect .ownKeys (X3DExecutionContext .prototype))
 
 Object .defineProperty (X3DExecutionContext .prototype, "specificationVersion",
 {
-   get: function () { return this .getSpecificationVersion (); },
+   get: function () { return this .getSpecificationVersion () },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "encoding",
 {
-   get: function () { return this .getEncoding (); },
+   get: function () { return this .getEncoding () },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "profile",
 {
-   get: function () { return this .getProfile (); },
+   get: function () { return this .getProfile () },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "components",
 {
-   get: function () { return this .getComponents (); },
+   get: function () { return this .getComponents () },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "worldURL",
 {
-   get: function () { return this .getWorldURL (); },
+   get: function () { return this .getWorldURL () },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "units",
 {
-   get: function () { return this .getUnits (); },
+   get: function () { return this .getUnits () },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "rootNodes",
 {
-   get: function () { return this .getRootNodes (); },
-   set: function (value) { this .setRootNodes (value); },
+   get: X3DExecutionContext .prototype .getRootNodes,
+   set: function (value) { this .setRootNodes (value) },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "protos",
 {
-   get: function () { return this .getProtoDeclarations (); },
+   get: X3DExecutionContext .prototype .getProtoDeclarations,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "externprotos",
 {
-   get: function () { return this .getExternProtoDeclarations (); },
+   get: X3DExecutionContext .prototype .getExternProtoDeclarations,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "routes",
 {
-   get: function () { return this .getRoutes (); },
+   get: X3DExecutionContext .prototype .getRoutes,
    enumerable: true,
-   configurable: false
 });
 
 export default X3DExecutionContext;

package/src/x_ite/Execution/X3DExportedNode.js

@@ -107,7 +107,7 @@ X3DExportedNode .prototype = Object .assign (Object .create (X3DObject .prototyp
          generator .string += "'";
       }
 
-      generator .string += "/>";
+      generator .string += generator .closingTags ? "></EXPORT>" : "/>";
    },
    toJSONStream: function (generator)
    {
@@ -177,7 +177,6 @@ Object .defineProperty (X3DExportedNode .prototype, "exportedName",
       return SFNodeCache .get (this [_exportedName]);
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DExportedNode .prototype, "localNode",
@@ -187,7 +186,6 @@ Object .defineProperty (X3DExportedNode .prototype, "localNode",
       return SFNodeCache .get (this [_localNode]);
    },
    enumerable: true,
-   configurable: false
 });
 
 export default X3DExportedNode;

package/src/x_ite/Execution/X3DImportedNode.js

@@ -267,7 +267,7 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
             generator .string += "'";
          }
 
-         generator .string += "/>";
+         generator .string += generator .closingTags ? "></IMPORT>" : "/>";
 
          try
          {
@@ -316,7 +316,7 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                   generator .string += "toField='";
                   generator .string += generator .XMLEncode (destinationField);
                   generator .string += "'";
-                  generator .string += "/>";
+                  generator .string += generator .closingTags ? "></ROUTE>" : "/>";
                }
             }
          }
@@ -520,7 +520,6 @@ Object .defineProperty (X3DImportedNode .prototype, "inlineNode",
       return SFNodeCache .get (this [_inlineNode]);
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DImportedNode .prototype, "exportedName",
@@ -530,7 +529,6 @@ Object .defineProperty (X3DImportedNode .prototype, "exportedName",
       return this [_exportedName];
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DImportedNode .prototype, "exportedNode",
@@ -540,7 +538,6 @@ Object .defineProperty (X3DImportedNode .prototype, "exportedNode",
       return this [_inlineNode] .getInternalScene () .getExportedNode (this [_exportedName]);
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DImportedNode .prototype, "importedName",
@@ -550,7 +547,6 @@ Object .defineProperty (X3DImportedNode .prototype, "importedName",
       return this [_importedName];
    },
    enumerable: true,
-   configurable: false
 });
 
 export default X3DImportedNode;