x_ite 8.3.2 → 8.3.3

package/src/x_ite/Execution/X3DImportedNode.js

@@ -48,7 +48,6 @@
 import X3DNode      from "../Components/Core/X3DNode.js";
 import X3DConstants from "../Base/X3DConstants.js";
 import SFNodeCache  from "../Fields/SFNodeCache.js";
-import Generator    from "../InputOutput/Generator.js";
 
 const
    _inlineNode   = Symbol (),
@@ -68,6 +67,7 @@ function X3DImportedNode (executionContext, inlineNode, exportedName, importedNa
    this [_inlineNode] ._loadState .addInterest ("set_loadState__", this);
 }
 
+// Must be of type X3DNode, to get routes work.
 X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 {
    constructor: X3DImportedNode,
@@ -175,25 +175,23 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          }
       }
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       if (generator .ExistsNode (this .getInlineNode ()))
       {
-         stream .string += generator .Indent ();
-         stream .string += "IMPORT";
-         stream .string += " ";
-         stream .string += generator .Name (this .getInlineNode ());
-         stream .string += ".";
-         stream .string += this .getExportedName ();
+         generator .string += generator .Indent ();
+         generator .string += "IMPORT";
+         generator .string += generator .Space ();
+         generator .string += generator .Name (this .getInlineNode ());
+         generator .string += ".";
+         generator .string += this .getExportedName ();
 
          if (this .getImportedName () !== this .getExportedName ())
          {
-            stream .string += " ";
-            stream .string += "AS";
-            stream .string += " ";
-            stream .string += this .getImportedName ();
+            generator .string += generator .Space ();
+            generator .string += "AS";
+            generator .string += generator .Space ();
+            generator .string += this .getImportedName ();
          }
 
          try
@@ -223,20 +221,20 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                      ? destinationNode .getImportedName ()
                      : generator .Name (destinationNode);
 
-                  stream .string += "\n";
-                  stream .string += "\n";
-                  stream .string += generator .Indent ();
-                  stream .string += "ROUTE";
-                  stream .string += " ";
-                  stream .string += sourceNodeName;
-                  stream .string += ".";
-                  stream .string += sourceField;
-                  stream .string += " ";
-                  stream .string += "TO";
-                  stream .string += " ";
-                  stream .string += destinationNodeName;
-                  stream .string += ".";
-                  stream .string += destinationField;
+                  generator .string += generator .Break ();
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += "ROUTE";
+                  generator .string += generator .Space ();
+                  generator .string += sourceNodeName;
+                  generator .string += ".";
+                  generator .string += sourceField;
+                  generator .string += generator .Space ();
+                  generator .string += "TO";
+                  generator .string += generator .Space ();
+                  generator .string += destinationNodeName;
+                  generator .string += ".";
+                  generator .string += destinationField;
                }
             }
          }
@@ -244,32 +242,30 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
       else
          throw new Error ("X3DImportedNode.toXMLStream: Inline node does not exist.");
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       if (generator .ExistsNode (this .getInlineNode ()))
       {
-         stream .string += generator .Indent ();
-         stream .string += "<IMPORT";
-         stream .string += " ";
-         stream .string += "inlineDEF='";
-         stream .string += generator .XMLEncode (generator .Name (this .getInlineNode ()));
-         stream .string += "'";
-         stream .string += " ";
-         stream .string += "importedDEF='";
-         stream .string += generator .XMLEncode (this .getExportedName ());
-         stream .string += "'";
+         generator .string += generator .Indent ();
+         generator .string += "<IMPORT";
+         generator .string += generator .Space ();
+         generator .string += "inlineDEF='";
+         generator .string += generator .XMLEncode (generator .Name (this .getInlineNode ()));
+         generator .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "importedDEF='";
+         generator .string += generator .XMLEncode (this .getExportedName ());
+         generator .string += "'";
 
          if (this .getImportedName () !== this .getExportedName ())
          {
-            stream .string += " ";
-            stream .string += "AS='";
-            stream .string += generator .XMLEncode (this .getImportedName ());
-            stream .string += "'";
+            generator .string += generator .Space ();
+            generator .string += "AS='";
+            generator .string += generator .XMLEncode (this .getImportedName ());
+            generator .string += "'";
          }
 
-         stream .string += "/>";
+         generator .string += "/>";
 
          try
          {
@@ -298,27 +294,27 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                      ? destinationNode .getImportedName ()
                      : generator .Name (destinationNode);
 
-                  stream .string += "\n";
-                  stream .string += "\n";
-                  stream .string += generator .Indent ();
-                  stream .string += "<ROUTE";
-                  stream .string += " ";
-                  stream .string += "fromNode='";
-                  stream .string += generator .XMLEncode (sourceNodeName);
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "fromField='";
-                  stream .string += generator .XMLEncode (sourceField);
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "toNode='";
-                  stream .string += generator .XMLEncode (destinationNodeName);
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "toField='";
-                  stream .string += generator .XMLEncode (destinationField);
-                  stream .string += "'";
-                  stream .string += "/>";
+                  generator .string += generator .Break ();
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += "<ROUTE";
+                  generator .string += generator .Space ();
+                  generator .string += "fromNode='";
+                  generator .string += generator .XMLEncode (sourceNodeName);
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "fromField='";
+                  generator .string += generator .XMLEncode (sourceField);
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "toNode='";
+                  generator .string += generator .XMLEncode (destinationNodeName);
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "toField='";
+                  generator .string += generator .XMLEncode (destinationField);
+                  generator .string += "'";
+                  generator .string += "/>";
                }
             }
          }

package/src/x_ite/Execution/X3DScene.js

@@ -55,7 +55,6 @@ import X3DExportedNode     from "./X3DExportedNode.js";
 import ExportedNodesArray  from "./ExportedNodesArray.js";
 import X3DCast             from "../Base/X3DCast.js";
 import X3DConstants        from "../Base/X3DConstants.js";
-import Generator           from "../InputOutput/Generator.js";
 import SFNodeCache         from "../Fields/SFNodeCache.js";
 
 SupportedNodes .addAbstractType ("X3DScene", X3DScene);
@@ -78,6 +77,12 @@ function X3DScene (executionContext)
 
    this .addType (X3DConstants .X3DScene)
 
+   this .addChildObjects ("profile_changed",       new Fields .SFTime (),
+                          "components_changed",    new Fields .SFTime (),
+                          "units_changed",         new Fields .SFTime (),
+                          "metadata_changed",      new Fields .SFTime (),
+                          "exportedNodes_changed", new Fields .SFTime ())
+
    this [_specificationVersion] = LATEST_VERSION;
    this [_encoding]             = "SCRIPTED";
    this [_profile]              = null;
@@ -93,12 +98,6 @@ function X3DScene (executionContext)
    this [_metadata]      = new Map ();
    this [_exportedNodes] = new ExportedNodesArray ();
 
-   this .addChildObjects ("profile_changed",       new Fields .SFTime (),
-                          "components_changed",    new Fields .SFTime (),
-                          "units_changed",         new Fields .SFTime (),
-                          "metadata_changed",      new Fields .SFTime (),
-                          "exportedNodes_changed", new Fields .SFTime ())
-
    this .getRootNodes () .setAccessType (X3DConstants .inputOutput);
 
    this .setLive (false);
@@ -363,39 +362,37 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
       this .getRootNodes () .assign (value);
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += "#X3D V";
-      stream .string += LATEST_VERSION;
-      stream .string += " ";
-      stream .string += "utf8";
-      stream .string += " ";
-      stream .string += this .getBrowser () .name;
-      stream .string += " ";
-      stream .string += "V";
-      stream .string += this .getBrowser () .version;
-      stream .string += "\n";
-      stream .string += "\n";
+      generator .string += "#X3D V";
+      generator .string += LATEST_VERSION;
+      generator .string += generator .Space ();
+      generator .string += "utf8";
+      generator .string += generator .Space ();
+      generator .string += this .getBrowser () .name;
+      generator .string += generator .Space ();
+      generator .string += "V";
+      generator .string += this .getBrowser () .version;
+      generator .string += generator .ForceBreak ();
+      generator .string += generator .ForceBreak ();
 
       const profile = this .getProfile ();
 
       if (profile)
       {
-         profile .toVRMLStream (stream);
+         profile .toVRMLStream (generator);
 
-         stream .string += "\n";
-         stream .string += "\n";
+         generator .string += generator .Break ();
+         generator .string += generator .TidyBreak ();
       }
 
       const components = this .getComponents ();
 
       if (components .length)
       {
-         components .toVRMLStream (stream);
+         components .toVRMLStream (generator);
 
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
       }
 
       // Units
@@ -408,14 +405,14 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
             {
                empty = false;
 
-               unit .toVRMLStream (stream);
+               unit .toVRMLStream (generator);
 
-               stream .string += "\n";
+               generator .string += generator .Break ();
             }
          }
 
          if (!empty)
-            stream .string += "\n";
+            generator .string += generator .TidyBreak ();
       }
 
       const metadata = this .getMetaDatas ();
@@ -424,15 +421,15 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       {
          metadata .forEach (function (value, key)
          {
-            stream .string += "META";
-            stream .string += " ";
-            stream .string += new Fields .SFString (key) .toString ();
-            stream .string += " ";
-            stream .string += new Fields .SFString (value) .toString ();
-            stream .string += "\n";
+            generator .string += "META";
+            generator .string += generator .Space ();
+            generator .string += new Fields .SFString (key) .toString ();
+            generator .string += generator .Space ();
+            generator .string += new Fields .SFString (value) .toString ();
+            generator .string += generator .Break ();
          });
 
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
       }
 
       const exportedNodes = this .getExportedNodes ();
@@ -441,56 +438,45 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .EnterScope ();
       generator .ExportedNodes (exportedNodes);
 
-      X3DExecutionContext .prototype .toVRMLStream .call (this, stream);
+      X3DExecutionContext .prototype .toVRMLStream .call (this, generator);
 
-      if (exportedNodes .size)
+      if (exportedNodes .length)
       {
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
 
-         exportedNodes .forEach (function (exportedNode)
-         {
-            try
-            {
-               exportedNode .toVRMLStream (stream);
-
-               stream .string += "\n";
-            }
-            catch (error)
-            {
-               console .error (error);
-            }
-         });
+         exportedNodes .toVRMLStream (generator);
       }
 
       generator .LeaveScope ();
       generator .PopExecutionContext ();
    },
-   toXMLStream: function (stream)
-   {
-      const generator = Generator .Get (stream);
-
-      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\" \"http://www.web3d.org/specifications/x3d-";
-      stream .string += LATEST_VERSION;
-      stream .string += ".dtd\">\n";
-
-      stream .string += "<X3D";
-      stream .string += " ";
-      stream .string += "profile='";
-      stream .string += this .getProfile () ? this .getProfile () .name : "Full";
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "version='";
-      stream .string += LATEST_VERSION;
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance'";
-      stream .string += " ";
-      stream .string += "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-";
-      stream .string += LATEST_VERSION;
-      stream .string += ".xsd'>\n";
+   toXMLStream: function (generator)
+   {
+      generator .string += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+      generator .string += generator .TidyBreak ();
+      generator .string += "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D ";
+      generator .string += LATEST_VERSION;
+      generator .string += "//EN\" \"http://www.web3d.org/specifications/x3d-";
+      generator .string += LATEST_VERSION;
+      generator .string += ".dtd\">";
+      generator .string += generator .TidyBreak ();
+
+      generator .string += "<X3D";
+      generator .string += generator .Space ();
+      generator .string += "profile='";
+      generator .string += this .getProfile () ? this .getProfile () .name : "Full";
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "version='";
+      generator .string += LATEST_VERSION;
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance'";
+      generator .string += generator .Space ();
+      generator .string += "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-";
+      generator .string += LATEST_VERSION;
+      generator .string += ".xsd'>";
+      generator .string += generator .TidyBreak ();
 
       generator .IncIndent ();
 
@@ -498,54 +484,58 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
           this .getUnits () .some (unit => unit .conversionFactor !== 1) ||
           this .getMetaDatas () .size)
       {
-         stream .string += generator .Indent ();
-         stream .string += "<head>\n";
+         generator .string += generator .Indent ();
+         generator .string += "<head>";
+         generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
          // <head>
 
-         this .getComponents () .toXMLStream (stream);
+         this .getComponents () .toXMLStream (generator);
 
          for (const unit of this .getUnits ())
          {
             if (unit .conversionFactor !== 1)
             {
-               unit .toXMLStream (stream);
+               unit .toXMLStream (generator);
 
-               stream .string += "\n";
+               generator .string += generator .TidyBreak ();
             }
          }
 
          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";
+            generator .string += generator .Indent ();
+            generator .string += "<meta";
+            generator .string += generator .Space ();
+            generator .string += "name='";
+            generator .string += generator .XMLEncode (key);
+            generator .string += "'";
+            generator .string += generator .Space ();
+            generator .string += "content='";
+            generator .string += generator .XMLEncode (value);
+            generator .string += "'";
+            generator .string += "/>";
+            generator .string += generator .TidyBreak ();
          });
 
          // </head>
 
          generator .DecIndent ();
 
-         stream .string += generator .Indent ();
-         stream .string += "</head>\n";
+         generator .string += generator .Indent ();
+         generator .string += "</head>";
+         generator .string += generator .TidyBreak ();
       }
 
       if (this .getExternProtoDeclarations () .length ||
           this .getProtoDeclarations () .length ||
           this .getRootNodes () .length)
       {
-         stream .string += generator .Indent ();
-         stream .string += "<Scene>\n";
+         generator .string += generator .Indent ();
+         generator .string += "<Scene>";
+         generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
@@ -557,21 +547,9 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
          generator .EnterScope ();
          generator .ExportedNodes (exportedNodes);
 
-         X3DExecutionContext .prototype .toXMLStream .call (this, stream);
+         X3DExecutionContext .prototype .toXMLStream .call (this, generator);
 
-         for (const exportedNode of exportedNodes)
-         {
-            try
-            {
-               exportedNode .toXMLStream (stream);
-
-               stream .string += "\n";
-            }
-            catch (error)
-            {
-               console .error (error);
-            }
-         }
+         exportedNodes .toXMLStream (generator);
 
          generator .LeaveScope ();
          generator .PopExecutionContext ();
@@ -580,18 +558,21 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
          generator .DecIndent ();
 
-         stream .string += generator .Indent ();
-         stream .string += "</Scene>\n";
+         generator .string += generator .Indent ();
+         generator .string += "</Scene>";
+         generator .string += generator .TidyBreak ();
       }
       else
       {
-         stream .string += generator .Indent ();
-         stream .string += "<Scene/>\n";
+         generator .string += generator .Indent ();
+         generator .string += "<Scene/>";
+         generator .string += generator .TidyBreak ();
       }
 
       generator .DecIndent ();
 
-      stream .string += "</X3D>\n";
+      generator .string += "</X3D>";
+      generator .string += generator .TidyBreak ();
    },
 });