Merge branch 'main' into release-2.14

# Conflicts:
#	package-lock.json
#	package.json

Author: Martin Valigursky

.gitignore

@@ -14,3 +14,6 @@ stats.html
 .npmrc
 examples/.npmrc
 .prettierrc
+# Added by Snap Cursor Rules extension
+.cursor/rules/cursor-rules-debug.log
+.cursor/rules/remote

examples/assets/hdri/shanghai-riverside-4k.hdr

@@ -0,0 +1,5 @@
+Mitsubishi F-2 - Fighter Jet - Free by bohmerang on Sketchfab:
+
+https://sketchfab.com/3d-models/mitsubishi-f-2-fighter-jet-free-d3d7244554974f499b106e6c11fe3aaf
+
+CC BY 4.0 https://creativecommons.org/licenses/by/4.0/

examples/assets/models/jet-fighter.glb

@@ -89,6 +89,68 @@ const createHatchMaterial = (device, textures) => {
                 gl_Position = matrix_viewProjection * worldPos;
             }
         `,
+        vertexWGSL: /* wgsl */ `
+
+            // include code transform shader functionality provided by the engine. It automatically
+            // declares vertex_position attribute, and handles skinning and morphing if necessary.
+            // It also adds uniforms: matrix_viewProjection, matrix_model, matrix_normal.
+            // Functions added: getModelMatrix, getLocalPosition
+            #include "transformCoreVS"
+
+            // include code for normal shader functionality provided by the engine. It automatically
+            // declares vertex_normal attribute, and handles skinning and morphing if necessary.
+            // Functions added: getNormalMatrix, getLocalNormal
+            #include "normalCoreVS"
+
+            // add additional attributes we need
+            attribute aUv0: vec2f;
+
+            // engine supplied uniforms
+            uniform view_position: vec3f;
+
+            // out custom uniforms
+            uniform uLightDir: vec3f;
+            uniform uMetalness: f32;
+
+            // variables we pass to the fragment shader
+            varying uv0: vec2f;
+            varying brightness: f32;
+
+            @vertex
+            fn vertexMain(input: VertexInput) -> VertexOutput
+            {
+                var output: VertexOutput;
+
+                // use functionality from transformCore to get a world position, which includes skinning and morphing as needed
+                let modelMatrix: mat4x4f = getModelMatrix();
+                let localPos: vec3f = getLocalPosition(vertex_position.xyz);
+                let worldPos: vec4f = modelMatrix * vec4f(localPos, 1.0);
+
+                // use functionality from normalCore to get the world normal, which includes skinning and morphing as needed
+                let normalMatrix: mat3x3f = getNormalMatrix(modelMatrix);
+                let localNormal: vec3f = getLocalNormal(vertex_normal);
+                let worldNormal: vec3f = normalize(normalMatrix * localNormal);
+
+                // simple wrap-around diffuse lighting using normal and light direction
+                let diffuse: f32 = dot(worldNormal, uniform.uLightDir) * 0.5 + 0.5;
+
+                // a simple specular lighting
+                let viewDir: vec3f = normalize(uniform.view_position - worldPos.xyz);
+                let reflectDir: vec3f = reflect(-uniform.uLightDir, worldNormal);
+                let specular: f32 = pow(max(dot(viewDir, reflectDir), 0.0), 9.0);
+
+                // combine the lighting
+                output.brightness = diffuse * (1.0 - uniform.uMetalness) + specular * uniform.uMetalness;
+
+                // Pass the texture coordinates
+                output.uv0 = aUv0;
+
+                // Transform the geometry
+                output.position = uniform.matrix_viewProjection * worldPos;
+
+                return output;
+            }
+        `,
         fragmentGLSL: /* glsl */ `
             // this gives us gamma correction functions, such as gammaCorrectOutput
             #include "gammaPS"
@@ -133,6 +195,56 @@ const createHatchMaterial = (device, textures) => {
                 gl_FragColor.a = 1.0;
             }
         `,
+        fragmentWGSL: /* wgsl */ `
+            // this gives us gamma correction functions, such as gammaCorrectOutput
+            #include "gammaPS"
+
+            // this give us tonemapping functionality: toneMap
+            #include "tonemappingPS"
+
+            // this gives us for functionality: addFog
+            #include "fogPS"
+
+            varying brightness: f32;
+            varying uv0: vec2f;
+
+            var uDiffuseMap: texture_2d_array<f32>;
+            var uDiffuseMapSampler: sampler;
+            uniform uDensity: f32;
+            uniform uNumTextures: f32;
+            uniform uColor: vec3f;
+
+            @fragment
+            fn fragmentMain(input: FragmentInput) -> FragmentOutput
+            {
+                var output: FragmentOutput;
+                var colorLinear: vec3f;
+
+                #ifdef TOON
+
+                    // just a simple toon shader - no texture sampling
+                    let level: f32 = f32(i32(input.brightness * uniform.uNumTextures)) / uniform.uNumTextures;
+                    colorLinear = level * uniform.uColor;
+
+                #else
+                    // brightness dictates the hatch texture level
+                    let level: f32 = (1.0 - input.brightness) * uniform.uNumTextures;
+
+                    // sample the two nearest levels and interpolate between them
+                    let hatchUnder: vec3f = textureSample(uDiffuseMap, uDiffuseMapSampler, input.uv0 * uniform.uDensity, i32(floor(level))).xyz;
+                    let hatchAbove: vec3f = textureSample(uDiffuseMap, uDiffuseMapSampler, input.uv0 * uniform.uDensity, i32(min(ceil(level), uniform.uNumTextures - 1.0))).xyz;
+                    colorLinear = mix(hatchUnder, hatchAbove, fract(level)) * uniform.uColor;
+                #endif
+
+                // handle standard color processing - the called functions are automatically attached to the
+                // shader based on the current fog / tone-mapping / gamma settings
+                let fogged: vec3f = addFog(colorLinear);
+                let toneMapped: vec3f = toneMap(fogged);
+                output.color = vec4f(gammaCorrectOutput(toneMapped), 1.0);
+
+                return output;
+            }
+        `,
         attributes: {
             vertex_position: SEMANTIC_POSITION,
             vertex_normal: SEMANTIC_NORMAL,

examples/assets/models/jet-fighter.txt

@@ -170,7 +170,8 @@ class ExampleLoader {
         }
 
         if (this._app) {
-            if (this._app.frame) {
+            // Check if app has already started (frame is a number, including 0)
+            if (this._app.frame !== undefined) {
                 this._appStart();
             } else {
                 this._app.once('start', () => this._appStart());