x_ite 8.6.13 → 8.6.14

package/docs/_config.yml

@@ -20,8 +20,8 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.6.13                         # x_ite latest version
-size: 289                              # size in kb
+version: 8.6.14                         # x_ite latest version
+size: 290                              # size in kb
 x3d_latest_version: 4.0                # x3d latest version
 
 tagline: Step Into The Future          # it will display as the sub-title

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.6.13",
+	"version": "8.6.14",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",

package/src/standard/Math/Numbers/Matrix2.js

@@ -145,7 +145,7 @@ Matrix2 .prototype =
    inverse: function ()
    {
       const
-         { 0: A, 1: B, 2: C, 3: D } = this [3],
+         { 0: A, 1: B, 2: C, 3: D } = this,
          d = A * D - B * C;
 
       // if (d === 0) ... determinant is zero.
@@ -189,9 +189,9 @@ Matrix2 .prototype =
       {
          const
             x = vector,
-            w = x * this [2] + this [3];
+            w = x * this [1] + this [3];
 
-         return (x * this [0] + this [1]) / w;
+         return (x * this [0] + this [2]) / w;
       }
       else
       {

package/src/standard/Math/Numbers/Vector4.js

@@ -101,6 +101,7 @@ Vector4 .prototype =
       vector .x = this .x / this .w;
       vector .y = this .y / this .w;
       vector .z = this .z / this .w;
+      return vector;
    },
    negate: function ()
    {

package/src/x_ite/Base/X3DBaseNode.js

@@ -61,10 +61,10 @@ const
    _predefinedFields  = Symbol (),
    _aliases           = Symbol (),
    _userDefinedFields = Symbol (),
+   _childObjects      = Symbol (),
    _initialized       = Symbol (),
    _live              = Symbol (),
    _set_live__        = Symbol ("X3DBaseNode.set_live__"),
-   _private           = Symbol (),
    _cloneCount        = Symbol ();
 
 function X3DBaseNode (executionContext)
@@ -80,23 +80,24 @@ function X3DBaseNode (executionContext)
    this [_predefinedFields]  = new FieldArray ();
    this [_aliases]           = new Map ();
    this [_userDefinedFields] = new FieldArray ();
+   this [_childObjects]      = [ ];
    this [_live]              = true;
    this [_initialized]       = false;
-   this [_private]           = false;
    this [_cloneCount]        = 0;
 
    // Setup fields.
 
+   this .addChildObjects ("name_changed",       new Fields .SFTime (),
+                          "typeName_changed",   new Fields .SFTime (),
+                          "fields_changed",     new Fields .SFTime (),
+                          "cloneCount_changed", new Fields .SFTime (),
+                          "private",            new Fields .SFBool ())
+
    if (this .canUserDefinedFields ())
       this [_fieldDefinitions] = new FieldDefinitionArray (this [_fieldDefinitions]);
 
    for (const fieldDefinition of this [_fieldDefinitions])
       this .addField (fieldDefinition);
-
-   this .addChildObjects ("name_changed",       new Fields .SFTime (),
-                          "typeName_changed",   new Fields .SFTime (),
-                          "fields_changed",     new Fields .SFTime (),
-                          "cloneCount_changed", new Fields .SFTime ())
 }
 
 X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototype),
@@ -149,19 +150,26 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    {
       return this;
    },
-   beginUpdate: function ()
+   isLive: function ()
    {
-      this .setLive (true);
+      ///  Returns the own live state of this node.
+
+      return this [_live];
    },
-   endUpdate: function ()
+   setLive: function (value)
    {
-      this .setLive (false);
+      ///  Sets the own live state of this node.  Setting the live state to false
+      ///  temporarily disables this node completely.
+
+      this [_live] = value .valueOf ();
+
+      this [_set_live__] ();
    },
-   isLive: (function ()
+   getLive: (function ()
    {
-      function isLive ()
+      function getLive ()
       {
-         return this ._isLive;
+         return this ._live;
       }
 
       return function ()
@@ -170,80 +178,66 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
 
          // Change function.
 
-         Object .defineProperty (this, "isLive",
+         Object .defineProperty (this, "getLive",
          {
-            value: isLive,
+            value: getLive,
             enumerable: false,
             configurable: true,
          });
 
          // Add isLive event.
 
-         this .addChildObjects ("isLive", new Fields .SFBool (this .getLiveState ()));
+         this .addChildObjects ("live", new Fields .SFBool (this .getLiveState ()));
 
          // Event processing is done manually and immediately, so:
-         this ._isLive .removeParent (this);
+         this ._live .removeParent (this);
 
          // Connect to execution context.
 
          if (this .getOuterNode && this .getOuterNode ())
-            this .getOuterNode () .isLive () .addInterest (_set_live__, this);
+            this .getOuterNode () .getLive () .addInterest (_set_live__, this);
 
          else if (this [_executionContext] !== this)
-            this [_executionContext] .isLive () .addInterest (_set_live__, this);
+            this [_executionContext] .getLive () .addInterest (_set_live__, this);
 
-         // Return field
+         // Return field.
 
-         return this .isLive ();
+         return this ._live;
       };
    })(),
-   setLive: function (value)
-   {
-      ///  Sets the own live state of this node.  Setting the live state to false
-      ///  temporarily disables this node completely.
-
-      this [_live] = value .valueOf ();
-
-      this [_set_live__] ();
-   },
-   getLive: function ()
-   {
-      ///  Returns the own live state of this node.
-
-      return this [_live];
-   },
    getLiveState: function ()
    {
       ///  Determines the live state of this node.
 
-      if (this .getOuterNode && this .getOuterNode ())
-         return this .getLive () && this .getOuterNode () .isLive () .getValue ();
+      if (this .getOuterNode ?.())
+         return this [_live] && this .getOuterNode () .getLive () .getValue ();
 
       else if (this !== this [_executionContext])
-         return this .getLive () && this [_executionContext] .isLive () .getValue ();
+         return this [_live] && this [_executionContext] .getLive () .getValue ();
 
-      return this .getLive ();
+      return this [_live];
    },
    [_set_live__]: function ()
    {
-      const
-         live   = this .getLiveState (),
-         isLive = this .isLive ();
+      const live = this ._live;
+
+      if (!live)
+         return;
 
-      if (live)
+      if (this .getLiveState ())
       {
-         if (isLive .getValue ())
+         if (live .getValue ())
             return;
 
-         isLive .set (true);
-         isLive .processEvent ();
+         live .set (true);
+         live .processEvent ();
       }
       else
       {
-         if (isLive .getValue ())
+         if (live .getValue ())
          {
-            isLive .set (false);
-            isLive .processEvent ();
+            live .set (false);
+            live .processEvent ();
          }
       }
    },
@@ -302,6 +296,8 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    },
    addChildObject: function (name, field)
    {
+      this [_childObjects] .push (field);
+
       field .addParent (this);
       field .setName (name);
 
@@ -545,11 +541,11 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    },
    isPrivate: function ()
    {
-      return this [_private];
+      return this ._private .getValue ();
    },
    setPrivate: function (value)
    {
-      this [_private] = value;
+      this ._private = value;
 
       if (value)
       {
@@ -562,6 +558,10 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
             field .addCloneCount (1);
       }
    },
+   getPrivate: function ()
+   {
+      return this ._private;
+   },
    getCloneCount: function ()
    {
       return this [_cloneCount];
@@ -600,6 +600,11 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    },
    dispose: function ()
    {
+      this .setLive (false);
+
+      for (const field of this [_childObjects])
+         field .dispose ();
+
       for (const field of this .getFields ())
          field .dispose ();
 

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

@@ -92,6 +92,7 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       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, "PrivateSensors",         new Fields .SFBool (false)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "StraightenHorizon",      new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Timings",                new Fields .SFBool ()),
    ]),
@@ -267,7 +268,7 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       this .localStorage .StraightenHorizon = straightenHorizon .getValue ();
 
       if (straightenHorizon .getValue ())
-         this .getBrowser () .getActiveLayer ()?.straightenView ();
+         this .getBrowser () .getActiveLayer () ?.straightenView ();
    },
    updateContentScale: function ()
    {

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

@@ -57,7 +57,6 @@ import Scene               from "../../Execution/Scene.js";
 import DataStorage         from "../../../standard/Utility/DataStorage.js";
 import Vector3             from "../../../standard/Math/Numbers/Vector3.js";
 import _                   from "../../../locale/gettext.js";
-import DEBUG from "../../DEBUG.js";
 
 const WEBGL_LATEST_VERSION = 2;
 
@@ -477,12 +476,12 @@ X3DCoreContext .prototype =
                {
                   event .preventDefault ();
 
-                  if (this .isLive () .getValue ())
+                  if (this .isLive ())
                      this .endUpdate ();
                   else
                      this .beginUpdate ();
 
-                  this .getNotification () ._string = this .isLive () .getValue () ? "Begin Update" : "End Update";
+                  this .getNotification () ._string = this .getLive () .getValue () ? "Begin Update" : "End Update";
                }
             }
 

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

@@ -56,7 +56,6 @@ import TimeSensor           from "../../Components/Time/TimeSensor.js";
 import Vector2              from "../../../standard/Math/Numbers/Vector2.js";
 import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
 import Rotation4            from "../../../standard/Math/Numbers/Rotation4.js";
-import Matrix3              from "../../../standard/Math/Numbers/Matrix3.js";
 
 typeof jquery_mousewheel; // import plugin
 
@@ -254,8 +253,6 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
             event .preventDefault ();
             event .stopImmediatePropagation ();
 
-            const viewpoint = this .getActiveViewpoint ();
-
             this .getBrowser () .setCursor ("DEFAULT");
 
             if (Math .abs (this .rotation .angle) > SPIN_ANGLE && Date .now () - this .motionTime < SPIN_RELEASE_TIME)

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

@@ -50,8 +50,6 @@ import X3DFieldDefinition   from "../../Base/X3DFieldDefinition.js";
 import FieldDefinitionArray from "../../Base/FieldDefinitionArray.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 import X3DFlyViewer         from "./X3DFlyViewer.js";
-import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
-import Rotation4            from "../../../standard/Math/Numbers/Rotation4.js";
 
 function FlyViewer (executionContext, navigationInfo)
 {

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

@@ -83,7 +83,7 @@ function X3DNavigationContext ()
                           "viewer",               new Fields .SFString ("EXAMINE"));
 
    this [_activeCollisions] = new Set ();
-   this [_viewerNode]       = new NoneViewer (this);
+   this [_viewerNode]       = new NoneViewer (this .getPrivateScene ());
 }
 
 X3DNavigationContext .prototype =
@@ -165,8 +165,7 @@ X3DNavigationContext .prototype =
    },
    set_activeNavigationInfo__: function ()
    {
-      if (this ._activeNavigationInfo .getValue ())
-         this ._activeNavigationInfo .getValue () ._viewer .removeFieldInterest (this ._viewer);
+      this ._activeNavigationInfo .getValue () ?._viewer .removeFieldInterest (this ._viewer);
 
       if (this ._activeLayer .getValue ())
       {
@@ -200,33 +199,32 @@ X3DNavigationContext .prototype =
 
       // Create viewer node.
 
-      if (this [_viewerNode])
-         this [_viewerNode] .dispose ();
+      this [_viewerNode] ?.dispose ();
 
       switch (viewer .getValue ())
       {
          case "EXAMINE":
-            this [_viewerNode] = new ExamineViewer (this, navigationInfo);
+            this [_viewerNode] = new ExamineViewer (this .getPrivateScene (), navigationInfo);
             break;
          case "WALK":
-            this [_viewerNode] = new WalkViewer (this, navigationInfo);
+            this [_viewerNode] = new WalkViewer (this .getPrivateScene (), navigationInfo);
             break;
          case "FLY":
-            this [_viewerNode] = new FlyViewer (this, navigationInfo);
+            this [_viewerNode] = new FlyViewer (this .getPrivateScene (), navigationInfo);
             break;
          case "PLANE":
          case "PLANE_create3000.github.io":
          case "PLANE_create3000.de":
-                  this [_viewerNode] = new PlaneViewer (this, navigationInfo);
+            this [_viewerNode] = new PlaneViewer (this .getPrivateScene (), navigationInfo);
             break;
          case "NONE":
-            this [_viewerNode] = new NoneViewer (this, navigationInfo);
+            this [_viewerNode] = new NoneViewer (this .getPrivateScene (), navigationInfo);
             break;
          case "LOOKAT":
-            this [_viewerNode] = new LookAtViewer (this, navigationInfo);
+            this [_viewerNode] = new LookAtViewer (this .getPrivateScene (), navigationInfo);
             break;
          default:
-            this [_viewerNode] = new ExamineViewer (this, navigationInfo);
+            this [_viewerNode] = new ExamineViewer (this .getPrivateScene (), navigationInfo);
             break;
       }
 

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

@@ -55,30 +55,32 @@ import Matrix4        from "../../../standard/Math/Numbers/Matrix4.js";
 import StopWatch      from "../../../standard/Time/StopWatch.js";
 
 const
-   _pointingDevice   = Symbol (),
-   _cursorType       = Symbol (),
-   _pointer          = Symbol (),
-   _hit              = Symbol (),
-   _overSensors      = Symbol (),
-   _activeSensors    = Symbol (),
-   _pointingLayer    = Symbol (),
-   _pointingTime     = Symbol (),
-   _pointingBuffer   = Symbol (),
-   _pointingShaders  = Symbol (),
-   _id               = Symbol (),
-   _pointingContexts = Symbol ();
+   _pointingDevice            = Symbol (),
+   _pointingDeviceSensorNodes = Symbol (),
+   _cursorType                = Symbol (),
+   _pointer                   = Symbol (),
+   _hit                       = Symbol (),
+   _overSensors               = Symbol (),
+   _activeSensors             = Symbol (),
+   _pointingLayer             = Symbol (),
+   _pointingTime              = Symbol (),
+   _pointingBuffer            = Symbol (),
+   _pointingShaders           = Symbol (),
+   _id                        = Symbol (),
+   _pointingContexts          = Symbol ();
 
 function X3DPointingDeviceSensorContext ()
 {
-   this [_pointingDevice]   = new PointingDevice (this);
-   this [_pointer]          = new Vector2 (0, 0);
-   this [_overSensors]      = [ ];
-   this [_activeSensors]    = [ ];
-   this [_pointingLayer]    = null;
-   this [_pointingTime]     = new StopWatch ();
-   this [_pointingBuffer]   = new PointingBuffer (this);
-   this [_pointingShaders]  = new Map ();
-   this [_pointingContexts] = [ ];
+   this [_pointingDevice]            = new PointingDevice (this .getPrivateScene ());
+   this [_pointingDeviceSensorNodes] = new Set ();
+   this [_pointer]                   = new Vector2 (0, 0);
+   this [_overSensors]               = [ ];
+   this [_activeSensors]             = [ ];
+   this [_pointingLayer]             = null;
+   this [_pointingTime]              = new StopWatch ();
+   this [_pointingBuffer]            = new PointingBuffer (this);
+   this [_pointingShaders]           = new Map ();
+   this [_pointingContexts]          = [ ];
 
    this [_hit] = {
       id: 0,
@@ -109,6 +111,14 @@ X3DPointingDeviceSensorContext .prototype =
    {
       return this [_pointingTime];
    },
+   addPointingDeviceSensor: function (node)
+   {
+      this [_pointingDeviceSensorNodes] .add (node);
+   },
+   removePointingDeviceSensor: function (node)
+   {
+      this [_pointingDeviceSensorNodes] .delete (node);
+   },
    setCursor: function (value)
    {
       const div = this .getSurface ();
@@ -171,6 +181,9 @@ X3DPointingDeviceSensorContext .prototype =
    },
    buttonPressEvent: function (x, y)
    {
+      if (!this [_pointingDeviceSensorNodes] .size)
+         return false;
+
       if (!this .touch (x, y))
          return false;
 
@@ -186,6 +199,9 @@ X3DPointingDeviceSensorContext .prototype =
    },
    buttonReleaseEvent: function ()
    {
+      if (!this [_pointingDeviceSensorNodes] .size)
+         return;
+
       for (const sensor of this [_activeSensors])
          sensor .set_active__ (false, null);
 
@@ -194,6 +210,9 @@ X3DPointingDeviceSensorContext .prototype =
    },
    motionNotifyEvent: function (x, y)
    {
+      if (!this [_pointingDeviceSensorNodes] .size)
+         return false;
+
       this .touch (x, y);
       this .motion ();
 

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.13";
+export default "8.6.14";

package/src/x_ite/Browser/VolumeRendering/X3DVolumeRenderingContext.js

@@ -61,7 +61,7 @@ X3DVolumeRenderingContext .prototype =
 {
    getDefaultVoxels: function (executionContext)
    {
-      this [_defaultVoxelsNode] = executionContext .createNode ("PixelTexture3D", false);
+      this [_defaultVoxelsNode] = executionContext .createNode ("PixelTexture3D", { setup: false, warn: false });
       this [_defaultVoxelsNode] ._image = [1, 1, 1, 1, 255];
       this [_defaultVoxelsNode] .repeatS = true;
       this [_defaultVoxelsNode] .repeatT = true;

package/src/x_ite/Browser/X3DBrowser.js

@@ -184,7 +184,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    {
       return SupportedProfiles;
    },
-   getComponent: function (name, level)
+   getComponent: function (name, level = 0)
    {
       name   = String (name);
       level |= 0;
@@ -195,7 +195,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
       {
          return new ComponentInfo ({
             name: name,
-            level: Algorithm .clamp (level, 1, component .level),
+            level: Algorithm .clamp (level || component .level, 1, component .level),
             title: component .title,
             providerUrl: component .providerUrl,
             external: $.data (component, "external"),
@@ -312,8 +312,8 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
             scene = this .createScene ();
 
-            for (const rootNode of rootNodes)
-               scene .isLive () .addInterest (rootNode .getValue () .getExecutionContext () .isLive ());
+            for (const node of rootNodes .filter (node => node))
+               scene .getLive () .addInterest ("setLive", node .getValue () .getExecutionContext ());
 
             scene .setRootNodes (rootNodes);
          }
@@ -323,7 +323,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
          // Detach scene from parent.
 
-         scene .getExecutionContext () .isLive () .removeInterest ("setLive", scene);
+         scene .getExecutionContext () .getLive () .removeInterest ("setLive", scene);
          scene .setExecutionContext (scene);
 
          // Replace.
@@ -339,7 +339,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          this .setExecutionContext (scene);
          this .getWorld () .bindBindables ();
 
-         scene .setLive (this .isLive () .getValue ());
+         scene .setLive (this .isLive ());
       });
    },
    checkLoadCount: function (resolve, loadCount)
@@ -371,9 +371,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       if (!external)
       {
-         currentScene .isLive () .addInterest ("setLive", scene);
+         currentScene .getLive () .addInterest ("setLive", scene);
          scene .setExecutionContext (currentScene);
-         scene .setLive (currentScene .getLive ());
+         scene .setLive (currentScene .isLive ());
       }
 
       return scene;
@@ -410,13 +410,13 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
          if (scene)
          {
-            // Handle isLive for script scenes here:
+            // Handle getLive for script scenes here:
 
             if (!external)
             {
-               currentScene .isLive () .addInterest ("setLive", scene);
+               currentScene .getLive () .addInterest ("setLive", scene);
                scene .setExecutionContext (currentScene);
-               scene .setLive (currentScene .getLive ());
+               scene .setLive (currentScene .isLive ());
             }
 
             // Wait until scene is completely loaded, scene ._loadCount must be 0.
@@ -451,9 +451,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
             {
                if (!external)
                {
-                  currentScene .isLive () .addInterest ("setLive", scene);
+                  currentScene .getLive () .addInterest ("setLive", scene);
                   scene .setExecutionContext (currentScene);
-                  scene .setLive (currentScene .getLive ());
+                  scene .setLive (currentScene .isLive ());
                }
 
                resolve (scene);
@@ -599,9 +599,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       if (!external)
       {
-         currentScene .isLive () .addInterest ("setLive", scene);
+         currentScene .getLive () .addInterest ("setLive", scene);
          scene .setExecutionContext (currentScene);
-         scene .setLive (currentScene .getLive ());
+         scene .setLive (currentScene .isLive ());
       }
 
       const parser = new XMLParser (scene);
@@ -619,9 +619,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       if (!external)
       {
-         currentScene .isLive () .addInterest ("setLive", scene);
+         currentScene .getLive () .addInterest ("setLive", scene);
          scene .setExecutionContext (currentScene);
-         scene .setLive (currentScene .getLive ());
+         scene .setLive (currentScene .isLive ());
       }
 
       const parser = new JSONParser (scene);
@@ -813,14 +813,14 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    beginUpdate: function ()
    {
       this .setLive (true);
-      this .getExecutionContext () .beginUpdate ();
+      this .getExecutionContext () .setLive (true);
       this .advanceTime ();
       this .addBrowserEvent ();
    },
    endUpdate: function ()
    {
       this .setLive (false);
-      this .getExecutionContext () .endUpdate ();
+      this .getExecutionContext () .setLive (false);
    },
    print: function ()
    {