x_ite 8.3.2 → 8.4.0

package/src/x_ite/Configuration/SupportedProfiles.js

@@ -108,7 +108,7 @@ SupportedProfiles .addProfile ({
       SupportedComponents .get ("ParticleSystems"),
       SupportedComponents .get ("Picking"),
       SupportedComponents .get ("PointingDeviceSensor"),
-      SupportedComponents .get ("ProjectiveTextureMapping"),
+      SupportedComponents .get ("TextureProjector"),
       SupportedComponents .get ("Rendering"),
       SupportedComponents .get ("RigidBodyPhysics"),
       SupportedComponents .get ("Scripting"),

package/src/x_ite/Configuration/UnitInfo.js

@@ -46,7 +46,6 @@
  ******************************************************************************/
 
 import X3DObject from "../Base/X3DObject.js";
-import Generator from "../InputOutput/Generator.js";
 
 function UnitInfo (category, name, conversionFactor)
 {
@@ -66,35 +65,79 @@ UnitInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
    {
       return "UnitInfo";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      stream .string += "UNIT";
-      stream .string += " ";
-      stream .string += this .category;
-      stream .string += " ";
-      stream .string += this .name;
-      stream .string += " ";
-      stream .string += this .conversionFactor;
+      generator .string += "UNIT";
+      generator .string += generator .Space ();
+      generator .string += this .category;
+      generator .string += generator .Space ();
+      generator .string += this .name;
+      generator .string += generator .Space ();
+      generator .string += this .conversionFactor;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
+      generator .string += generator .Indent ();
+      generator .string += "<unit";
+      generator .string += generator .Space ();
+      generator .string += "category='";
+      generator .string += this .category;
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "name='";
+      generator .string += generator .XMLEncode (this .name);
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "conversionFactor='";
+      generator .string += this .conversionFactor;
+      generator .string += "'";
+      generator .string += "/>";
+   },
+   toJSONStream: function (generator, _throw)
+   {
+      if (this .conversionFactor === 1)
+         throw new Error ("conversionFactor is 1");
+
+      generator .string += generator .Indent ();
+
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@category";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += this .category;
+      generator .string += '"';
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@name";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONEncode (this .name);
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@conversionFactor";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .DoublePrecision (this .conversionFactor);
+      generator .string += generator .TidyBreak ();
 
-      stream .string += generator .Indent ();
-      stream .string += "<unit";
-      stream .string += " ";
-      stream .string += "category='";
-      stream .string += this .category;
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "name='";
-      stream .string += generator .XMLEncode (this .name);
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "conversionFactor='";
-      stream .string += this .conversionFactor;
-      stream .string += "'";
-      stream .string += "/>";
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
    },
 });
 

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -59,7 +59,6 @@ import RouteArray                  from "../Routing/RouteArray.js";
 import X3DRoute                    from "../Routing/X3DRoute.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";
 import Algorithm                   from "../../standard/Math/Algorithm.js";
 
@@ -79,9 +78,14 @@ function X3DExecutionContext (executionContext)
 
    this .addType (X3DConstants .X3DExecutionContext)
 
-   this .addChildObjects ("rootNodes",          new Fields .MFNode (),
-                        "worldInfos",         new Fields .MFNode (),
-                        "sceneGraph_changed", new Fields .SFTime ());
+   this .addChildObjects ("rootNodes",             new Fields .MFNode (),
+                          "worldInfos",            new Fields .MFNode (),
+                          "sceneGraph_changed",    new Fields .SFTime (),
+                          "namedNodes_changed",    new Fields .SFTime (),
+                          "importedNodes_changed", new Fields .SFTime (),
+                          "protos_changed",        new Fields .SFTime (),
+                          "externprotos_changed",  new Fields .SFTime (),
+                          "routes_changed",        new Fields .SFTime ())
 
    this ._rootNodes .setAccessType (X3DConstants .initializeOnly);
    this ._rootNodes .addCloneCount (1);
@@ -91,13 +95,6 @@ function X3DExecutionContext (executionContext)
    this [_protos]         = new ProtoDeclarationArray ();
    this [_externprotos]   = new ExternProtoDeclarationArray ();
    this [_routes]         = new RouteArray ();
-
-   this .addChildObjects ("namedNodes_changed",    new Fields .SFTime (),
-                        "importedNodes_changed", new Fields .SFTime (),
-                        "protos_changed",        new Fields .SFTime (),
-                        "externprotos_changed",  new Fields .SFTime (),
-                        "routes_changed",        new Fields .SFTime ())
-
 }
 
 X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -327,8 +324,6 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       this [_importedNodes] .add (importedName, importedNode);
 
-      importedNode .setup ();
-
       this ._importedNodes_changed = this .getBrowser () .getCurrentTime ();
    },
    removeImportedNode: function (importedName)
@@ -761,21 +756,19 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
             this ._worldInfos .splice (i, 1);
       }
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       generator .PushExecutionContext (this);
       generator .EnterScope ();
       generator .ImportedNodes (this .getImportedNodes ());
 
       // Output extern protos
 
-      this .getExternProtoDeclarations () .toVRMLStream (stream);
+      this .getExternProtoDeclarations () .toVRMLStream (generator);
 
       // Output protos
 
-      this .getProtoDeclarations () .toVRMLStream (stream);
+      this .getProtoDeclarations () .toVRMLStream (generator);
 
       // Output root nodes
 
@@ -785,38 +778,28 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
       {
          const rootNode = rootNodes [i];
 
-         stream .string += generator .Indent ();
+         generator .string += generator .Indent ();
 
          if (rootNode)
-            rootNode .toVRMLStream (stream);
+            rootNode .toVRMLStream (generator);
          else
-            stream .string += "NULL";
+            generator .string += "NULL";
 
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
 
          if (i !== length - 1)
-            stream .string += "\n";
+            generator .string += generator .TidyBreak ();
       }
 
       // Output imported nodes
 
       const importedNodes = this .getImportedNodes ();
 
-      if (importedNodes .size)
+      if (importedNodes .length)
       {
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
 
-         importedNodes .forEach (function (importedNode)
-         {
-            try
-            {
-               importedNode .toVRMLStream (stream);
-
-               stream .string += "\n";
-            }
-            catch (error)
-            { }
-         });
+         importedNodes .toVRMLStream (generator);
       }
 
       // Output routes
@@ -825,29 +808,27 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       if (routes .length)
       {
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
 
-         routes .toVRMLStream (stream);
+         routes .toVRMLStream (generator);
       }
 
       generator .LeaveScope ();
       generator .PopExecutionContext ();
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       generator .PushExecutionContext (this);
       generator .EnterScope ();
       generator .ImportedNodes (this .getImportedNodes ());
 
       // Output extern protos
 
-      this .getExternProtoDeclarations () .toXMLStream (stream);
+      this .getExternProtoDeclarations () .toXMLStream (generator);
 
       // Output protos
 
-      this .getProtoDeclarations () .toXMLStream (stream);
+      this .getProtoDeclarations () .toXMLStream (generator);
 
       // Output root nodes
 
@@ -855,30 +836,72 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       if (rootNodes .length)
       {
-         rootNodes .toXMLStream (stream);
+         rootNodes .toXMLStream (generator);
 
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
       }
 
       // Output imported nodes
 
-      const importedNodes = this .getImportedNodes ();
+      this .getImportedNodes () .toXMLStream (generator);
+
+      // Output routes
+
+      this .getRoutes () .toXMLStream (generator);
+
+      generator .LeaveScope ();
+      generator .PopExecutionContext ();
+   },
+   toJSONStream: function (generator)
+   {
+      generator .PushExecutionContext (this);
+      generator .EnterScope ();
+      generator .ImportedNodes (this .getImportedNodes ());
+
 
-      importedNodes .forEach (function (importedNode)
+      // Extern proto declarations
+
+      this .getExternProtoDeclarations () .toJSONStream (generator, true);
+
+
+      // Proto declarations
+
+      this .getProtoDeclarations () .toJSONStream (generator, true);
+
+
+      // Root nodes
+
+      if (this .getRootNodes () .length)
       {
-         try
+         for (const rootNode of this .getRootNodes ())
          {
-            importedNode .toXMLStream (stream);
+            generator .string += generator .Indent ();
 
-            stream .string += "\n";
+            if (rootNode)
+            {
+               rootNode .toJSONStream (generator);
+            }
+            else
+            {
+               generator .string += generator .Indent ();
+               generator .string += "null";
+            }
+
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
          }
-         catch (error)
-         { }
-      });
+      }
 
-      // Output routes
 
-      this .getRoutes () .toXMLStream (stream);
+      // Imported nodes
+
+      this .getImportedNodes () .toJSONStream (generator, true);
+
+
+      // Routes
+
+      this .getRoutes () .toJSONStream (generator, true);
+
 
       generator .LeaveScope ();
       generator .PopExecutionContext ();

package/src/x_ite/Execution/X3DExportedNode.js

@@ -47,7 +47,6 @@
 
 import X3DObject   from "../Base/X3DObject.js";
 import SFNodeCache from "../Fields/SFNodeCache.js";
-import Generator   from "../InputOutput/Generator.js";
 
 const
    _exportedName = Symbol (),
@@ -72,47 +71,95 @@ X3DExportedNode .prototype = Object .assign (Object .create (X3DObject .prototyp
    {
       return this [_localNode];
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const
-         generator = Generator .Get (stream),
-         localName = generator .LocalName (this [_localNode]);
+      const localName = generator .LocalName (this [_localNode]);
 
-      stream .string += generator .Indent ();
-      stream .string += "EXPORT";
-      stream .string += " ";
-      stream .string += localName;
+      generator .string += generator .Indent ();
+      generator .string += "EXPORT";
+      generator .string += generator .Space ();
+      generator .string += localName;
 
       if (this [_exportedName] !== localName)
       {
-         stream .string += " ";
-         stream .string += "AS";
-         stream .string += " ";
-         stream .string += this [_exportedName];
+         generator .string += generator .Space ();
+         generator .string += "AS";
+         generator .string += generator .Space ();
+         generator .string += this [_exportedName];
       }
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const
-         generator = Generator .Get (stream),
-         localName = generator .LocalName (this [_localNode]);
+      const localName = generator .LocalName (this [_localNode]);
 
-      stream .string += generator .Indent ();
-      stream .string += "<EXPORT";
-      stream .string += " ";
-      stream .string += "localDEF='";
-      stream .string += generator .XMLEncode (localName);
-      stream .string += "'";
+      generator .string += generator .Indent ();
+      generator .string += "<EXPORT";
+      generator .string += generator .Space ();
+      generator .string += "localDEF='";
+      generator .string += generator .XMLEncode (localName);
+      generator .string += "'";
 
       if (this [_exportedName] !== localName)
       {
-         stream .string += " ";
-         stream .string += "AS='";
-         stream .string += generator .XMLEncode (this [_exportedName]);
-         stream .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "AS='";
+         generator .string += generator .XMLEncode (this [_exportedName]);
+         generator .string += "'";
       }
 
-      stream .string += "/>";
+      generator .string += "/>";
+   },
+   toJSONStream: function (generator)
+   {
+      const localName = generator .LocalName (this [_localNode]);
+
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += "EXPORT";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@localDEF";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONEncode (localName);
+
+      if (this [_exportedName] !== localName)
+      {
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "@AS";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += generator .JSONEncode (this [_exportedName]);
+         generator .string += generator .TidyBreak ();
+      }
+      else
+      {
+         generator .string += generator .TidyBreak ();
+      }
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
    },
 });