x_ite 8.6.10 → 8.6.11

package/docs/_config.yml

@@ -20,7 +20,7 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.6.10                         # x_ite latest version
+version: 8.6.11                         # x_ite latest version
 size: 289                              # size in kb
 x3d_latest_version: 4.0                # x3d latest version
 

package/docs/laboratory/gltf-sample-viewer.html

@@ -341,10 +341,12 @@ function createList (description, array)
 
    for (const filename of array)
    {
-      const m = filename .match (/^([^\/]+)/);
+      const
+         match = filename .match (/^([^\/]+)/),
+         name  = match [1] .replace (/([A-Z]+)/g, " $1") .replace (/\s+/g, " ") .trim ();
 
       $("<a></a>")
-         .text (m [1])
+         .text (name)
          .attr ("href", array .server + filename)
          .appendTo ($("<li></li>") .appendTo (list))
          .on ("click", loadURL .bind (null, filename, array .server));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.6.10",
+	"version": "8.6.11",
 	"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/assets/shaders/webgl1/include/Fragment.glsl.js

@@ -8,7 +8,6 @@ export default /* glsl */ `
 #endif
 
 uniform float x3d_AlphaCutoff;
-uniform float x3d_MinAlpha;
 
 #if defined (X3D_FOG) && defined (X3D_FOG_COORDS)
    varying float fogDepth;
@@ -115,10 +114,18 @@ fragment_main ()
       finalColor .rgb = getFogColor (finalColor .rgb);
    #endif
 
-   if (finalColor .a < x3d_AlphaCutoff)
-      discard;
+   #if defined (X3D_ALPHA_MODE_OPAQUE)
+      finalColor .a = 1.0;
+   #endif
+
+   #if defined (X3D_ALPHA_MODE_MASK)
+      if (finalColor .a < x3d_AlphaCutoff)
+         discard;
+
+      finalColor .a = 1.0;
+   #endif
 
-   gl_FragColor = vec4 (finalColor .rgb, max (finalColor .a, x3d_MinAlpha));
+   gl_FragColor = finalColor;
 
    #if defined (X3D_LOGARITHMIC_DEPTH_BUFFER)
       //https://outerra.blogspot.com/2013/07/logarithmic-depth-buffer-optimizations.html

package/src/assets/shaders/webgl2/include/Fragment.glsl.js

@@ -1,6 +1,5 @@
 export default /* glsl */ `
 uniform float x3d_AlphaCutoff;
-uniform float x3d_MinAlpha;
 
 #if defined (X3D_FOG) && defined (X3D_FOG_COORDS)
    in float fogDepth;
@@ -116,10 +115,18 @@ fragment_main ()
       finalColor .rgb = getFogColor (finalColor .rgb);
    #endif
 
-   if (finalColor .a < x3d_AlphaCutoff)
-      discard;
+   #if defined (X3D_ALPHA_MODE_OPAQUE)
+      finalColor .a = 1.0;
+   #endif
+
+   #if defined (X3D_ALPHA_MODE_MASK)
+      if (finalColor .a < x3d_AlphaCutoff)
+         discard;
+
+      finalColor .a = 1.0;
+   #endif
 
-   x3d_FragColor = vec4 (finalColor .rgb, max (finalColor .a, x3d_MinAlpha));
+   x3d_FragColor = finalColor;
 
    #if defined (X3D_LOGARITHMIC_DEPTH_BUFFER)
       //https://outerra.blogspot.com/2013/07/logarithmic-depth-buffer-optimizations.html

package/src/standard/Math/Algorithm.js

@@ -154,7 +154,14 @@ export default class Algorithm
       if (this .isPowerOfTwo (n))
          return n;
 
-      return 1 << 32 - Math .clz32 (n);
+      return 1 << (32 - Math .clz32 (n));
+   }
+
+   static bitCount (n)
+   {
+      n = n - ((n >>> 1) & 0x55555555);
+      n = (n & 0x33333333) + ((n >>> 2) & 0x33333333);
+      return ((n + (n >>> 4) & 0xF0F0F0F) * 0x1010101) >>> 24;
    }
 
    static cmp (lhs, rhs)

package/src/standard/Utility/BitSet.js

@@ -45,6 +45,8 @@
  *
  ******************************************************************************/
 
+import Algorithm from "../Math/Algorithm.js";
+
 function BitSet (value = 0)
 {
    this .value = value;
@@ -53,6 +55,21 @@ function BitSet (value = 0)
 BitSet .prototype =
 {
    constructor: BitSet,
+   [Symbol .iterator]: function* ()
+   {
+      let
+         value = this .value,
+         index = 0;
+
+      while (value)
+      {
+         if (value & 1)
+            yield index;
+
+         value >>>= 1;
+         index   += 1;
+      }
+   },
    get: function (index)
    {
       const mask = 1 << index;
@@ -72,6 +89,11 @@ BitSet .prototype =
    {
       this .value = 0;
    },
+   entries: function* ()
+   {
+      for (const i of this)
+         yield [i, i];
+   },
    valueOf: function ()
    {
       return this .value;
@@ -82,4 +104,15 @@ BitSet .prototype =
    },
 };
 
+BitSet .prototype .keys   = BitSet .prototype [Symbol .iterator];
+BitSet .prototype .values = BitSet .prototype [Symbol .iterator];
+
+Object .defineProperty (BitSet .prototype, "size",
+{
+   get: function ()
+   {
+      return Algorithm .bitCount (this .value);
+   },
+});
+
 export default BitSet;

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

@@ -78,6 +78,8 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
    {
       X3DBaseNode .prototype .initialize .call (this);
 
+      this .getBrowser () .getBrowserOptions () ._ContextMenu .addInterest ("set_enabled__", this);
+
       this .localStorage .addDefaultValues ({ type: "LESS" });
 
       this .element = $("<div></div>") .hide () .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getSurface ());
@@ -103,7 +105,11 @@ BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototy
 
       this .enabled = enabled;
 
-      if (enabled)
+      this .set_enabled__ ();
+   },
+   set_enabled__: function ()
+   {
+      if (this .enabled && this .getBrowser () .getBrowserOption ("ContextMenu"))
       {
          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/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.11";

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);