x_ite 8.4.3 → 8.5.3

package/src/x_ite/Browser/X3DBrowser.js

@@ -48,7 +48,6 @@
 import VERSION             from "./VERSION.js";
 import Fields              from "../Fields.js";
 import Components          from "../Components.js";
-import X3DLayerNode        from "../Components/Layering/X3DLayerNode.js";
 import X3DBrowserContext   from "./X3DBrowserContext.js";
 import DOMIntegration      from "./DOMIntegration.js";
 import legacy              from "./Legacy.js";
@@ -72,7 +71,8 @@ import _                   from "../../locale/gettext.js";
 
 const
    _DOMIntegration   = Symbol (),
-   _loader           = Symbol (),
+   _reject           = Symbol (),
+   _fileLoader       = Symbol (),
    _browserCallbacks = Symbol (),
    _console          = Symbol ();
 
@@ -87,6 +87,7 @@ function X3DBrowser (element)
 
    X3DBrowserContext .call (this, element);
 
+   this [_reject]           = Function .prototype;
    this [_browserCallbacks] = new Map ();
    this [_console]          = document .getElementsByClassName ("x_ite-console");
 
@@ -110,14 +111,16 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    initialize: function ()
    {
-      X3DBrowserContext .prototype .initialize .call (this);
+      const processEvent = X3DBrowserContext .prototype .initialize .call (this);
 
-      this .replaceWorld (this .createScene ());
+      this .replaceWorld (this .createScene ()) .catch (Function .prototype);
 
       this [_DOMIntegration] = new DOMIntegration (this);
 
       legacy .call (this);
 
+      processEvent .call (this);
+
       // Print welcome message.
 
       if (this .getInstanceId () > 1) return;
@@ -131,6 +134,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
                       "      Shading language: " + this .getShadingLanguageVersion () + "\n" +
                       "   Rendering Properties\n" +
                       "      Antialiased: " + this .getAntialiased () + "\n" +
+                      "      Max samples: " + this .getMaxSamples () + "\n" +
                       "      Depth size: " + this .getDepthSize () + " bits\n" +
                       "      Color depth: " + this .getColorDepth () + " bits\n" +
                       "      Max clip planes per shape: " + this .getMaxClipPlanes () + "\n" +
@@ -220,7 +224,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
          await loadComponents (browser, $.data (component, "dependencies"), seen);
 
-         if (! $.data (component, "external"))
+         if (!$.data (component, "external"))
             return;
 
          if (Features .NODE_ENV)
@@ -257,7 +261,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       if (arguments .length)
       {
-         if (! (profile instanceof ProfileInfo))
+         if (!(profile instanceof ProfileInfo))
             throw new Error ("Couldn't create scene: profile must be of type ProfileInfo.");
 
          scene .setProfile (profile);
@@ -266,7 +270,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          {
             const component = arguments [i];
 
-            if (! (component instanceof ComponentInfo))
+            if (!(component instanceof ComponentInfo))
                throw new Error ("Couldn't create scene: component must be of type ComponentInfo.");
 
             scene .addComponent (component);
@@ -279,69 +283,77 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    replaceWorld: function (scene)
    {
-       if (this [_loader])
-         this [_loader] .abort ();
+      return new Promise ((resolve, reject) =>
+      {
+         this [_reject] ("Replacing world aborted.");
 
-      // Remove world.
+         if (this [_fileLoader])
+            this [_fileLoader] .abort ();
 
-      if (this .initialized () .getValue ())
-      {
-         this .getExecutionContext () .setLive (false);
-         this .shutdown () .processInterests ();
-         this .callBrowserCallbacks (X3DConstants .SHUTDOWN_EVENT);
-         this .callBrowserEventHandler ("shutdown");
-      }
+         this [_reject] = reject;
 
-      // Replace world.
+         // Remove world.
 
-      if (scene instanceof Fields .MFNode)
-      {
-         // VRML version of replaceWorld has a MFNode value as argument.
+         if (this .initialized () .getValue ())
+         {
+            this .getExecutionContext () .setLive (false);
+            this .shutdown () .processInterests ();
+            this .callBrowserCallbacks (X3DConstants .SHUTDOWN_EVENT);
+            this .callBrowserEventHandler ("shutdown");
+         }
+
+         // Replace world.
 
-         const rootNodes = scene;
+         if (scene instanceof Fields .MFNode)
+         {
+            // VRML version of replaceWorld has a MFNode value as argument.
 
-         scene = this .createScene ();
+            const rootNodes = scene;
 
-         for (const rootNode of rootNodes)
-            scene .isLive () .addInterest (rootNode .getValue () .getExecutionContext () .isLive ());
+            scene = this .createScene ();
 
-         scene .setRootNodes (rootNodes);
-      }
+            for (const rootNode of rootNodes)
+               scene .isLive () .addInterest (rootNode .getValue () .getExecutionContext () .isLive ());
 
-      if (! (scene instanceof X3DScene))
-         scene = this .createScene ();
+            scene .setRootNodes (rootNodes);
+         }
 
-      // Detach scene from parent.
+         if (!(scene instanceof X3DScene))
+            scene = this .createScene ();
 
-      scene .getExecutionContext () .isLive () .removeInterest ("setLive", scene);
-      scene .setExecutionContext (scene);
+         // Detach scene from parent.
 
-      // Replace.
+         scene .getExecutionContext () .isLive () .removeInterest ("setLive", scene);
+         scene .setExecutionContext (scene);
 
-      this .setDescription ("");
-      this .getBrowserOptions () .configure ();
-      this .setBrowserLoading (true);
-      this ._loadCount .addInterest ("checkLoadCount", this);
+         // Replace.
+
+         this .setDescription ("");
+         this .getBrowserOptions () .configure ();
+         this .setBrowserLoading (true);
+         this ._loadCount .addInterest ("checkLoadCount", this, resolve);
 
-      for (const object of scene .getLoadingObjects ())
-         this .addLoadingObject (object);
+         for (const object of scene .getLoadingObjects ())
+            this .addLoadingObject (object);
 
-      this .setExecutionContext (scene);
-      this .getWorld () .bindBindables ();
+         this .setExecutionContext (scene);
+         this .getWorld () .bindBindables ();
 
-      scene .setLive (this .isLive () .getValue ());
+         scene .setLive (this .isLive () .getValue ());
+      });
    },
-   checkLoadCount: function (loadCount)
+   checkLoadCount: function (resolve, loadCount)
    {
       if (loadCount .getValue ())
          return;
 
       loadCount .removeInterest ("checkLoadCount", this);
+      this .setBrowserLoading (false);
       this .initialized () .set (this .getCurrentTime ());
       this .initialized () .processInterests ();
       this .callBrowserCallbacks (X3DConstants .INITIALIZED_EVENT);
       this .callBrowserEventHandler ("initialized load");
-      this .setBrowserLoading (false);
+      resolve ();
    },
    createVrmlFromString: function (vrmlSyntax)
    {
@@ -357,7 +369,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          fileLoader   = new FileLoader (this .getWorld ()),
          scene        = fileLoader .createX3DFromString (currentScene .getWorldURL (), x3dSyntax);
 
-      if (! external)
+      if (!external)
       {
          currentScene .isLive () .addInterest ("setLive", scene);
          scene .setExecutionContext (currentScene);
@@ -371,15 +383,15 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
       node  = X3DCast (X3DConstants .X3DNode, node, false);
       event = String (event);
 
-      if (! (url instanceof Fields .MFString))
+      if (!(url instanceof Fields .MFString))
          throw new Error ("Browser.createVrmlFromURL: url must be of type MFString.");
 
-      if (! node)
+      if (!node)
          throw new Error ("Browser.createVrmlFromURL: node must be of type X3DNode.");
 
       const field = node .getField (event);
 
-      if (! field .isInput ())
+      if (!field .isInput ())
          throw new Error ("Browser.createVrmlFromURL: event named '" + event + "' must be a input field.");
 
       if (field .getType () !== X3DConstants .MFNode)
@@ -388,19 +400,19 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
       const
          currentScene = this .currentScene,
          external     = this .isExternal (),
-         loader       = new FileLoader (this .getWorld ());
+         fileLoader   = new FileLoader (this .getWorld ());
 
-      this .addLoadingObject (loader);
+      this .addLoadingObject (fileLoader);
 
-      loader .createX3DFromURL (url, null, (scene) =>
+      fileLoader .createX3DFromURL (url, null, (scene) =>
       {
-         this .removeLoadingObject (loader);
+         this .removeLoadingObject (fileLoader);
 
          if (scene)
          {
             // Handle isLive for script scenes here:
 
-            if (! external)
+            if (!external)
             {
                currentScene .isLive () .addInterest ("setLive", scene);
                scene .setExecutionContext (currentScene);
@@ -419,32 +431,48 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       // arguments .length === 1
 
-      if (! (url instanceof Fields .MFString))
+      if (!(url instanceof Fields .MFString))
          throw new Error ("Browser.createX3DFromURL: url must be of type MFString.");
 
-      const
-         currentScene = this .currentScene,
-         external     = this .isExternal (),
-         fileLoader   = new FileLoader (this .getWorld ()),
-         scene        = fileLoader .createX3DFromURL (url, null);
-
-      if (! external)
+      return new Promise ((resolve, reject) =>
       {
-         currentScene .isLive () .addInterest ("setLive", scene);
-         scene .setExecutionContext (currentScene);
-         scene .setLive (currentScene .getLive ());
-      }
+         const
+            currentScene = this .currentScene,
+            external     = this .isExternal (),
+            fileLoader   = new FileLoader (this .getWorld ());
 
-      return scene;
+         this .addLoadingObject (fileLoader);
+
+         fileLoader .createX3DFromURL (url, null, (scene) =>
+         {
+            this .removeLoadingObject (fileLoader);
+
+            if (scene)
+            {
+               if (!external)
+               {
+                  currentScene .isLive () .addInterest ("setLive", scene);
+                  scene .setExecutionContext (currentScene);
+                  scene .setLive (currentScene .getLive ());
+               }
+
+               resolve (scene);
+            }
+            else
+            {
+               reject (new Error ("Couldn't load X3D file."));
+            }
+         })
+      });
    },
    loadURL: function (url, parameter = new Fields .MFString ())
    {
       return new Promise ((resolve, reject) =>
       {
-         if (! (url instanceof Fields .MFString))
+         if (!(url instanceof Fields .MFString))
             throw new Error ("Browser.loadURL: url must be of type MFString.");
 
-         if (! (parameter instanceof Fields .MFString))
+         if (!(parameter instanceof Fields .MFString))
             throw new Error ("Browser.loadURL: parameter must be of type MFString.");
 
          // Cancel any loading.
@@ -452,33 +480,31 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          this ._loadCount       .removeInterest ("checkLoadCount",    this);
          this .prepareEvents () .removeInterest ("updateInitialized", this);
 
-         if (this [_loader])
-            this [_loader] .abort ();
+         if (this [_fileLoader])
+            this [_fileLoader] .abort ();
 
          // Start loading.
 
          this .setBrowserLoading (true);
          this .addLoadingObject (this);
 
-         const loader = this [_loader] = new FileLoader (this .getWorld ());
+         const fileLoader = this [_fileLoader] = new FileLoader (this .getWorld ());
 
-         loader .createX3DFromURL (url, parameter, (scene) =>
+         fileLoader .createX3DFromURL (url, parameter, (scene) =>
          {
-            if (loader !== this [_loader])
+            if (fileLoader !== this [_fileLoader])
             {
-               reject ("Loading of X3D file aborted.");
+               reject (new Error ("Loading of X3D file aborted."));
                return;
             }
 
-            if (! this .getBrowserOptions () .getSplashScreen ())
+            if (!this .getBrowserOption ("SplashScreen"))
                this .getCanvas () .show ();
 
             if (scene)
             {
-               this .replaceWorld (scene);
+               this .replaceWorld (scene) .then (resolve) .catch (reject);
                this .removeLoadingObject (this);
-
-               resolve ();
             }
             else
             {
@@ -492,14 +518,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
                      .text (_ ("Failed loading world."));
                });
 
-               reject ("Couldn't load X3D file.");
+               reject (new Error ("Couldn't load X3D file."));
             }
          },
          (fragment) =>
          {
-            if (loader !== this [_loader])
+            if (fileLoader !== this [_fileLoader])
             {
-               reject ("Change viewpoint aborted.");
+               reject (new Error ("Change viewpoint aborted."));
                return;
             }
 
@@ -511,9 +537,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          },
          (url, target) =>
          {
-            if (loader !== this [_loader])
+            if (fileLoader !== this [_fileLoader])
             {
-               reject ("Loading of file aborted.");
+               reject (new Error ("Loading of file aborted."));
                return;
             }
 
@@ -564,14 +590,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          }
       };
    })(),
-   importDocument: function (dom, async = false)
+   importDocument: function (dom)
    {
       const
          currentScene = this .currentScene,
          scene        = this .createScene (),
          external     = this .isExternal ();
 
-      if (! external)
+      if (!external)
       {
          currentScene .isLive () .addInterest ("setLive", scene);
          scene .setExecutionContext (currentScene);
@@ -582,21 +608,16 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       parser .setInput (dom)
 
-      if (async)
-         return new Promise (parser .parseIntoScene .bind (parser));
-
-      parser .parseIntoScene ();
-
-      return scene;
+      return new Promise (parser .parseIntoScene .bind (parser));
    },
-   importJS: function (json, async = false)
+   importJS: function (json)
    {
       const
          currentScene = this .currentScene,
          scene        = this .createScene (),
          external     = this .isExternal ();
 
-      if (! external)
+      if (!external)
       {
          currentScene .isLive () .addInterest ("setLive", scene);
          scene .setExecutionContext (currentScene);
@@ -607,12 +628,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       parser .setInput (json);
 
-      if (async)
-         return new Promise (parser .parseIntoScene .bind (parser));
-
-      parser .parseIntoScene ();
-
-      return scene;
+      return new Promise (parser .parseIntoScene .bind (parser));
    },
    getBrowserProperty: function (name)
    {
@@ -630,13 +646,28 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    {
       return this .getRenderingProperties () .getField (name) .getValue ();
    },
+   viewAll: function (layerNode)
+   {
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
+
+      if (!layerNode)
+         layerNode = this .getActiveLayer ();
+
+      if (!layerNode)
+         return;
+
+      layerNode .getViewpoint () ._viewAll = true;
+   },
    firstViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode, false);
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
 
-      if (! layerNode)
+      if (!layerNode)
          layerNode = this .getActiveLayer ();
 
+      if (!layerNode)
+         return;
+
       const viewpoints = layerNode .getUserViewpoints ();
 
       if (viewpoints .length)
@@ -644,11 +675,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    previousViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode, false);
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
 
-      if (! layerNode)
+      if (!layerNode)
          layerNode = this .getActiveLayer ();
 
+      if (!layerNode)
+         return;
+
       const viewpoints = layerNode .getUserViewpoints ();
 
       if (viewpoints .length === 0)
@@ -673,11 +707,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    nextViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode, false);
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
 
-      if (! layerNode)
+      if (!layerNode)
          layerNode = this .getActiveLayer ();
 
+      if (!layerNode)
+         return;
+
       const viewpoints = layerNode .getUserViewpoints ();
 
       if (viewpoints .length === 0)
@@ -702,11 +739,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    lastViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode, false);
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
 
-      if (! layerNode)
+      if (!layerNode)
          layerNode = this .getActiveLayer ();
 
+      if (!layerNode)
+         return;
+
       const viewpoints = layerNode .getUserViewpoints ();
 
       if (viewpoints .length)
@@ -720,32 +760,32 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          layerNode = this .getActiveLayer ();
       }
 
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode, false);
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
 
-      if (! layerNode)
+      if (!layerNode)
          layerNode = this .getActiveLayer ();
 
-      if (layerNode instanceof X3DLayerNode)
+      if (!layerNode)
+         return;
+
+      for (const viewpointNode of layerNode .getViewpoints () .get ())
       {
-         for (const viewpointNode of layerNode .getViewpoints () .get ())
-         {
-            if (viewpointNode .getName () === name)
-            {
-               this .bindViewpoint (layerNode, viewpointNode);
-               break;
-            }
-         }
+         if (viewpointNode .getName () !== name)
+            continue;
+
+         this .bindViewpoint (layerNode, viewpointNode);
+         break;
       }
    },
    bindViewpoint: function (layerNode, viewpointNode)
    {
-      layerNode     = X3DCast (X3DConstants .X3DLayerNode,     layerNode,     false);
-      viewpointNode = X3DCast (X3DConstants .X3DViewpointNode, viewpointNode, false);
+      layerNode     = X3DCast (X3DConstants .X3DLayerNode,     layerNode);
+      viewpointNode = X3DCast (X3DConstants .X3DViewpointNode, viewpointNode);
 
-      if (! layerNode)
+      if (!layerNode)
          throw new Error ("Browser.bindViewpoint: layerNode must be of type X3DLayerNode.")
 
-      if (! viewpointNode)
+      if (!viewpointNode)
          throw new Error ("Browser.bindViewpoint: viewpointNode must be of type X3DViewpointNode.")
 
       viewpointNode .setVRMLTransition (true);

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -179,7 +179,7 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Process events from context creation. This will setup nodes like
       // geometry option nodes before any node is created.
-      this [_processEvents] ();
+      return this [_processEvents];
    },
    initialized: function ()
    {
@@ -213,15 +213,15 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
    {
       return this [_world];
    },
+   getExecutionContext: function ()
+   {
+      return this [_world] .getExecutionContext ();
+   },
    setExecutionContext: function (executionContext)
    {
       this [_world] = new X3DWorld (executionContext);
       this [_world] .setup ();
    },
-   getExecutionContext: function ()
-   {
-      return this [_world] .getExecutionContext ();
-   },
    addBrowserEvent: function ()
    {
       if (this [_changedTime] === this .getCurrentTime ())
@@ -280,9 +280,11 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
       this [_processEvents] ();
 
       const t3 = Date .now ();
+      this .getFrameBuffer () .bind ();
       gl .clearColor (0, 0, 0, 0);
       gl .clear (gl .COLOR_BUFFER_BIT);
       this [_world] .traverse (TraverseType .DISPLAY, null);
+      this .getFrameBuffer () .blit ();
       this [_displayTime] = Date .now () - t3;
 
       this [_browserTime]     = Date .now () - t0;

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

@@ -62,9 +62,9 @@ WorldInfo .prototype = Object .assign (Object .create (X3DInfoNode .prototype),
 {
    constructor: WorldInfo,
    [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata", new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "title",    new Fields .SFString ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "info",     new Fields .MFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata", new Fields .SFNode ()),
+      new X3DFieldDefinition (X3DConstants .initializeOnly, "title",    new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .initializeOnly, "info",     new Fields .MFString ()),
    ]),
    getTypeName: function ()
    {

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

@@ -335,9 +335,9 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       if (field .getReferences () .size === 0 || !generator .ExecutionContext () || sharedNode)
       {
          generator .string += generator .Indent ();
-         generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+         generator .string += generator .AccessType (field .getAccessType ()) .padEnd (accessTypeLength, " ");
          generator .string += generator .Space ();
-         generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+         generator .string += field .getTypeName () .padEnd (fieldTypeLength, " ");
          generator .string += generator .Space ();
          generator .string += field .getName ();
 
@@ -361,9 +361,9 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             // Output user defined reference field
 
             generator .string += generator .Indent ();
-            generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+            generator .string += generator .AccessType (field .getAccessType ()) .padEnd (accessTypeLength, " ");
             generator .string += generator .Space ();
-            generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+            generator .string += field .getTypeName () .padEnd (fieldTypeLength, " ");
             generator .string += generator .Space ();
             generator .string += field .getName ();
             generator .string += generator .Space ();
@@ -381,9 +381,9 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             generator .string += generator .Break ();
             generator .string += generator .Indent ();
-            generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+            generator .string += generator .AccessType (field .getAccessType ()) .padEnd (accessTypeLength, " ");
             generator .string += generator .Space ();
-            generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+            generator .string += field .getTypeName () .padEnd (fieldTypeLength, " ");
             generator .string += generator .Space ();
             generator .string += field .getName ();
 
@@ -1225,7 +1225,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          generator .string += generator .TidyBreak ();
       }
 
-      generator .string = generator .string .replace (/,(\s*)$/s, "$1");
+      generator .JSONRemoveComma ();
 
       // End
 

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

@@ -985,7 +985,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
          }
       }
 
-      generator .string = generator .string .replace (/,(\s*)$/s, "$1");
+      generator .JSONRemoveComma ();
 
 
       // End