x_ite 8.6.11 → 8.6.12

package/src/x_ite/Components/Rendering/X3DLineGeometryNode.js

@@ -46,6 +46,7 @@
  ******************************************************************************/
 
 import X3DGeometryNode from "./X3DGeometryNode.js";
+import VertexArray     from "../../Rendering/VertexArray.js";
 import ViewVolume      from "../../../standard/Math/Geometry/ViewVolume.js";
 import Vector2         from "../../../standard/Math/Numbers/Vector2.js";
 import Vector4         from "../../../standard/Math/Numbers/Vector4.js";
@@ -60,9 +61,10 @@ function X3DLineGeometryNode (executionContext)
       browser = this .getBrowser (),
       gl      = browser .getContext ();
 
-   this .lineStipples      = new Float32Array ();
-   this .lineStippleBuffer = gl .createBuffer ();
-   this .trianglesBuffer   = gl .createBuffer ();
+   this .lineStipples           = new Float32Array ();
+   this .lineStippleBuffer      = gl .createBuffer ();
+   this .trianglesBuffer        = gl .createBuffer ();
+   this .thickVertexArrayObject = new VertexArray (gl);
 
    this .setGeometryType (1);
    this .setPrimitiveMode (gl .LINES);
@@ -80,6 +82,12 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
    {
       return false;
    },
+   updateVertexArrays: function ()
+   {
+      X3DGeometryNode .prototype .updateVertexArrays .call (this);
+
+      this .thickVertexArrayObject .update ();
+   },
    buildTexCoords: function ()
    {
       // Line stipple support.
@@ -91,8 +99,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
          gl       = this .getBrowser () .getContext (),
          numLines = this .getVertices () .length / 8;
 
-      if (this .lineStipples .length !== numLines * 6)
-         this .lineStipples = new Float32Array (numLines * 6);
+      this .lineStipples = new Float32Array (numLines * 6);
 
       gl .bindBuffer (gl .ARRAY_BUFFER, this .lineStippleBuffer);
       gl .bufferData (gl .ARRAY_BUFFER, this .lineStipples, gl .DYNAMIC_DRAW);
@@ -154,7 +161,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
          {
             // Setup vertex attributes.
 
-            if (this .vertexArrayObject .enable (shaderNode))
+            if (this .thickVertexArrayObject .enable (shaderNode))
             {
                const
                   stride            = 15 * Float32Array .BYTES_PER_ELEMENT,
@@ -239,7 +246,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
 
                // Setup vertex attributes.
 
-               if (this .vertexArrayObject .enable (transformShaderNode))
+               if (this .thickVertexArrayObject .enable (transformShaderNode))
                {
                   const
                      lineStippleStride  = 6 * Float32Array .BYTES_PER_ELEMENT,
@@ -315,7 +322,7 @@ X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode
 
                // Setup vertex attributes.
 
-               if (this .vertexArrayObject .enable (shaderNode))
+               if (this .thickVertexArrayObject .enable (shaderNode))
                {
                   const
                      stride            = 15 * Float32Array .BYTES_PER_ELEMENT,

package/src/x_ite/Components/RigidBodyPhysics/CollidableOffset.js

@@ -100,14 +100,7 @@ CollidableOffset .prototype = Object .assign (Object .create (X3DNBodyCollidable
    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) .multRight (this .getMatrix ()) ?? bbox .set ();
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
    },
@@ -157,7 +150,7 @@ CollidableOffset .prototype = Object .assign (Object .create (X3DNBodyCollidable
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_visible__: function ()
    {
@@ -198,10 +191,7 @@ CollidableOffset .prototype = Object .assign (Object .create (X3DNBodyCollidable
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             modelViewMatrix .pop ();
             return;
@@ -217,10 +207,7 @@ CollidableOffset .prototype = Object .assign (Object .create (X3DNBodyCollidable
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             modelViewMatrix .pop ();
             pickingHierarchy .pop ();
@@ -233,10 +220,7 @@ CollidableOffset .prototype = Object .assign (Object .create (X3DNBodyCollidable
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             modelViewMatrix .pop ();
             break;
@@ -248,15 +232,9 @@ CollidableOffset .prototype = Object .assign (Object .create (X3DNBodyCollidable
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
-            const boundedObject = this .boundedObject;
+            this .visibleNode?.traverse (type, renderObject);
 
-            if (boundedObject)
-               boundedObject .displayBBox (type, renderObject);
+            this .boundedObject?.displayBBox (type, renderObject);
 
             modelViewMatrix .pop ();
             return;

package/src/x_ite/Components/RigidBodyPhysics/CollidableShape.js

@@ -107,14 +107,7 @@ CollidableShape .prototype = Object .assign (Object .create (X3DNBodyCollidableN
    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) .multRight (this .getMatrix ()) ?? bbox .set ();
 
       return bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
    },
@@ -222,7 +215,7 @@ CollidableShape .prototype = Object .assign (Object .create (X3DNBodyCollidableN
    },
    set_cameraObject__: function ()
    {
-      this .setCameraObject (!!(this .visibleNode && this .visibleNode .isCameraObject ()));
+      this .setCameraObject (!!this .visibleNode?.isCameraObject ());
    },
    set_visible__: function ()
    {
@@ -428,10 +421,7 @@ CollidableShape .prototype = Object .assign (Object .create (X3DNBodyCollidableN
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             modelViewMatrix .pop ();
             return;
@@ -447,10 +437,7 @@ CollidableShape .prototype = Object .assign (Object .create (X3DNBodyCollidableN
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             modelViewMatrix .pop ();
             pickingHierarchy .pop ();
@@ -463,10 +450,7 @@ CollidableShape .prototype = Object .assign (Object .create (X3DNBodyCollidableN
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
+            this .visibleNode?.traverse (type, renderObject);
 
             modelViewMatrix .pop ();
             return;
@@ -478,15 +462,9 @@ CollidableShape .prototype = Object .assign (Object .create (X3DNBodyCollidableN
             modelViewMatrix .push ();
             modelViewMatrix .multLeft (this .getMatrix ());
 
-            const visibleNode = this .visibleNode;
-
-            if (visibleNode)
-               visibleNode .traverse (type, renderObject);
-
-            const boundedObject = this .boundedObject;
+            this .visibleNode?.traverse (type, renderObject);
 
-            if (boundedObject)
-               boundedObject .displayBBox (type, renderObject);
+            this .boundedObject?.displayBBox (type, renderObject);
 
             modelViewMatrix .pop ();
             return;

package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js

@@ -306,13 +306,13 @@ X3DProgrammableShaderObject .prototype =
 
          if (attribute < 0)
          {
-            this [`enable${name}Attribute`]            = Function .prototype;
-            this [`${lcfirst (name)}AttributeDivisor`] = Function .prototype;
+            this [`enable${name}Attribute`]                       = Function .prototype;
+            this [`${$.toLowerCaseFirst (name)}AttributeDivisor`] = Function .prototype;
          }
          else
          {
             delete this [`enable${name}Attribute`];
-            delete this [`${lcfirst (name)}AttributeDivisor`];
+            delete this [`${$.toLowerCaseFirst (name)}AttributeDivisor`];
          }
       }
 
@@ -1322,9 +1322,4 @@ X3DProgrammableShaderObject .prototype =
    dispose: function () { },
 };
 
-function lcfirst (string)
-{
-   return string [0] .toLowerCase () + string .slice (1);
-}
-
 export default X3DProgrammableShaderObject;

package/src/x_ite/Components/Shape/Shape.js

@@ -51,11 +51,6 @@ import FieldDefinitionArray from "../../Base/FieldDefinitionArray.js";
 import X3DShapeNode         from "./X3DShapeNode.js";
 import TraverseType         from "../../Rendering/TraverseType.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
-import Algorithm            from "../../../standard/Math/Algorithm.js";
-import Vector3              from "../../../standard/Math/Numbers/Vector3.js";
-import Matrix4              from "../../../standard/Math/Numbers/Matrix4.js";
-import Line3                from "../../../standard/Math/Geometry/Line3.js";
-import QuickSort            from "../../../standard/Math/Algorithms/QuickSort.js";
 
 function Shape (executionContext)
 {

package/src/x_ite/Components/Shape/X3DShapeNode.js

@@ -74,15 +74,15 @@ X3DShapeNode .prototype = Object .assign (Object .create (X3DChildNode .prototyp
       X3DChildNode     .prototype .initialize .call (this);
       X3DBoundedObject .prototype .initialize .call (this);
 
-      this ._bboxSize   .addInterest ("set_bbox__",      this);
-      this ._bboxCenter .addInterest ("set_bbox__",      this);
-      this ._appearance .addInterest ("set_apparance__", this);
-      this ._geometry   .addInterest ("set_geometry__",  this);
+      this ._bboxSize   .addInterest ("set_bbox__",       this);
+      this ._bboxCenter .addInterest ("set_bbox__",       this);
+      this ._appearance .addInterest ("set_appearance__", this);
+      this ._geometry   .addInterest ("set_geometry__",   this);
 
       this ._appearance .addInterest ("set_transparent__", this);
       this ._geometry   .addInterest ("set_transparent__", this);
 
-      this .set_apparance__ ();
+      this .set_appearance__ ();
       this .set_geometry__ ();
       this .set_transparent__ ();
    },
@@ -110,7 +110,7 @@ X3DShapeNode .prototype = Object .assign (Object .create (X3DChildNode .prototyp
    },
    getAppearance: function ()
    {
-      return this .apparanceNode;
+      return this .appearanceNode;
    },
    getGeometry: function ()
    {
@@ -135,25 +135,29 @@ X3DShapeNode .prototype = Object .assign (Object .create (X3DChildNode .prototyp
             this .bbox .set ();
       }
       else
+      {
          this .bbox .set (this ._bboxSize .getValue (), this ._bboxCenter .getValue ());
+      }
 
       this .bboxSize   .assign (this .bbox .size);
       this .bboxCenter .assign (this .bbox .center);
    },
-   set_apparance__: function ()
+   set_appearance__: function ()
    {
-      if (this .apparanceNode)
-         this .apparanceNode ._transparent .removeInterest ("set_transparent__", this);
+      if (this .appearanceNode)
+         this .appearanceNode ._transparent .removeInterest ("set_transparent__", this);
 
-      this .apparanceNode = X3DCast (X3DConstants .X3DAppearanceNode, this ._appearance);
+      this .appearanceNode = X3DCast (X3DConstants .X3DAppearanceNode, this ._appearance);
 
-      if (this .apparanceNode)
+      if (this .appearanceNode)
       {
-         this .apparanceNode ._alphaMode   .addInterest ("set_transparent__", this);
-         this .apparanceNode ._transparent .addInterest ("set_transparent__", this);
+         this .appearanceNode ._alphaMode   .addInterest ("set_transparent__", this);
+         this .appearanceNode ._transparent .addInterest ("set_transparent__", this);
       }
       else
-         this .apparanceNode = this .getBrowser () .getDefaultAppearance ();
+      {
+         this .appearanceNode = this .getBrowser () .getDefaultAppearance ();
+      }
    },
    set_geometry__: function ()
    {
@@ -175,13 +179,13 @@ X3DShapeNode .prototype = Object .assign (Object .create (X3DChildNode .prototyp
    },
    set_transparent__: function ()
    {
-      if (this .apparanceNode .getAlphaMode () === AlphaMode .AUTO)
+      if (this .appearanceNode .getAlphaMode () === AlphaMode .AUTO)
       {
-         this .transparent = !!(this .apparanceNode .isTransparent () || this .geometryNode?.isTransparent ());
+         this .transparent = !!(this .appearanceNode .isTransparent () || this .geometryNode?.isTransparent ());
       }
       else
       {
-         this .transparent = this .apparanceNode .isTransparent ();
+         this .transparent = this .appearanceNode .isTransparent ();
       }
    },
    dispose: function ()

package/src/x_ite/Fields/SFNode.js

@@ -361,6 +361,14 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
       if (value)
          value .removeCloneCount (count);
    },
+   getNodeUserData: function (key)
+   {
+      return this [_target] .getValue () .getUserData (key);
+   },
+   setNodeUserData: function (key, value)
+   {
+      this [_target] .getValue () .setUserData (key, value);
+   },
    valueOf: function ()
    {
       const

package/src/x_ite/{X3DCanvas.js → X3DCanvasElement.js}

@@ -48,11 +48,11 @@
 import X3DBrowser from "./Browser/X3DBrowser.js";
 import URLs       from "./Browser/Networking/URLs.js";
 
-class X3DCanvas extends HTMLElement
+class X3DCanvasElement extends HTMLElement
 {
    static define ()
    {
-      customElements .define ("x3d-canvas", X3DCanvas);
+      customElements .define ("x3d-canvas", X3DCanvasElement);
    }
 
    constructor ()
@@ -76,7 +76,10 @@ class X3DCanvas extends HTMLElement
 
       shadow .appendChild (link);
 
-      this .browser = new X3DBrowser (this);
+      Object .defineProperty (this, "browser",
+      {
+         value: new X3DBrowser (this),
+      })
    }
 
    connectedCallback ()
@@ -99,6 +102,7 @@ class X3DCanvas extends HTMLElement
          "splashScreen",
          "splashscreen",
          "src",
+         "timings",
          "url",
       ];
    }
@@ -107,9 +111,24 @@ class X3DCanvas extends HTMLElement
    {
       this .browser .attributeChangedCallback (name, oldValue, newValue);
    }
+
+   captureStream (... args)
+   {
+      return this .browser .getCanvas () [0] .captureStream (... args);
+   }
+
+   toBlob (... args)
+   {
+      return this .browser .getCanvas () [0] .toBlob (... args);
+   }
+
+   toDataURL (... args)
+   {
+      return this .browser .getCanvas () [0] .toDataURL (... args);
+   }
 }
 
 // IE fix.
 document .createElement ("X3DCanvas");
 
-export default X3DCanvas;
+export default X3DCanvasElement;

package/src/x_ite.js

@@ -45,15 +45,15 @@
  *
  ******************************************************************************/
 
-import X3D        from "./x_ite/X3D.js";
-import X3DCanvas  from "./x_ite/X3DCanvas.js";
-import shim       from "./shim.js";
+import X3D              from "./x_ite/X3D.js";
+import X3DCanvasElement from "./x_ite/X3DCanvasElement.js";
+import shim             from "./shim.js";
 
 // Assign X3D to global namespace.
 
 window [Symbol .for ("X_ITE.X3D")] = X3D;
 
-X3DCanvas .define ();
+X3DCanvasElement .define ();
 
 X3D ();