x_ite 8.3.2 → 8.3.3

package/src/x_ite/Components/Sound/X3DSoundSourceNode.js

@@ -45,7 +45,6 @@
  *
  ******************************************************************************/
 
-import Fields               from "../../Fields.js";
 import X3DChildNode         from "../Core/X3DChildNode.js";
 import X3DTimeDependentNode from "../Time/X3DTimeDependentNode.js";
 import X3DConstants         from "../../Base/X3DConstants.js";

package/src/x_ite/Components/{ProjectiveTextureMapping → TextureProjector}/TextureProjector.js

@@ -182,7 +182,7 @@ TextureProjector .prototype = Object .assign (Object .create (X3DTextureProjecto
    },
    getComponentName: function ()
    {
-      return "ProjectiveTextureMapping";
+      return "TextureProjector";
    },
    getContainerField: function ()
    {

package/src/x_ite/Components/{ProjectiveTextureMapping → TextureProjector}/TextureProjectorParallel.js

@@ -203,7 +203,7 @@ TextureProjectorParallel .prototype = Object .assign (Object .create (X3DTexture
    },
    getComponentName: function ()
    {
-      return "ProjectiveTextureMapping";
+      return "TextureProjector";
    },
    getContainerField: function ()
    {

package/src/x_ite/Components/Time/TimeSensor.js

@@ -197,6 +197,11 @@ TimeSensor .prototype = Object .assign (Object .create (X3DSensorNode .prototype
 
       this ._time = time;
    },
+   dispose: function ()
+   {
+      X3DTimeDependentNode .prototype .dispose .call (this);
+      X3DSensorNode        .prototype .dispose .call (this);
+   },
 });
 
 export default TimeSensor;

package/src/x_ite/Components/Time/X3DTimeDependentNode.js

@@ -342,6 +342,7 @@ X3DTimeDependentNode .prototype = Object .assign (Object .create (X3DChildNode .
    set_resume: function () { },
    set_stop: function () { },
    set_time: function () { },
+   dispose: function () { }
 });
 
 export default X3DTimeDependentNode;

package/src/x_ite/Configuration/ComponentInfo.js

@@ -47,7 +47,6 @@
 
 import X3DObject from "../Base/X3DObject.js";
 import URLs      from "../Browser/Networking/URLs.js";
-import Generator from "../InputOutput/Generator.js";
 
 function ComponentInfo ({ name, level, title, providerUrl, external = false, dependencies = [ ] })
 {
@@ -67,31 +66,29 @@ ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype)
    {
       return "ComponentInfo";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      stream .string += "COMPONENT";
-      stream .string += " ";
-      stream .string += this .name;
-      stream .string += " ";
-      stream .string += ":";
-      stream .string += " ";
-      stream .string += this .level;
+      generator .string += "COMPONENT";
+      generator .string += generator .Space ();
+      generator .string += this .name;
+      generator .string += generator .TidySpace ();
+      generator .string += ":";
+      generator .string += generator .TidySpace ();
+      generator .string += this .level;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += generator .Indent ();
-      stream .string += "<component";
-      stream .string += " ";
-      stream .string += "name='";
-      stream .string += this .name;
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "level='";
-      stream .string += this .level;
-      stream .string += "'";
-      stream .string += "/>";
+      generator .string += generator .Indent ();
+      generator .string += "<component";
+      generator .string += generator .Space ();
+      generator .string += "name='";
+      generator .string += this .name;
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "level='";
+      generator .string += this .level;
+      generator .string += "'";
+      generator .string += "/>";
    },
 });
 

package/src/x_ite/Configuration/ProfileInfo.js

@@ -62,15 +62,15 @@ ProfileInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
    {
       return "ProfileInfo";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      stream .string += "PROFILE";
-      stream .string += " ";
-      stream .string += this .name;
+      generator .string += "PROFILE";
+      generator .string += generator .Space ();
+      generator .string += this .name;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      stream .string += this .name;
+      generator .string += this .name;
    },
 });
 

package/src/x_ite/Configuration/SupportedComponents.js

@@ -59,7 +59,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Computer-Aided Design (CAD) model geometry",
+   title: "CAD geometry",
    name: "CADGeometry",
    level: 2,
    external: true,
@@ -82,7 +82,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Distributed interactive simulation (DIS)",
+   title: "Distributed interactive simulation",
    name: "DIS",
    level: 2,
    external: true,
@@ -99,14 +99,14 @@ SupportedComponents .addComponent (
 {
    title: "Environmental sensor",
    name: "EnvironmentalSensor",
-   level: 4,
+   level: 3,
 });
 
 SupportedComponents .addComponent (
 {
    title: "Event utilities",
    name: "EventUtilities",
-   level: 4,
+   level: 1,
    external: true,
 });
 
@@ -114,7 +114,7 @@ SupportedComponents .addComponent (
 {
    title: "Followers",
    name: "Followers",
-   level: 4,
+   level: 1,
 });
 
 SupportedComponents .addComponent (
@@ -211,7 +211,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Non-uniform Rational B-Spline (NURBS)",
+   title: "NURBS",
    name: "NURBS",
    level: 4,
    external: true,
@@ -227,7 +227,7 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Picking sensor",
+   title: "Picking",
    name: "Picking",
    level: 3,
    external: true,
@@ -243,19 +243,21 @@ SupportedComponents .addComponent (
 
 SupportedComponents .addComponent (
 {
-   title: "Projective Texture Mapping",
-   name: "ProjectiveTextureMapping",
-   level: 2,
-   external: true,
+   title: "Programmable shaders",
+   name: "Shaders",
+   level: 1,
 });
 
 SupportedComponents .addComponent (
 {
-   title: "Programmable shaders",
-   name: "Shaders",
-   level: 1,
+   title: "Texture Projector",
+   name: "TextureProjector",
+   level: 2,
+   external: true,
 });
 
+SupportedComponents .addAlias ("ProjectiveTextureMapping", "TextureProjector");
+
 SupportedComponents .addComponent (
 {
    title: "Rendering",
@@ -267,7 +269,7 @@ SupportedComponents .addComponent (
 {
    title: "Rigid body physics",
    name: "RigidBodyPhysics",
-   level: 5,
+   level: 2,
    external: true,
 });
 
@@ -283,14 +285,14 @@ SupportedComponents .addComponent (
 {
    title: "Shape",
    name: "Shape",
-   level: 5,
+   level: 4,
 });
 
 SupportedComponents .addComponent (
 {
    title: "Sound",
    name: "Sound",
-   level: 1,
+   level: 3,
 });
 
 SupportedComponents .addComponent (
@@ -305,14 +307,14 @@ SupportedComponents .addComponent (
 {
    title: "Texturing",
    name: "Texturing",
-   level: 3,
+   level: 4,
 });
 
 SupportedComponents .addComponent (
 {
    title: "Texturing3D",
    name: "Texturing3D",
-   level: 3,
+   level: 2,
    external: true,
 });
 
@@ -327,7 +329,7 @@ SupportedComponents .addComponent (
 {
    title: "Volume rendering",
    name: "VolumeRendering",
-   level: 2,
+   level: 4,
    external: true,
    dependencies: ["CADGeometry", "Texturing3D"],
 });

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,33 @@ 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);
-
-      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 .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 += "/>";
    },
 });
 

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,18 @@ 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 ();
-
-      importedNodes .forEach (function (importedNode)
-      {
-         try
-         {
-            importedNode .toXMLStream (stream);
-
-            stream .string += "\n";
-         }
-         catch (error)
-         { }
-      });
+      this .getImportedNodes () .toXMLStream (generator);
 
       // Output routes
 
-      this .getRoutes () .toXMLStream (stream);
+      this .getRoutes () .toXMLStream (generator);
 
       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,43 @@ 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 += "/>";
    },
 });