x_ite 8.7.8 → 8.8.0

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

@@ -57,22 +57,9 @@ function BrowserTimings (executionContext)
    this .fps           = new StopWatch ();
 }
 
-BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
+Object .assign (Object .setPrototypeOf (BrowserTimings .prototype, X3DBaseNode .prototype),
 {
-   constructor: BrowserTimings,
-   getTypeName: function ()
-   {
-      return "BrowserTimings";
-   },
-   getComponentName: function ()
-   {
-      return "X_ITE";
-   },
-   getContainerField: function ()
-   {
-      return "browserTimings";
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DBaseNode .prototype .initialize .call (this);
 
@@ -176,7 +163,7 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
       this .set_type__ ();
    },
-   set_enabled__: function ()
+   set_enabled__ ()
    {
       if (this .getBrowser () .getBrowserOption ("Timings"))
       {
@@ -192,7 +179,7 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
          this .getBrowser () .prepareEvents () .removeInterest ("update", this);
       }
    },
-   set_type__: function ()
+   set_type__ ()
    {
       if (this .localStorage .type === "MORE")
       {
@@ -210,14 +197,14 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       this .set_button__ ();
       this .build ();
    },
-   set_button__: function ()
+   set_button__ ()
    {
       if (this .localStorage .type === "MORE")
          this .button .text (_("Less Properties"));
       else
          this .button .text (_("More Properties"));
    },
-   update: function ()
+   update ()
    {
       this .fps .stop ()
 
@@ -229,12 +216,12 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
       this .fps .start ();
    },
-   build: function ()
+   build ()
    {
       const browser = this .getBrowser ();
 
-      this .frameRate .text (f2(1000 / this .fps .averageTime) + " " + _("fps"));
-      this .speed .text (f2(this .getSpeed (browser .currentSpeed)) + " " + this .getSpeedUnit (browser .currentSpeed));
+      this .frameRate .text (`${f2 (1000 / this .fps .averageTime)} ${_("fps")}`);
+      this .speed .text (`${f2 (this .getSpeed (browser .currentSpeed))} ${this .getSpeedUnit (browser .currentSpeed)}`);
 
       if (this .localStorage .type !== "MORE" || !browser .getWorld ())
          return;
@@ -250,15 +237,15 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
          opaqueShapes      = layers .reduce ((n, layer) => n + layer .getNumOpaqueShapes (), 0),
          transparentShapes = layers .reduce ((n, layer) => n + layer .getNumTransparentShapes (), 0);
 
-      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 .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);
 
       browser .getSystemTime ()    .reset ();
@@ -271,14 +258,14 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
       activeLayer ?.getCollisionTime () .reset ();
    },
-   getSpeed: function (speed)
+   getSpeed (speed)
    {
       if (speed < 15)
          return speed;
 
       return speed * 3.6;
    },
-   getSpeedUnit: function (speed)
+   getSpeedUnit (speed)
    {
       if (speed < 15)
          return _("m/s");
@@ -287,6 +274,15 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    },
 });
 
+Object .defineProperties (BrowserTimings,
+{
+   typeName:
+   {
+      value: "BrowserTimings",
+      enumerable: true,
+   },
+});
+
 const f2 = (function ()
 {
    const format = new Intl .NumberFormat (navigator .language || navigator .userLanguage, {

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

@@ -45,7 +45,7 @@
  *
  ******************************************************************************/
 
-import DEBUG from "../../DEBUG.js";
+import DEVELOPMENT from "../../DEVELOPMENT.js";
 
 const extensions = [
    "ANGLE_instanced_arrays",
@@ -106,13 +106,13 @@ const extensions = [
 
 const Context =
 {
-   create: function (canvas, version, preserveDrawingBuffer)
+   create (canvas, version, preserveDrawingBuffer)
    {
       const options = { preserveDrawingBuffer: preserveDrawingBuffer };
 
       let gl = null;
 
-      if (version >= 2 && ! gl)
+      if (version >= 2 && !gl)
       {
          gl = canvas .getContext ("webgl2", { ... options, antialias: false });
 
@@ -120,7 +120,7 @@ const Context =
             gl .getVersion = function () { return 2; };
       }
 
-      if (version >= 1 && ! gl)
+      if (version >= 1 && !gl)
       {
          gl = canvas .getContext ("webgl",              options) ||
               canvas .getContext ("experimental-webgl", options);
@@ -140,7 +140,7 @@ const Context =
          }
       }
 
-      if (! gl)
+      if (!gl)
          throw new Error ("Couldn't create WebGL context.");
 
       // Feature detection:
@@ -155,7 +155,7 @@ const Context =
          gl .lineWidth                     = Function .prototype;
          gl .HAS_FEATURE_TRANSFORMED_LINES = gl .getVersion () >= 2;
 
-         if (DEBUG)
+         if (DEVELOPMENT)
             console .info ("Lines are transformed if necessary to obtain thick lines.");
       }
       else
@@ -199,7 +199,7 @@ const Context =
       }
       :
       {
-         clientWaitAsync: function (sync, flags, timeout)
+         clientWaitAsync (sync, flags, timeout)
          {
             return new Promise ((resolve, reject) =>
             {

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

@@ -59,22 +59,9 @@ function ContextMenu (executionContext)
    this [_userMenu] = null;
 }
 
-ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
+Object .assign (Object .setPrototypeOf (ContextMenu .prototype, X3DBaseNode .prototype),
 {
-   constructor: ContextMenu,
-   getTypeName: function ()
-   {
-      return "ContextMenu";
-   },
-   getComponentName: function ()
-   {
-      return "X_ITE";
-   },
-   getContainerField: function ()
-   {
-      return "contextMenu";
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DBaseNode .prototype .initialize .call (this);
 
@@ -87,15 +74,15 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
          animation: {duration: 500, show: "fadeIn", hide: "fadeOut"},
       });
    },
-   getUserMenu: function ()
+   getUserMenu ()
    {
       return this [_userMenu];
    },
-   setUserMenu: function (userMenu)
+   setUserMenu (userMenu)
    {
       this [_userMenu] = userMenu;
    },
-   createUserMenu: function ()
+   createUserMenu ()
    {
       const userMenu = { };
 
@@ -112,7 +99,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       return userMenu;
    },
-   build: function (event)
+   build (event)
    {
       const
          browser    = this .getBrowser (),
@@ -143,7 +130,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                type: "checkbox",
                selected: browser .getBrowserOption ("StraightenHorizon"),
                events: {
-                  click: function (event)
+                  click: (event) =>
                   {
                      const straightenHorizon = $(event .target) .is (":checked");
 
@@ -153,8 +140,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                         browser .getNotification () ._string = _("Straighten Horizon") + ": " + _("on");
                      else
                         browser .getNotification () ._string = _("Straighten Horizon") + ": " + _("off");
-                  }
-                  .bind (this),
+                  },
                },
             },
             "display-rubberband": {
@@ -162,7 +148,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                type: "checkbox",
                selected: browser .getBrowserOption ("Rubberband"),
                events: {
-                  click: function (event)
+                  click: (event) =>
                   {
                      const rubberband = $(event .target) .is (":checked");
 
@@ -172,8 +158,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                         browser .getNotification () ._string = _("Rubberband") + ": " + _("on");
                      else
                         browser .getNotification () ._string = _("Rubberband") + ": " + _("off");
-                  }
-                  .bind (this),
+                  },
                },
             },
             "separator1": "--------",
@@ -187,12 +172,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "primitive-quality",
                      selected: browser .getBrowserOption ("PrimitiveQuality") === "HIGH",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("PrimitiveQuality", "HIGH");
                            browser .getNotification () ._string = _("Primitive Quality") + ": " + _("high");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "medium": {
@@ -201,12 +185,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "primitive-quality",
                      selected: browser .getBrowserOption ("PrimitiveQuality") === "MEDIUM",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("PrimitiveQuality", "MEDIUM");
                            browser .getNotification () ._string = _("Primitive Quality") + ": " + _("medium");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "low": {
@@ -215,12 +198,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "primitive-quality",
                      selected: browser .getBrowserOption ("PrimitiveQuality") === "LOW",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("PrimitiveQuality", "LOW");
                            browser .getNotification () ._string = _("Primitive Quality") + ": " + _("low");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                },
@@ -235,12 +217,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "texture-quality",
                      selected: browser .getBrowserOption ("TextureQuality") === "HIGH",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("TextureQuality", "HIGH");
                            browser .getNotification () ._string = _("Texture Quality") + ": " + _("high");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "medium": {
@@ -249,12 +230,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "texture-quality",
                      selected: browser .getBrowserOption ("TextureQuality") === "MEDIUM",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("TextureQuality", "MEDIUM");
                            browser .getNotification () ._string = _("Texture Quality") + ": " + _("medium");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "low": {
@@ -263,12 +243,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "texture-quality",
                      selected: browser .getBrowserOption ("TextureQuality") === "LOW",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("TextureQuality", "LOW");
                            browser .getNotification () ._string = _("Texture Quality") + ": " + _("low");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                },
@@ -283,12 +262,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "shading",
                      selected: browser .getBrowserOption ("Shading") === "POINT",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("Shading", "POINT");
                            browser .getNotification () ._string = _("Shading") + ": " + _("Points");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "wireframe": {
@@ -297,12 +275,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "shading",
                      selected: browser .getBrowserOption ("Shading") === "WIREFRAME",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("Shading", "WIREFRAME");
                            browser .getNotification () ._string = _("Shading") + ": " + _("Wireframe");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "flat": {
@@ -311,12 +288,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "shading",
                      selected: browser .getBrowserOption ("Shading") === "FLAT",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("Shading", "FLAT");
                            browser .getNotification () ._string = _("Shading") + ": " + _("Flat");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "gouraud": {
@@ -325,12 +301,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "shading",
                      selected: browser .getBrowserOption ("Shading") === "GOURAUD",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("Shading", "GOURAUD");
                            browser .getNotification () ._string = _("Shading") + ": " + _("Gouraud");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                   "phong": {
@@ -339,12 +314,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                      radio: "shading",
                      selected: browser .getBrowserOption ("Shading") === "PHONG",
                      events: {
-                        click: function ()
+                        click: () =>
                         {
                            browser .setBrowserOption ("Shading", "PHONG");
                            browser .getNotification () ._string = _("Shading") + ": " + _("Phong");
-                        }
-                        .bind (this),
+                        },
                      },
                   },
                },
@@ -355,12 +329,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                type: "checkbox",
                selected: browser .getBrowserOption ("Timings"),
                events: {
-                  click: function (event)
+                  click: (event) =>
                   {
                      browser .setBrowserOption ("Timings", $(event .target) .is (":checked"));
                      browser .getSurface () .focus ();
-                  }
-                  .bind (this),
+                  },
                },
             },
             "fullscreen": {
@@ -368,11 +341,10 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
                className: "context-menu-icon " + (fullscreen
                   ? "x_ite-private-icon-leave-fullscreen"
                   : "x_ite-private-icon-enter-fullscreen"),
-               callback: function ()
+               callback: () =>
                {
                   browser .getElement () .toggleFullScreen ();
-               }
-               .bind (this),
+               },
             },
             "separator3": "--------",
          },
@@ -385,7 +357,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
          "world-info": {
             name: _("Show World Info"),
             className: "context-menu-icon x_ite-private-icon-world-info",
-            callback: function ()
+            callback ()
             {
                browser .getShadow () .find (".x_ite-private-world-info") .remove ();
 
@@ -426,7 +398,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
          "about": {
             name: _("About X_ITE"),
             className: "context-menu-icon x_ite-private-icon-help-about",
-            callback: function ()
+            callback ()
             {
                window .open (browser .getProviderUrl ());
             },
@@ -460,7 +432,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       return menu;
    },
-   getViewpoints: function ()
+   getViewpoints ()
    {
       const
          browser     = this .getBrowser (),
@@ -488,12 +460,11 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
          const item = {
             name: description,
-            callback: function (viewpoint)
+            callback: () =>
             {
                browser .bindViewpoint (browser .getActiveLayer (), viewpoint);
                browser .getSurface () .focus ();
-            }
-            .bind (this, viewpoint),
+            },
          };
 
          if (viewpoint === currentViewpoint)
@@ -504,7 +475,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       return menu;
    },
-   getAvailableViewers: function ()
+   getAvailableViewers ()
    {
       const
          browser          = this .getBrowser (),
@@ -517,13 +488,12 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
          menu [viewer] = {
             name: _(this .getViewerName (viewer)),
             className: "context-menu-icon x_ite-private-icon-" + viewer .toLowerCase () + "-viewer",
-            callback: function (viewer)
+            callback: () =>
             {
                browser ._viewer = viewer;
                browser .getNotification () ._string = _(this .getViewerName (viewer));
                browser .getSurface () .focus ();
-            }
-            .bind (this, viewer),
+            },
          };
 
          if (viewer === currentViewer)
@@ -532,7 +502,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       return menu;
    },
-   getViewerName: function (viewer)
+   getViewerName (viewer)
    {
       switch (viewer)
       {
@@ -550,17 +520,17 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
             return _("None Viewer");
       }
    },
-   init: function (options)
+   init (options)
    {
       this .show = this .createRoot .bind (this, options);
 
       options .element .on ("contextmenu", this .show);
    },
-   show: function (event)
+   show (event)
    { },
-   hide: function (event)
+   hide (event)
    { },
-   createRoot: function (options, event)
+   createRoot (options, event)
    {
       const
          menu  = options .build (event),
@@ -575,7 +545,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
          .addClass (menu .className)
          .appendTo (options .appendTo);
 
-      const hide = this .hide = function ()
+      const hide = this .hide = () =>
       {
          delete this .hide;
 
@@ -590,8 +560,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
          });
 
          return false;
-      }
-      .bind (this);
+      };
 
       // Menu
 
@@ -669,7 +638,7 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
 
       return false;
    },
-   createItem: function (item, parent, key, level, hide)
+   createItem (item, parent, key, level, hide)
    {
       const li = $("<li></li>") .addClass ("context-menu-item");
 
@@ -748,4 +717,13 @@ ContextMenu .prototype = Object .assign (Object .create (X3DBaseNode .prototype)
    },
 });
 
+Object .defineProperties (ContextMenu,
+{
+   typeName:
+   {
+      value: "ContextMenu",
+      enumerable: true,
+   },
+});
+
 export default ContextMenu;

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

@@ -68,18 +68,9 @@ function Notification (executionContext)
    this .addChildObjects ("string", new SFString ());
 }
 
-Notification .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
+Object .assign (Object .setPrototypeOf (Notification .prototype, X3DBaseNode .prototype),
 {
-   constructor: Notification,
-   getTypeName: function ()
-   {
-      return "Notification";
-   },
-   getComponentName: function ()
-   {
-      return "X_ITE";
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DBaseNode .prototype .initialize .call (this);
 
@@ -93,7 +84,7 @@ Notification .prototype = Object .assign (Object .create (X3DBaseNode .prototype
 
       this ._string .addInterest ("set_string__", this);
    },
-   set_string__: function ()
+   set_string__ ()
    {
       if (! this .getBrowser () .getBrowserOption ("Notifications"))
          return;
@@ -113,4 +104,13 @@ Notification .prototype = Object .assign (Object .create (X3DBaseNode .prototype
    },
 });
 
+Object .defineProperties (Notification,
+{
+   typeName:
+   {
+      value: "Notification",
+      enumerable: true,
+   },
+});
+
 export default Notification;