x_ite 8.7.0 → 8.7.2

package/docs/_config.yml

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.7.0",
+	"version": "8.7.2",
 	"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>",
@@ -59,7 +59,7 @@
 		"css-element-queries": "^1.2.3",
 		"dicom-parser": "^1.8.21",
 		"jpeg-js": "^0.4.4",
-		"jpeg-lossless-decoder-js": "^2.0.5",
+		"jpeg-lossless-decoder-js": "2.0.4",
 		"jquery": "^3.6.4",
 		"jquery-fullscreen-plugin": "^1.1.5",
 		"jquery-mousewheel": "^3.1.13",

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

@@ -7,7 +7,9 @@ export default /* glsl */ `
    #extension GL_EXT_frag_depth : enable
 #endif
 
-uniform float x3d_AlphaCutoff;
+#if defined (X3D_ALPHA_MODE_MASK)
+   uniform float x3d_AlphaCutoff;
+#endif
 
 #if defined (X3D_FOG) && defined (X3D_FOG_COORDS)
    varying float fogDepth;
@@ -80,11 +82,11 @@ varying vec3 vertex;
    varying float depth;
 #endif
 
+#pragma X3D include "Texture.glsl"
 #pragma X3D include "ClipPlanes.glsl"
 #pragma X3D include "Point.glsl"
 #pragma X3D include "Hatch.glsl"
 #pragma X3D include "Fog.glsl"
-#pragma X3D include "Texture.glsl"
 
 vec4
 getMaterialColor ();

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

@@ -1,5 +1,7 @@
 export default /* glsl */ `
-uniform float x3d_AlphaCutoff;
+#if defined (X3D_ALPHA_MODE_MASK)
+   uniform float x3d_AlphaCutoff;
+#endif
 
 #if defined (X3D_FOG) && defined (X3D_FOG_COORDS)
    in float fogDepth;
@@ -74,12 +76,12 @@ in vec3 vertex;
 
 out vec4 x3d_FragColor;
 
+#pragma X3D include "Texture.glsl"
 #pragma X3D include "ClipPlanes.glsl"
 #pragma X3D include "Point.glsl"
 #pragma X3D include "Stipple.glsl"
 #pragma X3D include "Hatch.glsl"
 #pragma X3D include "Fog.glsl"
-#pragma X3D include "Texture.glsl"
 
 vec4
 getMaterialColor ();

package/src/x_ite/Browser/Legacy.js

@@ -58,7 +58,7 @@ function legacy ()
       this .attributeChangedCallback ("url", undefined, element .attr ("url"));
 
    // Make element focusable.
-   element .attr ("tabindex", element .attr ("tabindex") || 0);
+   element .attr ("tabindex", element .attr ("tabindex") ?? 0);
 }
 
 export default legacy;

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.7.0";
+export default "8.7.2";

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

@@ -315,8 +315,8 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
 
             this .ambientTextureNode .setShaderUniforms (gl, shaderObject, renderObject, ambientTexture);
 
-            gl .uniform1i (ambientTexture .textureTransformMapping,  textureTransformMapping  .get (ambientTextureMapping) || 0);
-            gl .uniform1i (ambientTexture .textureCoordinateMapping, textureCoordinateMapping .get (ambientTextureMapping) || 0);
+            gl .uniform1i (ambientTexture .textureTransformMapping,  textureTransformMapping  .get (ambientTextureMapping) ?? 0);
+            gl .uniform1i (ambientTexture .textureCoordinateMapping, textureCoordinateMapping .get (ambientTextureMapping) ?? 0);
          }
 
          // Diffuse parameters
@@ -329,8 +329,8 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
 
             this .diffuseTextureNode .setShaderUniforms (gl, shaderObject, renderObject, diffuseTexture);
 
-            gl .uniform1i (diffuseTexture .textureTransformMapping,  textureTransformMapping  .get (diffuseTextureMapping) || 0);
-            gl .uniform1i (diffuseTexture .textureCoordinateMapping, textureCoordinateMapping .get (diffuseTextureMapping) || 0);
+            gl .uniform1i (diffuseTexture .textureTransformMapping,  textureTransformMapping  .get (diffuseTextureMapping) ?? 0);
+            gl .uniform1i (diffuseTexture .textureCoordinateMapping, textureCoordinateMapping .get (diffuseTextureMapping) ?? 0);
          }
 
          // Specular parameters
@@ -343,8 +343,8 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
 
             this .specularTextureNode .setShaderUniforms (gl, shaderObject, renderObject, specularTexture);
 
-            gl .uniform1i (specularTexture .textureTransformMapping,  textureTransformMapping  .get (specularTextureMapping) || 0);
-            gl .uniform1i (specularTexture .textureCoordinateMapping, textureCoordinateMapping .get (specularTextureMapping) || 0);
+            gl .uniform1i (specularTexture .textureTransformMapping,  textureTransformMapping  .get (specularTextureMapping) ?? 0);
+            gl .uniform1i (specularTexture .textureCoordinateMapping, textureCoordinateMapping .get (specularTextureMapping) ?? 0);
          }
 
          // Shininess parameters
@@ -357,8 +357,8 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
 
             this .shininessTextureNode .setShaderUniforms (gl, shaderObject, renderObject, shininessTexture);
 
-            gl .uniform1i (shininessTexture .textureTransformMapping,  textureTransformMapping  .get (shininessTextureMapping) || 0);
-            gl .uniform1i (shininessTexture .textureCoordinateMapping, textureCoordinateMapping .get (shininessTextureMapping) || 0);
+            gl .uniform1i (shininessTexture .textureTransformMapping,  textureTransformMapping  .get (shininessTextureMapping) ?? 0);
+            gl .uniform1i (shininessTexture .textureCoordinateMapping, textureCoordinateMapping .get (shininessTextureMapping) ?? 0);
          }
 
          // Occlusion parameters
@@ -373,8 +373,8 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
 
             this .occlusionTextureNode .setShaderUniforms (gl, shaderObject, renderObject, occlusionTexture);
 
-            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (occlusionTextureMapping) || 0);
-            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (occlusionTextureMapping) || 0);
+            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (occlusionTextureMapping) ?? 0);
+            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (occlusionTextureMapping) ?? 0);
          }
       }
    },

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

@@ -257,8 +257,8 @@ PhysicalMaterial .prototype = Object .assign (Object .create (X3DOneSidedMateria
 
             this .baseTextureNode .setShaderUniforms (gl, shaderObject, renderObject, baseTexture);
 
-            gl .uniform1i (baseTexture .textureTransformMapping,  textureTransformMapping  .get (baseTextureMapping) || 0);
-            gl .uniform1i (baseTexture .textureCoordinateMapping, textureCoordinateMapping .get (baseTextureMapping) || 0);
+            gl .uniform1i (baseTexture .textureTransformMapping,  textureTransformMapping  .get (baseTextureMapping) ?? 0);
+            gl .uniform1i (baseTexture .textureCoordinateMapping, textureCoordinateMapping .get (baseTextureMapping) ?? 0);
          }
 
          // Metallic roughness parameters
@@ -271,8 +271,8 @@ PhysicalMaterial .prototype = Object .assign (Object .create (X3DOneSidedMateria
 
             this .metallicRoughnessTextureNode .setShaderUniforms (gl, shaderObject, renderObject, metallicRoughnessTexture);
 
-            gl .uniform1i (metallicRoughnessTexture .textureTransformMapping,  textureTransformMapping  .get (metallicRoughnessTextureMapping) || 0);
-            gl .uniform1i (metallicRoughnessTexture .textureCoordinateMapping, textureCoordinateMapping .get (metallicRoughnessTextureMapping) || 0);
+            gl .uniform1i (metallicRoughnessTexture .textureTransformMapping,  textureTransformMapping  .get (metallicRoughnessTextureMapping) ?? 0);
+            gl .uniform1i (metallicRoughnessTexture .textureCoordinateMapping, textureCoordinateMapping .get (metallicRoughnessTextureMapping) ?? 0);
          }
 
          // Occlusion parameters
@@ -287,8 +287,8 @@ PhysicalMaterial .prototype = Object .assign (Object .create (X3DOneSidedMateria
 
             this .occlusionTextureNode .setShaderUniforms (gl, shaderObject, renderObject, occlusionTexture);
 
-            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (occlusionTextureMapping) || 0);
-            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (occlusionTextureMapping) || 0);
+            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (occlusionTextureMapping) ?? 0);
+            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (occlusionTextureMapping) ?? 0);
          }
       }
    },

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

@@ -152,7 +152,7 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
          key += textureNode ? 1 : 0;
       }
 
-      return this .shaderNodes .get (key) || this .createShader (key, geometryContext, renderContext);
+      return this .shaderNodes .get (key) ?? this .createShader (key, geometryContext, renderContext);
    },
    getShaderOptions: function (geometryContext, renderContext)
    {

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

@@ -175,8 +175,8 @@ X3DOneSidedMaterialNode .prototype = Object .assign (Object .create (X3DMaterial
 
             this .emissiveTextureNode .setShaderUniforms (gl, shaderObject, renderObject, emissiveTexture);
 
-            gl .uniform1i (emissiveTexture .textureTransformMapping,  textureTransformMapping  .get (emissiveTextureMapping) || 0);
-            gl .uniform1i (emissiveTexture .textureCoordinateMapping, textureCoordinateMapping .get (emissiveTextureMapping) || 0);
+            gl .uniform1i (emissiveTexture .textureTransformMapping,  textureTransformMapping  .get (emissiveTextureMapping) ?? 0);
+            gl .uniform1i (emissiveTexture .textureCoordinateMapping, textureCoordinateMapping .get (emissiveTextureMapping) ?? 0);
          }
 
          // Normal parameters
@@ -191,8 +191,8 @@ X3DOneSidedMaterialNode .prototype = Object .assign (Object .create (X3DMaterial
 
             this .normalTextureNode .setShaderUniforms (gl, shaderObject, renderObject, normalTexture);
 
-            gl .uniform1i (normalTexture .textureTransformMapping,  textureTransformMapping  .get (normalTextureMapping) || 0);
-            gl .uniform1i (normalTexture .textureCoordinateMapping, textureCoordinateMapping .get (normalTextureMapping) || 0);
+            gl .uniform1i (normalTexture .textureTransformMapping,  textureTransformMapping  .get (normalTextureMapping) ?? 0);
+            gl .uniform1i (normalTexture .textureCoordinateMapping, textureCoordinateMapping .get (normalTextureMapping) ?? 0);
          }
       }
    },