x_ite 8.6.10 → 8.6.12

package/src/x_ite/Base/X3DObject.js

@@ -51,7 +51,8 @@ import MapUtilities from "../../standard/Utility/MapUtilities.js";
 const
    _name      = Symbol (),
    _interests = Symbol (),
-   _values    = Symbol ();
+   _values    = Symbol (),
+   _userData  = Symbol ();
 
 function X3DObject () { }
 
@@ -61,6 +62,7 @@ X3DObject .prototype =
    [_name]: "",
    [_interests]: new Map (),
    [_values]: [ ],
+   [_userData]: new Map (),
    getId: function ()
    {
       return X3DObject .getId (this);
@@ -122,6 +124,17 @@ X3DObject .prototype =
             interest ();
       }
    },
+   getUserData: function (key)
+   {
+      return this [_userData] .get (key);
+   },
+   setUserData: function (key, value)
+   {
+      if (this [_userData] === X3DObject .prototype [_userData])
+         this [_userData] = new Map ();
+
+      this [_userData] .set (key, value);
+   },
    toString: function (options = Object .prototype)
    {
       const generator = new Generator (options);

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

@@ -91,6 +91,7 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       new X3DFieldDefinition (X3DConstants .inputOutput, "LogarithmicDepthBuffer", new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Notifications",          new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Multisampling",          new Fields .SFInt32 (4)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "OptimizeStaticGroup",    new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "StraightenHorizon",      new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Timings",                new Fields .SFBool ()),
    ]),
@@ -133,7 +134,7 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    },
    configure: (function ()
    {
-      const globals = new Set ([
+      const attributes = new Set ([
          "Antialiased",
          "Cache",
          "ContentScale",
@@ -144,6 +145,14 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
          "SplashScreen",
       ]);
 
+      const restorable = new Set ([
+         "PrimitiveQuality",
+         "Rubberband",
+         "StraightenHorizon",
+         "TextureQuality",
+         "Timings",
+      ]);
+
       return function ()
       {
          const
@@ -152,15 +161,28 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
          for (const { name, value } of this .getFieldDefinitions ())
          {
-            if (globals .has (name))
+            if (attributes .has (name))
             {
-               const attribute = name [0] .toLowerCase () + name .slice (1);
-               browser .attributeChangedCallback (attribute, null, browser .getElement () .attr (name));
+               const
+                  attribute = $.toLowerCaseFirst (name),
+                  value     = browser .getElement () .attr (attribute);
+
+               browser .attributeChangedCallback (attribute, null, value);
+
                continue;
             }
 
-            if (localStorage [name] !== undefined)
+            if (restorable .has (name))
+            {
+               const
+                  value = localStorage [name],
+                  field = this .getField (name);
+
+               if (value !== field .getValue ())
+                  field .setValue (value);
+
                continue;
+            }
 
             const field = this .getField (name);
 
@@ -169,28 +191,6 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
             field .assign (value);
          }
-
-         const
-            rubberband        = localStorage .Rubberband,
-            primitiveQuality  = localStorage .PrimitiveQuality,
-            textureQuality    = localStorage .TextureQuality,
-            straightenHorizon = localStorage .StraightenHorizon,
-            timings           = localStorage .Timings;
-
-         if (rubberband !== this ._Rubberband .getValue ())
-            this ._Rubberband = rubberband;
-
-         if (primitiveQuality !== this ._PrimitiveQuality .getValue ())
-            this ._PrimitiveQuality = primitiveQuality;
-
-         if (textureQuality !== this ._TextureQuality .getValue ())
-            this ._TextureQuality = textureQuality;
-
-         if (straightenHorizon !== this ._StraightenHorizon .getValue ())
-            this ._StraightenHorizon = straightenHorizon;
-
-         if (timings !== this ._Timings .getValue ())
-            this ._Timings = timings;
       };
    })(),
    getPrimitiveQuality: function ()
@@ -323,8 +323,6 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    set_timings__: function (timings)
    {
       this .localStorage .Timings = timings .getValue ();
-
-      this .getBrowser () .getBrowserTimings () .setEnabled (timings .getValue ());
    },
 });
 

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

@@ -54,7 +54,6 @@ function BrowserTimings (executionContext)
    X3DBaseNode .call (this, executionContext);
 
    this .localStorage  = this .getBrowser () .getLocalStorage () .addNameSpace ("BrowserTimings.");
-   this .enabled       = false;
    this .fps           = new StopWatch ();
    this .localeOptions = { minimumFractionDigits: 2, maximumFractionDigits: 2 };
 }
@@ -78,6 +77,8 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    {
       X3DBaseNode .prototype .initialize .call (this);
 
+      this .getBrowser () .getBrowserOptions () ._Timings .addInterest ("set_enabled__", this);
+
       this .localStorage .addDefaultValues ({ type: "LESS" });
 
       this .element = $("<div></div>") .hide () .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getSurface ());
@@ -92,18 +93,9 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
       this .set_button__ ();
    },
-   getEnabled: function ()
-   {
-      return this .enabled;
-   },
-   setEnabled: function (enabled)
+   set_enabled__: function ()
    {
-      if (this .enabled === enabled)
-         return;
-
-      this .enabled = enabled;
-
-      if (enabled)
+      if (this .getBrowser () .getBrowserOption ("Timings"))
       {
          this .element .stop (true, true) .fadeIn ();
          this .fps .reset ();

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

@@ -227,7 +227,7 @@ const Context =
                   }
                };
 
-               check ();
+               setTimeout (check, 0);
             });
          },
          getBufferSubDataAsync: async function (target, buffer, srcByteOffset, dstBuffer, /* optional */ dstOffset, /* optional */ length)

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

@@ -325,6 +325,11 @@ X3DCoreContext .prototype =
             this .loadURL (new Fields .MFString (newValue), new Fields .MFString ());
             break;
          }
+         case "timings":
+         {
+            this .setBrowserOption ("Timings", this .parseBooleanAttribute (newValue, false));
+            break;
+         }
          case "url":
          {
             this .loadURL (this .parseUrlAttribute (newValue), new Fields .MFString ());

package/src/x_ite/Browser/Navigation/X3DFlyViewer.js

@@ -184,7 +184,7 @@ X3DFlyViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
                this .addFly ();
 
                if (this .getBrowser () .getBrowserOption ("Rubberband"))
-                  this .getBrowser () .finished () .addInterest ("display", this, MOVE);
+                  this .getBrowser () .finishedEvents () .addInterest ("display", this, MOVE);
             }
 
             this ._isActive = true;
@@ -215,7 +215,7 @@ X3DFlyViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
             this .addPan ();
 
             if (this .getBrowser () .getBrowserOption ("Rubberband"))
-               this .getBrowser () .finished () .addInterest ("display", this, PAN);
+               this .getBrowser () .finishedEvents () .addInterest ("display", this, PAN);
 
             this ._isActive = true;
             break;
@@ -704,7 +704,7 @@ X3DFlyViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
 
       browser .prepareEvents () .removeInterest ("fly", this);
       browser .prepareEvents () .removeInterest ("pan", this);
-      browser .finished ()      .removeInterest ("display", this);
+      browser .finishedEvents ()      .removeInterest ("display", this);
 
       this .orientationChaser ._value_changed .removeInterest ("set_orientationOffset__", this);
 

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

@@ -55,7 +55,8 @@ const
    _loadingObjects = Symbol (),
    _loading        = Symbol (),
    _location       = Symbol (),
-   _defaultScene   = Symbol ();
+   _defaultScene   = Symbol (),
+   _set_loadCount  = Symbol ();
 
 function getBaseURI (element)
 {
@@ -82,7 +83,9 @@ function X3DNetworkingContext ()
 X3DNetworkingContext .prototype =
 {
    initialize: function ()
-   { },
+   {
+      this ._loadCount .addInterest (_set_loadCount, this);
+   },
    getProviderUrl: function ()
    {
       return URLs .getProviderUrl ();
@@ -163,12 +166,25 @@ X3DNetworkingContext .prototype =
    setLoadCount: function (value)
    {
       this ._loadCount = value;
+   },
+   resetLoadCount: function ()
+   {
+      this ._loadCount       = 0;
+      this [_loadingDisplay] = 0;
+      this [_loadingTotal]   = 0;
+
+      this [_loadingObjects] .clear ();
 
+      for (const object of this .getPrivateScene () .getLoadingObjects ())
+         this .addLoadingObject (object);
+   },
+   [_set_loadCount]: function ()
+   {
       const loadingDisplay = [... this [_loadingObjects]]
          .filter (o => o .isPrivate)
          .reduce ((v, o) => v + !o .isPrivate (), 0);
 
-      if (value || this [_loading])
+      if (this ._loadCount .getValue () || this [_loading])
       {
          var string = ((loadingDisplay || 1) === 1
             ? _ ("Loading %1 file")
@@ -184,7 +200,7 @@ X3DNetworkingContext .prototype =
       {
          this .getSplashScreen () .find (".x_ite-private-spinner-text") .text (string);
          this .getSplashScreen () .find (".x_ite-private-progressbar div")
-            .css ("width", (100 - 100 * value / this [_loadingTotal]) + "%");
+            .css ("width", (100 - 100 * this ._loadCount .getValue () / this [_loadingTotal]) + "%");
       }
       else
       {
@@ -194,17 +210,6 @@ X3DNetworkingContext .prototype =
 
       this [_loadingDisplay] = loadingDisplay;
    },
-   resetLoadCount: function ()
-   {
-      this ._loadCount       = 0;
-      this [_loadingDisplay] = 0;
-      this [_loadingTotal]   = 0;
-
-      this [_loadingObjects] .clear ();
-
-      for (const object of this .getPrivateScene () .getLoadingObjects ())
-         this .addLoadingObject (object);
-   },
 };
 
 export default X3DNetworkingContext;

package/src/x_ite/Browser/PointingDeviceSensor/PointingDevice.js

@@ -124,7 +124,7 @@ PointingDevice .prototype = Object .assign (Object .create (X3DBaseNode .prototy
             event .stopImmediatePropagation (); // Keeps the rest of the handlers from being executed
 
             browser .setCursor ("HAND");
-            browser .finished () .addInterest ("onverifymotion", this, x, y);
+            browser .finishedEvents () .addInterest ("onverifymotion", this, x, y);
          }
       }
    },
@@ -145,7 +145,7 @@ PointingDevice .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
          browser .buttonReleaseEvent ();
          browser .setCursor (this .isOver ? "HAND" : "DEFAULT");
-         browser .finished () .addInterest ("onverifymotion", this, x, y);
+         browser .finishedEvents () .addInterest ("onverifymotion", this, x, y);
          browser .addBrowserEvent ();
 
          this .cursor = "DEFAULT";
@@ -272,7 +272,7 @@ PointingDevice .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       // and the new child has a sensor node inside. This sensor node must be update to
       // reflect the correct isOver state.
 
-      this .getBrowser () .finished () .removeInterest ("onverifymotion", this);
+      this .getBrowser () .finishedEvents () .removeInterest ("onverifymotion", this);
 
       this .onmotion (x, y);
    },

package/src/x_ite/Browser/Rendering/GeometryContext.js

@@ -46,11 +46,13 @@
  ******************************************************************************/
 
 import X3DGeometryNode from "../../Components/Rendering/X3DGeometryNode.js";
+import AlphaMode       from "../Shape/AlphaMode.js";
 
 function GeometryContext (options = { })
 {
    Object .assign (this,
    {
+      alphaMode: AlphaMode .OPAQUE,
       geometryType: 3,
       hasFogCoords: false,
       colorMaterial: false,

package/src/x_ite/Browser/Shape/AlphaMode.js

@@ -49,7 +49,7 @@ let i = 0;
 
 const AlphaMode =
 {
-   AUTO:   i ++,
+   AUTO:   i ++, // Must be zero!
    OPAQUE: i ++,
    MASK:   i ++,
    BLEND:  i ++,

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.10";
+export default "8.6.12";

package/src/x_ite/Browser/X3DBrowser.js

@@ -186,8 +186,8 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    getComponent: function (name, level)
    {
-      name  = String (name);
-      level = ~~level;
+      name   = String (name);
+      level |= 0;
 
       const component = SupportedComponents .get (name);
 
@@ -813,14 +813,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    beginUpdate: function ()
    {
       this .setLive (true);
-      this .getExecutionContext () .setLive (true);
+      this .getExecutionContext () .beginUpdate ();
       this .advanceTime ();
       this .addBrowserEvent ();
    },
    endUpdate: function ()
    {
       this .setLive (false);
-      this .getExecutionContext () .setLive (false);
+      this .getExecutionContext () .endUpdate ();
    },
    print: function ()
    {

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -114,12 +114,13 @@ function X3DBrowserContext (element)
    for (const browserContext of browserContexts)
       browserContext .call (this);
 
-   this .addChildObjects ("initialized",   new SFTime (),
-                          "shutdown",      new SFTime (),
-                          "prepareEvents", new SFTime (),
-                          "timeEvents",    new SFTime (),
-                          "sensorEvents",  new SFTime (),
-                          "finished",      new SFTime ());
+   this .addChildObjects ("initialized",    new SFTime (),
+                          "shutdown",       new SFTime (),
+                          "prepareEvents",  new SFTime (),
+                          "timeEvents",     new SFTime (),
+                          "sensorEvents",   new SFTime (),
+                          "displayEvents",  new SFTime (),
+                          "finishedEvents", new SFTime ());
 
    this [_changedTime]     = 0;
    this [_previousTime]    = 0;
@@ -204,9 +205,13 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
    {
       return this ._sensorEvents;
    },
-   finished: function ()
+   displayEvents: function ()
    {
-      return this ._finished;
+      return this ._displayEvents;
+   },
+   finishedEvents: function ()
+   {
+      return this ._finishedEvents;
    },
    getBrowser: function ()
    {
@@ -267,10 +272,10 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Events
 
-      this ._prepareEvents .processInterests ();
+      this .addTaintedField (this ._prepareEvents);
       this [_processEvents] ();
 
-      this ._timeEvents .processInterests ();
+      this .addTaintedField (this ._timeEvents);
       this [_processEvents] ();
 
       // Camera
@@ -290,13 +295,16 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Events
 
-      this ._sensorEvents .processInterests ();
+      this .addTaintedField (this ._sensorEvents);
       this [_processEvents] ();
 
       // Display
 
       this [_displayTime] .start ()
 
+      this .addTaintedField (this ._displayEvents);
+      this [_processEvents] ();
+
       const gl = this .getContext ();
 
       this .getFrameBuffer () .bind ();
@@ -312,7 +320,8 @@ X3DBrowserContext .prototype = Object .assign (Object .create (X3DBaseNode .prot
 
       // Finish
 
-      this ._finished .processInterests ();
+      this .addTaintedField (this ._finishedEvents);
+      this [_processEvents] ();
 
       this [_browserTime] .stop ();
       this [_systemTime] .start ();

package/src/x_ite/Components/CADGeometry/CADFace.js

@@ -102,14 +102,7 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
    getBBox: function (bbox, shadows)
    {
       if (this ._bboxSize .getValue () .equals (this .getDefaultBBoxSize ()))
-      {
-         const boundedObject = this .visibleNode;
-
-         if (boundedObject)
-            return boundedObject .getBBox (bbox, shadows);
-
-         return bbox .set ();
-      }
+         return this .visibleNode?.getBBox (bbox, shadows) ?? bbox .set ();
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
    },
@@ -173,11 +166,11 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_transformSensors__: function ()
    {
-      this .setPickableObject (!!(this .visibleNode && this .visibleNode .isPickableObject ()));
+      this .setPickableObject (!!this .visibleNode?.isPickableObject ());
    },
    set_visible__: function ()
    {
@@ -204,11 +197,7 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
          case TraverseType .CAMERA:
          case TraverseType .SHADOW:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
+            this .visibleNode?.traverse (type, renderObject);
             return;
          }
          case TraverseType .PICKING:
@@ -219,34 +208,21 @@ CADFace .prototype = Object .assign (Object .create (X3DProductStructureChildNod
 
             pickingHierarchy .push (this);
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             pickingHierarchy .pop ();
             return;
          }
          case TraverseType .COLLISION:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
             return;
          }
          case TraverseType .DISPLAY:
          {
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
-            const boundedObject = this .boundedObject;
-
-            if (boundedObject)
-               boundedObject .displayBBox (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
+            this .boundedObject?.displayBBox (type, renderObject);
             return;
          }
       }

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

@@ -651,7 +651,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                         case X3DConstants .SFNode:
                         case X3DConstants .MFNode:
                         {
-                           generator .PushContainerField (field);
+                           generator .PushContainerField (null);
 
                            generator .string += ">";
                            generator .string += generator .TidyBreak ();

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

@@ -533,7 +533,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                   {
                      if (field .getValue () !== null)
                      {
-                        generator .PushContainerField (field);
+                        generator .PushContainerField (null);
 
                         generator .string += generator .Indent ();
                         generator .string += "<fieldValue";