x_ite 8.4.3 → 8.5.3

package/src/assets/shaders/Types.glsl.js

@@ -50,7 +50,6 @@ struct x3d_PointPropertiesParameters
 #if defined (X3D_GEOMETRY_1D) && defined (X3D_STYLE_PROPERTIES)
 struct x3d_LinePropertiesParameters
 {
-   bool          applied;
    mediump int   linetype;
    mediump float lineStippleScale;
    sampler2D     texture;
@@ -62,10 +61,11 @@ struct x3d_LinePropertiesParameters
 #if (defined (X3D_GEOMETRY_2D) || defined (X3D_GEOMETRY_3D)) && defined (X3D_STYLE_PROPERTIES)
 struct x3d_FillPropertiesParameters
 {
-   bool         filled;
-   bool         hatched;
-   mediump vec3 hatchColor;
-   sampler2D    texture;
+   bool          filled;
+   bool          hatched;
+   mediump vec3  hatchColor;
+   sampler2D     texture;
+   mediump float scale;
 };
 #endif
 

package/src/assets/shaders/webgl1/PBR.fs.js

@@ -1,8 +1,8 @@
 export default /* glsl */ `
+
 // https://github.com/cx20/gltf-test/blob/master/examples/khronos-gltf-loader/shaders/pbr-frag.glsl
 
 #extension GL_EXT_shader_texture_lod: enable
-#extension GL_OES_standard_derivatives : enable
 
 precision highp float;
 precision highp int;

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

@@ -1,6 +1,4 @@
 export default /* glsl */ `
-#define MANUAL_SRGB
-
 vec4
 SRGBtoLINEAR (const in vec4 srgbIn)
 {
@@ -17,13 +15,13 @@ SRGBtoLINEAR (const in vec4 srgbIn)
    #endif //MANUAL_SRGB
 }
 
+#if defined (MANUAL_SRGB)
 vec4
 Gamma (const in vec4 color)
 {
-   #if defined (MANUAL_SRGB)
-      return vec4 (pow (color .rgb, vec3 (1.0 / 2.2)), color .a);
-   #else
-      return color;
-   #endif
+   return vec4 (pow (color .rgb, vec3 (1.0 / 2.2)), color .a);
 }
+#else
+#define Gamma(color) (color)
+#endif
 `;

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

@@ -1,4 +1,8 @@
 export default /* glsl */ `
+#if defined (X3D_NORMAL_TEXTURE)
+   #extension GL_OES_standard_derivatives : enable
+#endif
+
 #if defined (X3D_LOGARITHMIC_DEPTH_BUFFER)
    #extension GL_EXT_frag_depth : enable
 #endif

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

@@ -10,7 +10,7 @@ getHatchColor (vec4 color)
 
    if (x3d_FillProperties .hatched)
    {
-      vec4 hatch = texture2D (x3d_FillProperties .texture, gl_FragCoord .xy / 32.0);
+      vec4 hatch = texture2D (x3d_FillProperties .texture, gl_FragCoord .xy / (32.0 * x3d_FillProperties .scale));
 
       hatch .rgb *= x3d_FillProperties .hatchColor;
       finalColor  = mix (finalColor, hatch, hatch .a);

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

@@ -8,7 +8,7 @@ uniform mat4 x3d_TextureMatrix [X3D_NUM_TEXTURE_TRANSFORMS];
 mat4
 getTextureMatrix (const in int i)
 {
-   #if defined (X3D_MULTI_TEXTURING)
+   #if X3D_NUM_TEXTURE_TRANSFORMS > 1
       mat4 textureMatrix = mat4 (0.0);
 
       #if X3D_NUM_TEXTURE_TRANSFORMS > 0
@@ -30,7 +30,7 @@ getTextureMatrix (const in int i)
 vec4
 getTexCoord (const in int i)
 {
-   #if defined (X3D_MULTI_TEXTURING)
+   #if X3D_NUM_TEXTURE_COORDINATES > 1
       vec4 texCoord = vec4 (0.0);
 
       #if X3D_NUM_TEXTURE_COORDINATES > 0
@@ -478,7 +478,7 @@ getProjectiveTextureColor (in vec4 currentColor)
       if (texCoord .p < 0.0 || texCoord .p > 1.0)
          continue;
 
-      // We do not need to normalze p, as we only need the sign of the dot product.
+      // We do not need to normalize p, as we only need the sign of the dot product.
       vec3 p = x3d_ProjectiveTextureLocation [i] - vertex;
 
       if (dot (N, p) < 0.0)

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

@@ -1,6 +1,4 @@
 export default /* glsl */ `
-#define MANUAL_SRGB
-
 vec4
 SRGBtoLINEAR (const in vec4 srgbIn)
 {
@@ -17,13 +15,13 @@ SRGBtoLINEAR (const in vec4 srgbIn)
    #endif //MANUAL_SRGB
 }
 
+#if defined (MANUAL_SRGB)
 vec4
 Gamma (const in vec4 color)
 {
-   #if defined (MANUAL_SRGB)
-      return vec4 (pow (color .rgb, vec3 (1.0 / 2.2)), color .a);
-   #else
-      return color;
-   #endif
+   return vec4 (pow (color .rgb, vec3 (1.0 / 2.2)), color .a);
 }
+#else
+#define Gamma(color) (color)
+#endif
 `;

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

@@ -10,7 +10,7 @@ getHatchColor (vec4 color)
 
    if (x3d_FillProperties .hatched)
    {
-      vec4 hatch = texture (x3d_FillProperties .texture, gl_FragCoord .xy / 32.0);
+      vec4 hatch = texture (x3d_FillProperties .texture, gl_FragCoord .xy / (32.0 * x3d_FillProperties .scale));
 
       hatch .rgb *= x3d_FillProperties .hatchColor;
       finalColor  = mix (finalColor, hatch, hatch .a);

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

@@ -38,8 +38,8 @@ getVertex (const in vec4 vertex)
 
 #else
 
-#define getVertex(vertex) vertex
-#define getTexCoord(texCoord) texCoord
+#define getVertex(vertex) (vertex)
+#define getTexCoord(texCoord) (texCoord)
 
 #endif
 `;

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

@@ -6,7 +6,7 @@ export default /* glsl */ `
 vec4
 getTexCoord (const in int i)
 {
-   #if defined (X3D_MULTI_TEXTURING)
+   #if X3D_NUM_TEXTURE_COORDINATES > 1
       switch (i)
       {
          #if X3D_NUM_TEXTURE_COORDINATES > 0
@@ -514,7 +514,7 @@ getProjectiveTextureColor (in vec4 currentColor)
       if (texCoord .p < 0.0 || texCoord .p > 1.0)
          continue;
 
-      // We do not need to normalze p, as we only need the sign of the dot product.
+      // We do not need to normalize p, as we only need the sign of the dot product.
       vec3 p = x3d_ProjectiveTextureLocation [i] - vertex;
 
       if (dot (N, p) < 0.0)

package/src/bookmarks.js

@@ -80,7 +80,7 @@ const Bookmarks = (function ()
                         .addClass ('display-example')
                         .attr ('href', `${server}/${component}/${test}/${test}.x3d`)
                         .attr ('style', `background-image:url(${server}/${component}/${test}/screenshot-small.png)`)
-                        .on ("click", () => this .loadURL (`${server}/${component}/${test}/${test}.x3d`)));
+                        .on ("click", () => this .loadURL (`${server}/${component}/${test}/${test}.x3d`) && false));
                }
                else if (path)
                {
@@ -96,7 +96,7 @@ const Bookmarks = (function ()
                      .append ($("<a/>")
                         .addClass ('display-example')
                         .attr ('href', server + '/' + path)
-                        .on ("click", () => this .loadURL (server + '/' + path))
+                        .on ("click", () => this .loadURL (server + '/' + path) && false)
                         .text (name));
                }
                else if (component)
@@ -119,27 +119,31 @@ const Bookmarks = (function ()
             this .browser .getLocalStorage () ["Bookmarks.scrollLeft"] = this .element .scrollLeft ();
          });
       },
-      loadURL: function (url)
+      loadURL: async function (url)
       {
          const base = url .replace (/\.[^\.]+$/, "");
 
          $(".file") .text (url)
             .append ($("<a/>")
             .attr ('href', base + ".x3d")
-            .on ("click", () => this .loadURL (base + ".x3d"))
+            .on ("click", () => this .loadURL (base + ".x3d") && false)
             .text (".x3d"))
             .append ($("<a/>")
             .attr ('href', base + ".x3dv")
-            .on ("click", () => this .loadURL (base + ".x3dv"))
+            .on ("click", () => this .loadURL (base + ".x3dv") && false)
             .text (".x3dv"))
             .append ($("<a/>")
             .attr ('href', base + ".x3dj")
-            .on ("click", () => this .loadURL (base + ".x3dj"))
+            .on ("click", () => this .loadURL (base + ".x3dj") && false)
             .text (".x3dj"));
 
-         $(".browser") .attr ("src", url);
+         const t0 = performance .now ();
 
-         return false;
+         await this .browser .loadURL (new X3D .MFString (url)) .catch (Function .prototype);
+
+         const loadTime = (performance .now () - t0) / 1000;
+
+         console .log (`Scene loaded in ${loadTime .toPrecision (3)}s.`)
       },
    };
 

package/src/examples.js

@@ -1,5 +1,7 @@
 const X_ITE_EXAMPLES = [
    { component: "CADGeometry", test: "QuadSet" },
+   { component: "Core", test: "OBJ" },
+   { component: "Core", test: "STL" },
    { component: "CubeMapTexturing", test: "ComposedCubeMapTexture" },
    { component: "CubeMapTexturing", test: "GeneratedCubeMapTexture" },
    { component: "EnvironmentalEffects", test: "Background" },
@@ -111,6 +113,7 @@ const X_ITE_EXAMPLES = [
    { component: "Texturing", test: "MultiTexture" },
    { component: "Texturing", test: "PixelTexture" },
    { component: "Texturing3D", test: "ImageTexture3D" },
+   { component: "Texturing3D", test: "ImageTextureAtlas" },
    { component: "Time", test: "TimeSensor" },
    { component: "VolumeRendering", test: "EdgeEnhancementVolumeStyle" },
    { component: "VolumeRendering", test: "IsoSurfaceVolumeData" },

package/src/lib/jquery.js

@@ -1 +1,21 @@
+$.decodeText = function (input)
+{
+   if (typeof input === "string")
+      return input;
+
+   return new TextDecoder () .decode (input);
+};
+
+$.ungzip = function (arrayBuffer)
+{
+   try
+   {
+      return pako .ungzip (arrayBuffer, { to: "raw" }) .buffer;
+   }
+   catch (exception)
+   {
+      return arrayBuffer;
+   }
+}
+
 export default $;