x_ite 8.6.9 → 8.6.10

package/docs/_config.yml

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

package/docs/_posts/getting-started.md

@@ -9,7 +9,7 @@ x_ite: true
 ---
 <x3d-canvas
   class="teaser"
-  src="/x_ite/assets/X3D/teaser.x3d"
+  src="/x_ite/assets/X3D/teaser/teaser.x3d"
   splashScreen="false"
   contextMenu="false"
   notifications="false">

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.6.9",
+	"version": "8.6.10",
 	"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,6 +8,7 @@ export default /* glsl */ `
 #endif
 
 uniform float x3d_AlphaCutoff;
+uniform float x3d_MinAlpha;
 
 #if defined (X3D_FOG) && defined (X3D_FOG_COORDS)
    varying float fogDepth;
@@ -117,7 +118,7 @@ fragment_main ()
    if (finalColor .a < x3d_AlphaCutoff)
       discard;
 
-   gl_FragColor = finalColor;
+   gl_FragColor = vec4 (finalColor .rgb, max (finalColor .a, x3d_MinAlpha));
 
    #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,5 +1,6 @@
 export default /* glsl */ `
 uniform float x3d_AlphaCutoff;
+uniform float x3d_MinAlpha;
 
 #if defined (X3D_FOG) && defined (X3D_FOG_COORDS)
    in float fogDepth;
@@ -118,7 +119,7 @@ fragment_main ()
    if (finalColor .a < x3d_AlphaCutoff)
       discard;
 
-   x3d_FragColor = finalColor;
+   x3d_FragColor = vec4 (finalColor .rgb, max (finalColor .a, x3d_MinAlpha));
 
    #if defined (X3D_LOGARITHMIC_DEPTH_BUFFER)
       //https://outerra.blogspot.com/2013/07/logarithmic-depth-buffer-optimizations.html

package/src/tests.js

@@ -14,7 +14,7 @@ const X_ITE_TESTS = [
    { path: "Core/Comment.x3d" },
    { path: "Core/DataURL.x3d" },
    { path: "Core/EXPORT.wrl" },
-   { path: "Core/EXPORT.x3d" },
+   { path: "Core/export.x3d" },
    { path: "Core/EXPORT.x3dv" },
    { path: "Core/IMPORT.x3d" },
    { path: "Core/IMPORT.x3dv" },

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

@@ -193,10 +193,12 @@ const Context =
       // Async functions
 
       Object .assign (gl, gl .getVersion () === 1
-      ? {
+      ?
+      {
          readPixelsAsync: gl .readPixels,
       }
-      : {
+      :
+      {
          clientWaitAsync: function (sync, flags, timeout)
          {
             return new Promise ((resolve, reject) =>

package/src/x_ite/Browser/VERSION.js

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

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

@@ -153,6 +153,7 @@ X3DProgrammableShaderObject .prototype =
 
       this .x3d_Id                      = gl .getUniformLocation (program, "x3d_Id");
       this .x3d_LogarithmicFarFactor1_2 = gl .getUniformLocation (program, "x3d_LogarithmicFarFactor1_2");
+      this .x3d_MinAlpha                = gl .getUniformLocation (program, "x3d_MinAlpha");
 
       for (let i = 0; i < maxClipPlanes; ++ i)
          this .x3d_ClipPlane [i] = gl .getUniformLocation (program, "x3d_ClipPlane[" + i + "]");
@@ -1059,6 +1060,7 @@ X3DProgrammableShaderObject .prototype =
          // Alpha
 
          gl .uniform1f (this .x3d_AlphaCutoff, appearanceNode .getAlphaCutoff ());
+         gl .uniform1f (this .x3d_MinAlpha,    renderContext .minAlpha);
 
          // Style Properties
 

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

@@ -192,7 +192,7 @@ ImageTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
             // Determine image alpha.
 
             const
-               data        = cx .getImageData (0, 0, width, height, { premultipliedAlpha: false }) .data,
+               data        = cx .getImageData (0, 0, width, height) .data,
                transparent = this .isImageTransparent (data);
 
             // Upload image to GPU.
@@ -208,9 +208,14 @@ ImageTexture .prototype = Object .assign (Object .create (X3DTexture2DNode .prot
                width       = image .width,
                height      = image .height;
 
+            // Flip Y if needed.
+
+            if (!this ._flipVertically .getValue ())
+               this .flipImage (data, width, height, 4);
+
             // Upload image to GPU.
 
-            this .setTexture (width, height, transparent, data, !this ._flipVertically .getValue ());
+            this .setTexture (width, height, transparent, data, false);
             this .setLoadState (X3DConstants .COMPLETE_STATE);
          }
       }

package/src/x_ite/Rendering/X3DRenderObject.js

@@ -670,6 +670,7 @@ X3DRenderObject .prototype =
       return {
          renderObject: this,
          transparent: transparent,
+         minAlpha: transparent ? 0 : 1,
          modelViewMatrix: new Float32Array (16),
          scissor: new Vector4 (0, 0, 0, 0),
          localObjects: [ ],
@@ -1051,7 +1052,6 @@ X3DRenderObject .prototype =
       gl .depthMask (true);
       gl .enable (gl .DEPTH_TEST);
       gl .disable (gl .BLEND);
-      gl .colorMask (true, true, true, false);
 
       const opaqueShapes = this .opaqueShapes;
 
@@ -1073,7 +1073,6 @@ X3DRenderObject .prototype =
 
       gl .depthMask (false);
       gl .enable (gl .BLEND);
-      gl .colorMask (true, true, true, true);
 
       const transparentShapes = this .transparentShapes;
 

package/src/x_ite.html

@@ -228,9 +228,9 @@ main.color-management #browser {
 #browser {
    display: block;
    margin: 10px 0px;
-   aspect-ratio: 16 / 9;
    width: 100%;
    height: auto;
+   aspect-ratio: 16 / 9;
    box-shadow: 0px 2px 12px 1px rgba(0, 0, 0, 0.75);
 }
 

package/x_ite.min.html

@@ -209,9 +209,9 @@ main.color-management #browser {
 #browser {
    display: block;
    margin: 10px 0px;
-   aspect-ratio: 16 / 9;
    width: 100%;
    height: auto;
+   aspect-ratio: 16 / 9;
    box-shadow: 0px 2px 12px 1px rgba(0, 0, 0, 0.75);
 }