x_ite 8.6.20 → 8.6.23

package/src/x_ite/Browser/Core/BrowserTimings.js

@@ -55,7 +55,6 @@ function BrowserTimings (executionContext)
 
    this .localStorage  = this .getBrowser () .getLocalStorage () .addNameSpace ("BrowserTimings.");
    this .fps           = new StopWatch ();
-   this .localeOptions = { minimumFractionDigits: 2, maximumFractionDigits: 2 };
 }
 
 BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -81,17 +80,101 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
       this .localStorage .addDefaultValues ({ type: "LESS" });
 
-      this .element = $("<div></div>") .hide () .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getSurface ());
-      this .table   = $("<table></table>") .appendTo (this .element);
-      this .header  = $("<thead></thead>") .append ($("<tr></tr>") .append ($("<th colspan='2'></th>"))) .appendTo (this .table);
-      this .body    = $("<tbody></tbody>") .appendTo (this .table);
-      this .footer  = $("<tfoot></tfoot>") .append ($("<tr></tr>") .append ($("<td colspan='2'></td>"))) .appendTo (this .table);
-      this .button  = $("<button></button>") .attr ("type", "button") .appendTo (this .footer .find ("td"));
-      this .rows    = [ ];
+      this .element = $("<div></div>")
+         .hide ()
+         .addClass ("x_ite-private-browser-timings")
+         .appendTo (this .getBrowser () .getSurface ());
+
+      this .table = $("<table></table>")
+         .appendTo (this .element);
+
+      this .header = $("<thead></thead>")
+         .append ($("<tr></tr>")
+         .append ($("<th colspan='2'></th>")
+         .text (_("Browser Timings"))))
+         .appendTo (this .table);
+
+      this .body = $("<tbody></tbody>")
+         .appendTo (this .table);
+
+      this .footer = $("<tfoot></tfoot>")
+         .append ($("<tr></tr>")
+         .append ($("<td colspan='2'></td>")))
+         .appendTo (this .table);
+
+      this .button = $("<button></button>")
+         .attr ("type", "button")
+         .appendTo (this .footer .find ("td"));
+
+      this .frameRate       = $("<td></td>");
+      this .speed           = $("<td></td>");
+      this .frameRate       = $("<td></td>");
+      this .speed           = $("<td></td>");
+      this .browserTime     = $("<td></td>");
+      this .x3dTotal        = $("<td></td>");
+      this .eventProcessing = $("<td></td>");
+      this .pointerTime     = $("<td></td>");
+      this .cameraTime      = $("<td></td>");
+      this .pickingTime     = $("<td></td>");
+      this .collisionTime   = $("<td></td>");
+      this .renderTime      = $("<td></td>");
+      this .numShapes       = $("<td></td>");
+      this .sensors         = $("<td></td>");
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Frame rate") + ":"))
+         .append (this .frameRate));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Speed") + ":"))
+         .append (this .speed)
+         .addClass ("x_ite-private-more"));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Browser") + ":"))
+         .append (this .browserTime));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("X3D total") + ":"))
+         .append (this .x3dTotal));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Event Processing") + ":"))
+         .append (this .eventProcessing));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Pointer") + ":"))
+         .append (this .pointerTime));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Camera") + ":"))
+         .append (this .cameraTime));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Picking") + ":"))
+         .append (this .pickingTime));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Collision Detection") + ":"))
+         .append (this .collisionTime));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Rendering") + ":"))
+         .append (this .renderTime));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Number of Shapes") + ":"))
+         .append (this .numShapes));
+
+      this .body .append ($("<tr></tr>")
+         .append ($("<td></td>") .text (_("Number of Sensors") + ":"))
+         .append (this .sensors));
 
       this .button .on ("click touchend", this .set_type__ .bind (this));
 
-      this .set_button__ ();
+      this .localStorage .type = this .localStorage .type === "MORE" ? "LESS" : "MORE";
+
+      this .set_type__ ();
    },
    set_enabled__: function ()
    {
@@ -112,9 +195,17 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    set_type__: function ()
    {
       if (this .localStorage .type === "MORE")
+      {
          this .localStorage .type = "LESS";
+         this .table .addClass ("less");
+         this .table .removeClass ("more");
+      }
       else
+      {
          this .localStorage .type = "MORE";
+         this .table .addClass ("more");
+         this .table .removeClass ("less");
+      }
 
       this .set_button__ ();
       this .build ();
@@ -140,68 +231,45 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    },
    build: function ()
    {
-      const
-         browser     = this .getBrowser (),
-         language    = navigator .language || navigator .userLanguage,
-         fixed       = this .localeOptions,
-         rows        = this .rows;
+      const browser = this .getBrowser ();
 
-      let r = 0;
+      this .frameRate .text (f2(1000 / this .fps .averageTime) + " " + _("fps"));
+      this .speed .text (f2(this .getSpeed (browser .currentSpeed)) + " " + this .getSpeedUnit (browser .currentSpeed));
 
-      rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Frame rate") + ":")) .append ($("<td></td>") .text (f2(1000 / this .fps .averageTime) .toLocaleString (language, fixed) + " " + _("fps")));
-      rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Speed") + ":")) .append ($("<td></td>") .text (f2(this .getSpeed (browser .currentSpeed)) .toLocaleString (language, fixed) + " " + this .getSpeedUnit (browser .currentSpeed)));
+      if (this .localStorage .type !== "MORE" || !browser .getWorld ())
+         return;
 
-      if (this .localStorage .type === "MORE")
-      {
-         const
-            layers         = browser .getWorld () .getLayerSet () .getLayers (),
-            activeLayer    = browser .getActiveLayer (),
-            navigationTime = activeLayer && browser .getCollisionCount () ? activeLayer .getCollisionTime () .averageTime : 0,
-            collisionTime  = browser .getCollisionTime () .averageTime + navigationTime,
-            routingTime    = Math .max (0, browser .getBrowserTime () .averageTime - (browser .getCameraTime () .averageTime + browser .getCollisionTime () .averageTime + browser .getDisplayTime () .averageTime)),
-            prepareEvents  = browser .prepareEvents () .getInterests () .size - 1,
-            sensors        = browser .sensorEvents () .getInterests () .size;
-
-         let
-            opaqueShapes      = 0,
-            transparentShapes = 0;
-
-         for (const layer of layers)
-         {
-            opaqueShapes      += layer .numOpaqueShapes;
-            transparentShapes += layer .numTransparentShapes;
-         }
-
-         rows [1] .addClass ("x_ite-private-more");
-
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Browser") + ":")) .append ($("<td></td>") .text (f2(browser .getSystemTime () .averageTime)           .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("X3D total") + ":")) .append ($("<td></td>") .text (f2(browser .getBrowserTime () .averageTime) .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Event Processing") + ":")) .append ($("<td></td>") .text (f2(routingTime) .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Pointer") + ":")) .append ($("<td></td>") .text (f2(browser .getPointingTime () .averageTime) .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Camera") + ":")) .append ($("<td></td>") .text (f2(browser .getCameraTime () .averageTime)  .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Picking") + ":")) .append ($("<td></td>") .text (f2(browser .getPickingTime () .averageTime) .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Collision Detection") + ":")) .append ($("<td></td>") .text (f2(collisionTime) .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Rendering") + ":")) .append ($("<td></td>") .text (f2(browser .getDisplayTime () .averageTime) .toLocaleString (language, fixed) + " " + _("ms")));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Number of Shapes")    + ":")) .append ($("<td></td>") .text (opaqueShapes + " + " + transparentShapes));
-         rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Number of Sensors")   + ":")) .append ($("<td></td>") .text (prepareEvents + sensors));
-
-         browser .getSystemTime ()    .reset ();
-         browser .getBrowserTime ()   .reset ();
-         browser .getPointingTime ()   .reset ();
-         browser .getCameraTime ()    .reset ();
-         browser .getPickingTime ()   .reset ();
-         browser .getCollisionTime () .reset ();
-         browser .getDisplayTime ()   .reset ();
-
-         if (activeLayer)
-            activeLayer .getCollisionTime () .reset ();
-      }
+      const
+         layers            = browser .getWorld () .getLayerSet () .getLayers (),
+         activeLayer       = browser .getActiveLayer (),
+         navigationTime    = activeLayer && browser .getCollisionCount () ? activeLayer .getCollisionTime () .averageTime : 0,
+         collisionTime     = browser .getCollisionTime () .averageTime + navigationTime,
+         routingTime       = Math .max (0, browser .getBrowserTime () .averageTime - (browser .getCameraTime () .averageTime + browser .getCollisionTime () .averageTime + browser .getDisplayTime () .averageTime)),
+         prepareEvents     = browser .prepareEvents () .getInterests () .size - 1,
+         sensors           = browser .sensorEvents () .getInterests () .size,
+         opaqueShapes      = layers .reduce ((n, layer) => n + layer .getNumOpaqueShapes (), 0),
+         transparentShapes = layers .reduce ((n, layer) => n + layer .getNumTransparentShapes (), 0);
 
-      rows .length = r;
+      this .browserTime     .text (f2(browser .getSystemTime () .averageTime) + " " + _("ms"));
+      this .x3dTotal        .text (f2(browser .getBrowserTime () .averageTime) + " " + _("ms"));
+      this .eventProcessing .text (f2(routingTime) + " " + _("ms"));
+      this .pointerTime     .text (f2(browser .getPointingTime () .averageTime) + " " + _("ms"));
+      this .cameraTime      .text (f2(browser .getCameraTime () .averageTime) + " " + _("ms"));
+      this .pickingTime     .text (f2(browser .getPickingTime () .averageTime) + " " + _("ms"));
+      this .collisionTime   .text (f2(collisionTime) + " " + _("ms"));
+      this .renderTime      .text (f2(browser .getDisplayTime () .averageTime) + " " + _("ms"));
+      this .numShapes       .text (opaqueShapes + " + " + transparentShapes);
+      this .sensors         .text (prepareEvents + sensors);
 
-      this .header .find ("th") .text (_("Browser Timings"));
-      this .body .empty ();
-      this .body .append (rows);
+      browser .getSystemTime ()    .reset ();
+      browser .getBrowserTime ()   .reset ();
+      browser .getPointingTime ()  .reset ();
+      browser .getCameraTime ()    .reset ();
+      browser .getPickingTime ()   .reset ();
+      browser .getCollisionTime () .reset ();
+      browser .getDisplayTime ()   .reset ();
+
+      activeLayer ?.getCollisionTime () .reset ();
    },
    getSpeed: function (speed)
    {
@@ -219,6 +287,18 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    },
 });
 
-function f2 (n) { return isFinite (n) ? n .toFixed (2) : 0 .toFixed (2); }
+const f2 = (function ()
+{
+   const format = new Intl .NumberFormat (navigator .language || navigator .userLanguage, {
+      notation: "standard",
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+   }) .format;
+
+   return function (value)
+   {
+      return format (Number .isFinite (value) ? value : 0);
+   };
+})();
 
 export default BrowserTimings;

package/src/x_ite/Browser/Core/ContextMenu.js

@@ -278,7 +278,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                className: "context-menu-icon x_ite-private-icon-shading",
                items: {
                   "point": {
-                     name: _("Point"),
+                     name: _("Points"),
                      type: "radio",
                      radio: "shading",
                      selected: browser .getBrowserOption ("Shading") === "POINT",
@@ -286,7 +286,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                         click: function ()
                         {
                            browser .setBrowserOption ("Shading", "POINT");
-                           browser .getNotification () ._string = _("Shading") + ": " + _("Point");
+                           browser .getNotification () ._string = _("Shading") + ": " + _("Points");
                         }
                         .bind (this),
                      },

package/src/x_ite/Browser/Core/X3DCoreContext.js

@@ -156,7 +156,6 @@ X3DCoreContext .prototype =
             this .loadURL (new Fields .MFString (value), new Fields .MFString ());
          },
          enumerable: true,
-         configurable: false,
       });
 
       Object .defineProperty (this .getElement () .get (0), "url",
@@ -170,7 +169,6 @@ X3DCoreContext .prototype =
             this .loadURL (value, new Fields .MFString ());
          },
          enumerable: true,
-         configurable: false,
       });
 
       // Configure browser event handlers.
@@ -272,6 +270,12 @@ X3DCoreContext .prototype =
             this .setBrowserOption ("Antialiased", this .parseBooleanAttribute (newValue, true));
             break;
          }
+         case "baseURL":
+         case "baseurl":
+         {
+            this .setBaseURL (newValue);
+            break;
+         }
          case "cache":
          {
             this .setBrowserOption ("Cache", this .parseBooleanAttribute (newValue, true));

package/src/x_ite/Browser/Networking/X3DNetworkingContext.js

@@ -60,7 +60,7 @@ const
 
 function getBaseURI (element)
 {
-   let baseURI = element .baseURI;
+   let baseURI = element .prop ("baseURI");
 
    // Fix for Edge.
    if (baseURI .startsWith ("about:"))
@@ -77,7 +77,7 @@ function X3DNetworkingContext ()
    this [_loadingTotal]   = 0;
    this [_loadingObjects] = new Set ();
    this [_loading]        = false;
-   this [_baseURL]        = getBaseURI (this .getElement () [0]);
+   this [_baseURL]        = getBaseURI (this .getElement ());
 }
 
 X3DNetworkingContext .prototype =
@@ -96,7 +96,11 @@ X3DNetworkingContext .prototype =
    },
    setBaseURL: function (value)
    {
-      this [_baseURL] = String (value);
+      const
+         base = getBaseURI (this .getElement ()),
+         url  = new URL (value, base);
+
+      this [_baseURL] = url .protocol === "data:" ? base : url .href;
    },
    getDefaultScene: function ()
    {

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.20";
+export default "8.6.23";

package/src/x_ite/Browser/X3DBrowser.js

@@ -828,35 +828,30 @@ Object .defineProperty (X3DBrowser .prototype, "name",
 {
    get: X3DBrowser .prototype .getName,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "version",
 {
    get: X3DBrowser .prototype .getVersion,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "providerUrl",
 {
    get: X3DBrowser .prototype .getProviderUrl,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentFrameRate",
 {
    get: X3DBrowser .prototype .getCurrentFrameRate,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentSpeed",
 {
    get: X3DBrowser .prototype .getCurrentSpeed,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "description",
@@ -864,7 +859,6 @@ Object .defineProperty (X3DBrowser .prototype, "description",
    get: X3DBrowser .prototype .getDescription,
    set: X3DBrowser .prototype .setDescription,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "baseURL",
@@ -872,7 +866,6 @@ Object .defineProperty (X3DBrowser .prototype, "baseURL",
    get: X3DBrowser .prototype .getBaseURL,
    set: X3DBrowser .prototype .setBaseURL,
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentScene",
@@ -882,7 +875,6 @@ Object .defineProperty (X3DBrowser .prototype, "currentScene",
       return this .getScriptStack () .at (-1) .getExecutionContext ();
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "supportedProfiles",
@@ -892,7 +884,6 @@ Object .defineProperty (X3DBrowser .prototype, "supportedProfiles",
       return SupportedProfiles;
    },
    enumerable: true,
-   configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "supportedComponents",
@@ -902,7 +893,6 @@ Object .defineProperty (X3DBrowser .prototype, "supportedComponents",
       return SupportedComponents;
    },
    enumerable: true,
-   configurable: false
 });
 
 export default X3DBrowser;

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -390,7 +390,6 @@ Object .assign (X3DBrowserContext,
          Object .defineProperty (X3DBrowserContext .prototype, key,
          {
             value: browserContext .prototype [key],
-            enumerable: false,
             writable: true,
          });
       }

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;