x_ite 8.10.1 → 8.11.0

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

@@ -82,7 +82,7 @@ Object .defineProperties (Contact,
    },
    containerField:
    {
-      value: "children",
+      value: "contacts",
       enumerable: true,
    },
    specificationRange:

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

@@ -362,7 +362,7 @@ Object .assign (X3DProgrammableShaderObject .prototype,
          gl .uniform1i (uniform, browser .getDefaultTexture2DUnit ());
 
       gl .uniform1i (this .x3d_TexCoordRamp,         browser .getDefaultTexture2DUnit ());
-      gl .uniform1i (this .x3d_JoinsTexture,         browser .getDefaultTexture2DUnit ());
+      gl .uniform1i (this .x3d_JointsTexture,        browser .getDefaultTexture2DUnit ());
       gl .uniform1i (this .x3d_DisplacementsTexture, browser .getDefaultTexture2DUnit ());
       gl .uniform1i (this .x3d_JointMatricesTexture, browser .getDefaultTexture2DUnit ());
    },

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

@@ -81,6 +81,10 @@ Object .assign (Object .setPrototypeOf (FillProperties .prototype, X3DAppearance
       // Preload texture.
       this .getBrowser () .getHatchStyleTexture (this .hatchStyle);
    },
+   getStyleKey ()
+   {
+      return this .hatched ? 2 : 1;
+   },
    set_filled__ ()
    {
       this .filled = this ._filled .getValue ();

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

@@ -79,6 +79,10 @@ Object .assign (Object .setPrototypeOf (LineProperties .prototype, X3DAppearance
       // Preload texture.
       this .getBrowser () .getLinetypeTexture ();
    },
+   getStyleKey ()
+   {
+      return this .applied ? 2 : 1;
+   },
    getApplied ()
    {
       return this .applied;

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

@@ -86,6 +86,10 @@ Object .assign (Object .setPrototypeOf (PointProperties .prototype, X3DAppearanc
       this .set_pointSizeMaxValue__ ();
       this .set_attenuation__ ();
    },
+   getStyleKey ()
+   {
+      return 1;
+   },
    set_contentScale__ ()
    {
       this .set_pointSizeScaleFactor__ ();

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

@@ -65,18 +65,6 @@ function X3DMaterialNode (executionContext)
 
 Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanceChildNode .prototype),
 {
-   initialize ()
-   {
-      X3DAppearanceChildNode .prototype .initialize .call (this);
-
-      this .getBrowser () .getRenderingProperties () ._LogarithmicDepthBuffer .addInterest ("set_logarithmicDepthBuffer__", this);
-
-      this .set_logarithmicDepthBuffer__ ();
-   },
-   set_logarithmicDepthBuffer__ ()
-   {
-      this .logarithmicDepthBuffer = this .getBrowser () .getRenderingProperty ("LogarithmicDepthBuffer");
-   },
    setTransparent (value)
    {
       if (value !== this ._transparent .getValue ())
@@ -113,13 +101,13 @@ Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanc
       {
          const { renderObject, transparent, shadows, fogNode, shapeNode, appearanceNode, textureNode, humanoidNode, objectsCount } = renderContext;
 
-         key += this .logarithmicDepthBuffer || renderObject .getViewpoint () .getLogarithmicDepthBuffer () ? 1 : 0;
          key += appearanceNode .getNormalizedAlphaMode (transparent);
          key += this .getMaterialKey (shadows);
+         key += renderObject .getLogarithmicDepthBuffer () ? 1 : 0;
          key += shadows ? 1 : 0;
          key += fogNode ?.getFogType () ?? 0;
          key += shapeNode .getShapeKey ();
-         key += appearanceNode .getStyleProperties (geometryContext .geometryType) ? 1 : 0;
+         key += appearanceNode .getStyleProperties (geometryContext .geometryType) ?.getStyleKey () ?? 0;
          key += appearanceNode .getTextureTransformMapping () .size || 1;
          key += geometryContext .textureCoordinateMapping .size || 1;
          key += humanoidNode ? 1 : 0;
@@ -134,12 +122,13 @@ Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanc
       }
       else
       {
+         // Rubberband, X3DBackgroundNode
+
          const { textureNode, objectsCount } = geometryContext;
 
-         key += this .logarithmicDepthBuffer ? 1 : 0;
          key += geometryContext .alphaMode;
          key += this .getMaterialKey (false);
-         key += "0000110";
+         key += "00000110";
          key += ".";
          key += objectsCount [0]; // Clip planes
          key += ".";
@@ -173,20 +162,30 @@ Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanc
       {
          const { renderObject, fogNode, shapeNode, appearanceNode, humanoidNode, objectsCount } = renderContext;
 
-         if (this .logarithmicDepthBuffer || renderObject .getViewpoint () .getLogarithmicDepthBuffer ())
+         if (renderObject .getLogarithmicDepthBuffer ())
             options .push ("X3D_LOGARITHMIC_DEPTH_BUFFER");
 
          switch (appearanceNode .getNormalizedAlphaMode (renderContext .transparent))
          {
             case AlphaMode .OPAQUE:
+            {
                options .push ("X3D_ALPHA_MODE_OPAQUE");
                break;
+            }
             case AlphaMode .MASK:
+            {
                options .push ("X3D_ALPHA_MODE_MASK");
                break;
+            }
             case AlphaMode .BLEND:
+            {
                options .push ("X3D_ALPHA_MODE_BLEND");
+
+               if (browser .getBrowserOption ("OrderIndependentTransparency"))
+                  options .push ("X3D_ORDER_INDEPENDENT_TRANSPARENCY");
+
                break;
+            }
          }
 
          if (renderContext .shadows)
@@ -224,8 +223,13 @@ Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanc
          }
 
          if (appearanceNode .getStyleProperties (geometryContext .geometryType))
+         {
             options .push ("X3D_STYLE_PROPERTIES");
 
+            if (appearanceNode .getStyleProperties (geometryContext .geometryType) .getStyleKey () > 1)
+               options .push ("X3D_STYLE_PROPERTIES_TEXTURE");
+         }
+
          if (+this .textureBits)
             options .push ("X3D_MATERIAL_TEXTURES");
 
@@ -270,10 +274,30 @@ Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanc
       }
       else
       {
-         const { textureNode, objectsCount } = geometryContext;
+         const { alphaMode, textureNode, objectsCount } = geometryContext;
 
-         if (this .logarithmicDepthBuffer)
-            options .push ("X3D_LOGARITHMIC_DEPTH_BUFFER");
+         switch (alphaMode)
+         {
+            case AlphaMode .OPAQUE:
+            {
+               options .push ("X3D_ALPHA_MODE_OPAQUE");
+               break;
+            }
+            case AlphaMode .MASK:
+            {
+               options .push ("X3D_ALPHA_MODE_MASK");
+               break;
+            }
+            case AlphaMode .BLEND:
+            {
+               options .push ("X3D_ALPHA_MODE_BLEND");
+
+               if (browser .getBrowserOption ("OrderIndependentTransparency"))
+                  options .push ("X3D_ORDER_INDEPENDENT_TRANSPARENCY");
+
+               break;
+            }
+         }
 
          if (objectsCount [0])
          {

package/src/x_ite/Components/Sound/AudioClip.js

@@ -51,6 +51,7 @@ import FieldDefinitionArray from "../../Base/FieldDefinitionArray.js";
 import X3DSoundSourceNode   from "./X3DSoundSourceNode.js";
 import X3DUrlObject         from "../Networking/X3DUrlObject.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
+import Time                 from "../../../standard/Time/Time.js";
 import DEVELOPMENT          from "../../DEVELOPMENT.js";
 
 function AudioClip (executionContext)
@@ -120,7 +121,7 @@ Object .assign (Object .setPrototypeOf (AudioClip .prototype, X3DSoundSourceNode
       if (this .URL .protocol !== "data:")
       {
          if (!this .getCache ())
-            this .URL .searchParams .set ("_", Date .now ());
+            this .URL .searchParams .set ("_", Time .now ());
       }
 
       this .audio .attr ("src", this .URL .href);

package/src/x_ite/Components/Text/X3DFontStyleNode.js

@@ -52,6 +52,7 @@ import TextAlignment from "../../Browser/Text/TextAlignment.js";
 import FileLoader    from "../../InputOutput/FileLoader.js";
 import X3DConstants  from "../../Base/X3DConstants.js";
 import URLs          from "../../Browser/Networking/URLs.js";
+import Time                 from "../../../standard/Time/Time.js";
 
 /*
  * Font paths for default SERIF, SANS and TYPWRITER families.
@@ -205,32 +206,19 @@ Object .assign (Object .setPrototypeOf (X3DFontStyleNode .prototype, X3DNode .pr
    },
    loadNext ()
    {
-      try
+      if (this .familyStack .length === 0)
       {
-         if (this .familyStack .length === 0)
-         {
-            this .setLoadState (X3DConstants .FAILED_STATE);
-            this .font = null;
-            return;
-         }
+         this .setLoadState (X3DConstants .FAILED_STATE);
+         this .font = null;
+         return;
+      }
 
-         this .family = this .familyStack .shift ();
-         this .URL    = new URL (this .family, this .loader .getReferer ());
+      this .family = this .familyStack .shift ();
+      this .URL    = new URL (this .family, this .loader .getReferer ());
 
-         if (this .URL .protocol !== "data:")
-         {
-            if (!this .getCache ())
-               this .URL .searchParams .set ("_", Date .now ());
-         }
-
-         this .getBrowser () .getFont (this .URL)
-            .done (this .setFont .bind (this))
-            .fail (this .setError .bind (this));
-      }
-      catch (error)
-      {
-         this .setError (error .message);
-      }
+      this .getBrowser () .getFont (this .URL, this .getCache ())
+         .then (this .setFont .bind (this))
+         .catch (this .setError .bind (this));
    },
    setError (error)
    {
@@ -241,6 +229,8 @@ Object .assign (Object .setPrototypeOf (X3DFontStyleNode .prototype, X3DNode .pr
    },
    setFont (font)
    {
+      console .info (this .URL .toString ())
+
       this .font = font;
 
       this .setLoadState (X3DConstants .COMPLETE_STATE);

package/src/x_ite/Components/Texturing/ImageTexture.js

@@ -52,6 +52,7 @@ import X3DTexture2DNode     from "./X3DTexture2DNode.js";
 import X3DUrlObject         from "../Networking/X3DUrlObject.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 import Algorithm            from "../../../standard/Math/Algorithm.js";
+import Time                 from "../../../standard/Time/Time.js";
 import DEVELOPMENT          from "../../DEVELOPMENT.js";
 
 function ImageTexture (executionContext)
@@ -108,7 +109,7 @@ Object .assign (Object .setPrototypeOf (ImageTexture .prototype, X3DTexture2DNod
       if (this .URL .protocol !== "data:")
       {
          if (!this .getCache ())
-            this .URL .searchParams .set ("_", Date .now ());
+            this .URL .searchParams .set ("_", Time .now ());
       }
 
       this .image .attr ("src", this .URL .href);

package/src/x_ite/Components/Texturing/MovieTexture.js

@@ -54,6 +54,7 @@ import X3DUrlObject         from "../Networking/X3DUrlObject.js";
 import GifMedia             from "../../Browser/Texturing/GIFMedia.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
 import Algorithm            from "../../../standard/Math/Algorithm.js";
+import Time                 from "../../../standard/Time/Time.js";
 import DEVELOPMENT          from "../../DEVELOPMENT.js";
 
 function MovieTexture (executionContext)
@@ -126,7 +127,7 @@ Object .assign (Object .setPrototypeOf (MovieTexture .prototype, X3DTexture2DNod
       if (this .URL .protocol !== "data:")
       {
          if (!this .getCache ())
-            this .URL .searchParams .set ("_", Date .now ());
+            this .URL .searchParams .set ("_", Time .now ());
       }
 
       if (this .URL .pathname .endsWith (".gif"))

package/src/x_ite/Components/Texturing3D/ImageTextureAtlas.js

@@ -51,6 +51,7 @@ import FieldDefinitionArray from "../../Base/FieldDefinitionArray.js";
 import X3DTexture3DNode     from "./X3DTexture3DNode.js";
 import X3DUrlObject         from "../Networking/X3DUrlObject.js";
 import X3DConstants         from "../../Base/X3DConstants.js";
+import Time                 from "../../../standard/Time/Time.js";
 import DEVELOPMENT          from "../../DEVELOPMENT.js";
 
 function ImageTextureAtlas (executionContext)
@@ -104,7 +105,7 @@ Object .assign (Object .setPrototypeOf (ImageTextureAtlas .prototype, X3DTexture
       if (this .URL .protocol !== "data:")
       {
          if (!this .getCache ())
-            this .URL .searchParams .set ("_", Date .now ());
+            this .URL .searchParams .set ("_", Time .now ());
       }
 
       this .image .attr ("src", this .URL .href);

package/src/x_ite/Components/Time/TimeSensor.js

@@ -81,52 +81,53 @@ Object .assign (Object .setPrototypeOf (TimeSensor .prototype, X3DSensorNode .pr
       this ._cycleInterval .addInterest ("set_cycleInterval__", this);
       this ._range         .addInterest ("set_range__",         this);
    },
-   setRange (currentFraction, firstFraction, lastFraction)
+   setRange (fraction, firstFraction, lastFraction, offset)
    {
       const
          currentTime   = this .getBrowser () .getCurrentTime (),
          startTime     = this ._startTime .getValue (),
          cycleInterval = this ._cycleInterval .getValue ();
 
-      this .first    = firstFraction;
-      this .last     = lastFraction;
+      this .first    = Algorithm .clamp (firstFraction, 0, 1);
+      this .last     = Algorithm .clamp (lastFraction, 0, 1);
       this .scale    = this .last - this .first;
       this .interval = cycleInterval * this .scale;
-      this .fraction = Algorithm .fract ((currentFraction >= 1 ? 0 : currentFraction) + (this .interval ? (currentTime - startTime) / this .interval : 0));
-      this .cycle    = currentTime - (this .fraction -  this .first) * cycleInterval;
+      this .offset   = offset && this .interval ? (currentTime - startTime) / this .interval : 0;
+      this .fraction = Algorithm .fract (fraction + this .offset);
+      this .cycle    = currentTime - (this .fraction - this .first) * cycleInterval;
    },
    set_cycleInterval__ ()
    {
-      if (this ._isActive .getValue ())
-         this .setRange (this .fraction, this ._range [1], this ._range [2]);
+      if (!this ._isActive .getValue ())
+         return;
+
+      this .setRange (this .fraction, this ._range [1], this ._range [2], false);
    },
    set_range__ ()
    {
-      if (this ._isActive .getValue ())
-      {
-         this .setRange (this ._range [0], this ._range [1], this ._range [2]);
+      if (!this ._isActive .getValue ())
+         return;
 
-         if (!this ._isPaused .getValue ())
-            this .set_fraction (this .getBrowser () .getCurrentTime ());
-      }
+      this .setRange (this ._range [0], this ._range [1], this ._range [2], false);
+
+      if (this ._isPaused .getValue ())
+         return;
+
+      this .set_fraction (this .getBrowser () .getCurrentTime ());
    },
    set_start ()
    {
-      this .setRange (this ._range [0], this ._range [1], this ._range [2]);
+      this .setRange (this ._range [0], this ._range [1], this ._range [2], true);
 
-      if (this .getLive () .getValue ())
-      {
-         this ._fraction_changed = this .fraction;
-         this ._time             = this .getBrowser () .getCurrentTime ();
-      }
+      const time = this .getBrowser () .getCurrentTime ();
+
+      this ._cycleTime        = time;
+      this ._fraction_changed = this .fraction;
+      this ._time             = time;
    },
    set_resume (pauseInterval)
    {
-      const
-         currentTime   = this .getBrowser () .getCurrentTime (),
-         startTime     = this ._startTime .getValue ();
-
-      this .setRange (this .interval ? Algorithm .fract (this .fraction - (currentTime - startTime) / this .interval) : 0, this ._range [1], this ._range [2]);
+      this .setRange (this .fraction, this ._range [1], this ._range [2], false);
    },
    set_fraction (time)
    {

package/src/x_ite/Components/Time/X3DTimeDependentNode.js

@@ -48,6 +48,7 @@
 import Fields       from "../../Fields.js";
 import X3DChildNode from "../Core/X3DChildNode.js";
 import X3DConstants from "../../Base/X3DConstants.js";
+import Time         from "../../../standard/Time/Time.js";
 
 function X3DTimeDependentNode (executionContext)
 {
@@ -117,13 +118,13 @@ Object .assign (Object .setPrototypeOf (X3DTimeDependentNode .prototype, X3DChil
          {
             this .disabled = false;
 
-            if (this ._isActive .getValue () && ! this ._isPaused .getValue ())
+            if (this ._isActive .getValue () && !this ._isPaused .getValue ())
                this .real_resume ();
          }
       }
       else
       {
-         if (! this .disabled && this ._isActive .getValue () && ! this ._isPaused .getValue ())
+         if (!this .disabled && this ._isActive .getValue () && !this ._isPaused .getValue ())
          {
             // Only disable if needed, ie. if running!
             this .disabled = true;
@@ -263,7 +264,7 @@ Object .assign (Object .setPrototypeOf (X3DTimeDependentNode .prototype, X3DChil
    },
    real_pause ()
    {
-      this .pause = Date .now ();
+      this .pause = Time .now ();
 
       this .set_pause ();
 
@@ -284,7 +285,7 @@ Object .assign (Object .setPrototypeOf (X3DTimeDependentNode .prototype, X3DChil
    },
    real_resume ()
    {
-      const interval = (Date .now () - this .pause) / 1000;
+      const interval = (Time .now () - this .pause) / 1000;
 
       this .pauseInterval += interval;
 

package/src/x_ite/Execution/BindableList.js

@@ -45,8 +45,8 @@
  *
  ******************************************************************************/
 
-import X3DBaseNode          from "../Base/X3DBaseNode.js";
-import X3DPrototypeInstance from "../Components/Core/X3DPrototypeInstance.js";
+import X3DBaseNode from "../Base/X3DBaseNode.js";
+import Time        from "../../standard/Time/Time.js";
 
 function BindableList (executionContext, defaultNode)
 {
@@ -171,7 +171,7 @@ Object .assign (Object .setPrototypeOf (BindableList .prototype, X3DBaseNode .pr
 
       // Advance updateTime time.
 
-      this .updateTime = Date .now ();
+      this .updateTime = Time .now ();
    },
 });
 

package/src/x_ite/Execution/X3DScene.js

@@ -614,6 +614,7 @@ Object .assign (Object .setPrototypeOf (X3DScene .prototype, X3DExecutionContext
 
       generator .string += generator .Indent ();
       generator .string += "</X3D>";
+      generator .string += generator .TidyBreak ();
    },
    toJSONStream (generator)
    {
@@ -958,6 +959,7 @@ Object .assign (Object .setPrototypeOf (X3DScene .prototype, X3DExecutionContext
       generator .string += generator .DecIndent ();
       generator .string += generator .Indent ();
       generator .string += '}';
+      generator .string += generator .TidyBreak ();
    },
 },
 {

package/src/x_ite/Parser/XMLParser.js

@@ -1022,10 +1022,13 @@ Object .assign (Object .setPrototypeOf (XMLParser .prototype, X3DParser .prototy
 
       try
       {
-         const containerField = xmlElement .getAttribute ("containerField") || node ?.getContainerField ();
+         const containerField = xmlElement .getAttribute ("containerField") || node ?.getContainerField (true);
 
          if (!containerField)
-            throw new Error ("Node must have a container field attribute.");
+         {
+            console .warn ("Node must have a container field attribute.");
+            return;
+         }
 
          const field = parent .getField (containerField);
 
@@ -1043,6 +1046,13 @@ Object .assign (Object .setPrototypeOf (XMLParser .prototype, X3DParser .prototy
       catch (error)
       {
          // console .error (error);
+
+         if (node ?.getType () .includes (X3DConstants .X3DMetadataObject))
+         {
+            xmlElement .setAttribute ("containerField", "metadata");
+
+            this .addNode (xmlElement, node);
+         }
       }
    },
    // Overloaded by HTMLParser.