babylon.quarks 0.24.0 → 0.25.0

package/src/shaders/particle_frag.wgsl.ts

@@ -1,4 +1,5 @@
 import {fogFragmentDeclarationWGSL, fogFragmentWGSL} from './chunks/fog';
+import {surfaceColorWGSL, surfaceFragmentDeclarationWGSL} from './chunks/surface';
 
 export default /* wgsl */ `
 varying vUV: vec2f;
@@ -28,19 +29,10 @@ uniform alphaTest: f32;
 #endif
 
 ${fogFragmentDeclarationWGSL}
+${surfaceFragmentDeclarationWGSL}
 @fragment
 fn main(input: FragmentInputs) -> FragmentOutputs {
-    var baseColor = fragmentInputs.vColor;
-
-#ifdef USE_MAP
-    var texColor = textureSample(map, mapSampler, fragmentInputs.vUV);
-    #ifdef TILE_BLEND
-        let texColor2 = textureSample(map, mapSampler, fragmentInputs.vUV2);
-        texColor = mix(texColor, texColor2, fragmentInputs.vTileBlend);
-    #endif
-    baseColor *= texColor;
-#endif
-
+${surfaceColorWGSL(true)}
 #ifdef USE_COLOR_AS_ALPHA
     baseColor.a *= (baseColor.r + baseColor.g + baseColor.b) / 3.0;
 #endif

package/src/shaders/particle_physics_frag.glsl.ts

@@ -1,4 +1,5 @@
 import {fogFragmentDeclarationGLSL, fogFragmentGLSL} from './chunks/fog';
+import {surfaceColorGLSL, surfaceFragmentDeclarationGLSL} from './chunks/surface';
 
 export default /* glsl */ `
 varying vec2 vUV;
@@ -88,18 +89,9 @@ uniform float alphaTest;
 #endif
 
 ${fogFragmentDeclarationGLSL}
+${surfaceFragmentDeclarationGLSL}
 void main() {
-    vec4 baseColor = vColor;
-
-#ifdef USE_MAP
-    vec4 texColor = texture2D(map, vUV);
-    #ifdef TILE_BLEND
-        vec4 texColor2 = texture2D(map, vUV2);
-        texColor = mix(texColor, texColor2, vTileBlend);
-    #endif
-    baseColor *= texColor;
-#endif
-
+${surfaceColorGLSL(true)}
 #ifdef USE_ALPHATEST
     if (baseColor.a < alphaTest) discard;
 #else

package/src/shaders/particle_physics_frag.wgsl.ts

@@ -1,4 +1,5 @@
 import {fogFragmentDeclarationWGSL, fogFragmentWGSL} from './chunks/fog';
+import {surfaceColorWGSL, surfaceFragmentDeclarationWGSL} from './chunks/surface';
 
 export default /* wgsl */ `
 varying vUV: vec2f;
@@ -88,19 +89,10 @@ uniform alphaTest: f32;
 #endif
 
 ${fogFragmentDeclarationWGSL}
+${surfaceFragmentDeclarationWGSL}
 @fragment
 fn main(input: FragmentInputs) -> FragmentOutputs {
-    var baseColor = fragmentInputs.vColor;
-
-#ifdef USE_MAP
-    var texColor = textureSample(map, mapSampler, fragmentInputs.vUV);
-    #ifdef TILE_BLEND
-        let texColor2 = textureSample(map, mapSampler, fragmentInputs.vUV2);
-        texColor = mix(texColor, texColor2, fragmentInputs.vTileBlend);
-    #endif
-    baseColor *= texColor;
-#endif
-
+${surfaceColorWGSL(true)}
 #ifdef USE_ALPHATEST
     if (baseColor.a < uniforms.alphaTest) { discard; }
 #else

package/src/shaders/stretched_bb_particle_vert.glsl.ts

@@ -67,11 +67,23 @@ void main() {
     // Deriving it via normalize keeps the stretch aligned even when the speed contribution is ~0
     // (e.g. speedFactor 0), instead of collapsing the whole burst onto a fixed screen axis.
     vec3 vdir = vlength > 0.000001 ? viewVelocity / vlength : vec3(0.0, 0.0, 1.0);
+#ifdef BEAM
+    // Seen straight along its length a beam has no side to face; any will do.
+    vec3 sideRaw = cross(mvPosition.xyz, vdir);
+    vec3 side = dot(sideRaw, sideRaw) > 1e-12 ? normalize(sideRaw) : vec3(1.0, 0.0, 0.0);
+#else
     vec3 side = normalize(cross(mvPosition.xyz, vdir));
+#endif
     mvPosition.xyz += position.y * side * avgSize;
+#ifdef BEAM
+    // The vector runs from the particle to the beam's end: the quad spans it
+    // exactly, U from the particle (0) to the end (1), as wide as the size.
+    mvPosition.xyz += (position.x + 0.5) * viewVelocity;
+#else
     // Equivalent to viewVelocity * (1.0 + lengthFactor / vlength) for moving particles, but the
     // size-based term (vdir * lengthFactor) survives when the velocity contribution vanishes.
     mvPosition.xyz -= (position.x + 0.5) * (viewVelocity + vdir * lengthFactor) * avgSize;
+#endif
 #ifdef PIVOT
     // In particle-size units along the quad's own axes: x from head to tail, y across.
     mvPosition.xyz += (pivot.y * side - pivot.x * vdir) * avgSize;

package/src/shaders/stretched_bb_particle_vert.wgsl.ts

@@ -73,12 +73,27 @@ fn main(input: VertexInputs) -> FragmentInputs {
     if (vlength > 0.000001) {
         vdir = viewVelocity / vlength;
     }
+#ifdef BEAM
+    // Seen straight along its length a beam has no side to face; any will do.
+    let sideRaw = cross(mvPosition.xyz, vdir);
+    var side = vec3f(1.0, 0.0, 0.0);
+    if (dot(sideRaw, sideRaw) > 1e-12) {
+        side = normalize(sideRaw);
+    }
+#else
     let side = normalize(cross(mvPosition.xyz, vdir));
+#endif
     let widthOffset = vertexInputs.position.y * side * avgSize;
     // Equivalent to viewVelocity * (1.0 + lengthFactor / vlength) for moving particles, but the
     // size-based term (vdir * lengthFactor) survives when the velocity contribution vanishes.
+#ifdef BEAM
+    // The vector runs from the particle to the beam's end: the quad spans it
+    // exactly, U from the particle (0) to the end (1), as wide as the size.
+    var stretched = mvPosition.xyz + widthOffset + (vertexInputs.position.x + 0.5) * viewVelocity;
+#else
     let lengthOffset = (vertexInputs.position.x + 0.5) * (viewVelocity + vdir * lengthFactor) * avgSize;
     var stretched = mvPosition.xyz + widthOffset - lengthOffset;
+#endif
 #ifdef PIVOT
     // In particle-size units along the quad's own axes: x from head to tail, y across.
     stretched += (uniforms.pivot.y * side - uniforms.pivot.x * vdir) * avgSize;

package/src/shaders/trail_frag.glsl.ts

@@ -1,4 +1,5 @@
 import {fogFragmentDeclarationGLSL, fogFragmentGLSL} from './chunks/fog';
+import {surfaceColorGLSL, surfaceFragmentDeclarationGLSL} from './chunks/surface';
 
 export default /* glsl */ `
 varying vec2 vUV;
@@ -9,14 +10,9 @@ uniform sampler2D map;
 #endif
 
 ${fogFragmentDeclarationGLSL}
+${surfaceFragmentDeclarationGLSL}
 void main() {
-    vec4 baseColor = vColor;
-
-#ifdef USE_MAP
-    vec4 texColor = texture2D(map, vUV);
-    baseColor *= texColor;
-#endif
-
+${surfaceColorGLSL(false)}
     if (baseColor.a < 0.01) discard;
 
 ${fogFragmentGLSL('baseColor.rgb')}

package/src/shaders/trail_frag.wgsl.ts

@@ -1,4 +1,5 @@
 import {fogFragmentDeclarationWGSL, fogFragmentWGSL} from './chunks/fog';
+import {surfaceColorWGSL, surfaceFragmentDeclarationWGSL} from './chunks/surface';
 
 export default /* wgsl */ `
 varying vUV: vec2f;
@@ -10,15 +11,10 @@ var map: texture_2d<f32>;
 #endif
 
 ${fogFragmentDeclarationWGSL}
+${surfaceFragmentDeclarationWGSL}
 @fragment
 fn main(input: FragmentInputs) -> FragmentOutputs {
-    var baseColor = fragmentInputs.vColor;
-
-#ifdef USE_MAP
-    let texColor = textureSample(map, mapSampler, fragmentInputs.vUV);
-    baseColor *= texColor;
-#endif
-
+${surfaceColorWGSL(false)}
     if (baseColor.a < 0.01) { discard; }
 
 ${fogFragmentWGSL('baseColor')}