@forgeax/engine-vfx-render 0.1.19 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-vfx-render",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -22,13 +22,13 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-assets-runtime": "0.1.19",
-    "@forgeax/engine-ecs": "0.1.19",
-    "@forgeax/engine-math": "0.1.19",
-    "@forgeax/engine-render": "0.1.19",
-    "@forgeax/engine-scene": "0.1.19",
-    "@forgeax/engine-types": "0.1.19",
-    "@forgeax/engine-vfx": "0.1.19"
+    "@forgeax/engine-assets-runtime": "0.1.20",
+    "@forgeax/engine-ecs": "0.1.20",
+    "@forgeax/engine-math": "0.1.20",
+    "@forgeax/engine-render": "0.1.20",
+    "@forgeax/engine-scene": "0.1.20",
+    "@forgeax/engine-types": "0.1.20",
+    "@forgeax/engine-vfx": "0.1.20"
   },
   "devDependencies": {},
   "forgeax": {

package/src/__tests__/fog-producer.integration.test.ts

@@ -8,25 +8,11 @@ function shaderSource(name: (typeof shaderNames)[number]): string {
   return readFileSync(fileURLToPath(new URL(`../shaders/${name}.wgsl`, import.meta.url)), 'utf8');
 }
 
-function count(source: string, pattern: RegExp): number {
-  return source.match(pattern)?.length ?? 0;
-}
-
-describe('VFX Fog producer contract', () => {
-  it('requires one shared Fog call with a world-space ray for every topology', () => {
+describe('VFX volumetric-fog boundary contract', () => {
+  it('keeps analytic fog out of every particle topology', () => {
     for (const name of shaderNames) {
       const source = shaderSource(name);
-      expect(source, name).toMatch(
-        /#import\s+forgeax_view::common::\{[^}]*\bFogViewParams\b[^}]*\bFogRay\b[^}]*\}/,
-      );
-      expect(source, name).toMatch(/#import\s+forgeax_view::fog::\{[^}]*\bapply_fog\b[^}]*\}/);
-      expect(count(source, /\bapply_fog\s*\(/g), name).toBe(1);
-      expect(count(source, /\bFogRay\s*\(/g) + count(source, /\bfogRayFromNdc\s*\(/g), name).toBe(
-        1,
-      );
-      expect(source, name).toMatch(/world[_A-Za-z]*position|worldPosition|fogRayFromNdc/);
-      expect(source, name).toMatch(/ray[_A-Za-z]*distance|distance|fogRayFromNdc/);
-      expect(source, name).toMatch(/\.a\b|alpha/);
+      expect(source, name).not.toMatch(/\bFogViewParams\b|\bFogRay\b|\bapply_fog\s*\(/);
       expect(source, name).not.toMatch(/texture_3d|raymarch/i);
     }
   });
@@ -48,15 +34,16 @@ describe('VFX Fog producer contract', () => {
     expect(camera).toContain('viewProjection');
   });
 
-  it('keeps billboard scene-depth soft-particle alpha before Fog mixing', () => {
+  it('keeps billboard scene-depth soft-particle alpha in the final color', () => {
     const billboard = shaderSource('billboard');
     const depthLoad = billboard.indexOf('textureLoad(scene_depth');
     const softParticleCall = billboard.indexOf('softParticle(input.position');
-    const fogCall = billboard.indexOf('apply_fog(');
+    const finalColor = billboard.indexOf('return vec4<f32>(rgb * alpha, alpha);');
 
     expect(depthLoad).toBeGreaterThanOrEqual(0);
     expect(softParticleCall).toBeGreaterThan(depthLoad);
-    expect(fogCall).toBeGreaterThan(softParticleCall);
+    expect(finalColor).toBeGreaterThan(softParticleCall);
     expect(billboard).toContain('input.color.a * edge, input.fade_distance');
+    expect(billboard).not.toContain('apply_fog(');
   });
 });

package/src/shaders/beam.wgsl

@@ -1,6 +1,4 @@
 #define_import_path forgeax::vfx-render.particles.beam
-#import forgeax_view::common::{View, FogViewParams, FogRay, view, fogRayFromNdc}
-#import forgeax_view::fog::{apply_fog}
 
 struct BeamInput {
   @location(0) start: vec3<f32>,
@@ -37,10 +35,5 @@ fn vs_main(input: BeamInput, @builtin(vertex_index) vertexIndex: u32) -> VertexO
 fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
   let base = vec4<f32>(0.7, 0.2, 1.0, 1.0);
   let alpha = base.a * input.color.a;
-  let fogged = apply_fog(
-    view.fog,
-    fogRayFromNdc(input.clip_position),
-    vec4<f32>(base.rgb * input.color.rgb, alpha),
-  );
-  return vec4<f32>(fogged.rgb * fogged.a, fogged.a);
+  return vec4<f32>(base.rgb * input.color.rgb * alpha, alpha);
 }

package/src/shaders/billboard.wgsl

@@ -1,8 +1,8 @@
 #define_import_path forgeax::vfx-render.particles.billboard
-#import forgeax_view::common::{View, FogViewParams, FogRay, view, fogRayFromNdc}
-#import forgeax_view::fog::{apply_fog}
-
-@group(0) @binding(1) var scene_depth: texture_depth_2d;
+// The analytic fog producer was removed from this shader. Billboard
+// soft-particle depth is therefore the sole group-0 resource again, matching
+// the prepared group-0-resource layout and its binding resolver.
+@group(0) @binding(0) var scene_depth: texture_depth_2d;
 
 struct VertexOutput {
   @builtin(position) position: vec4<f32>,
@@ -104,6 +104,5 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
   let alpha = softParticle(input.position, input.color.a * edge, input.fade_distance);
   let sheetPulse = 0.82 + 0.18 * fract(input.sheet_frame * 0.618 + input.sheet_uv.x + input.sheet_uv.y);
   let rgb = (input.color.rgb + emissive * (0.35 + core * 0.65) + vec3<f32>(highlight)) * sheetPulse;
-  let fogged = apply_fog(view.fog, fogRayFromNdc(input.clip_position), vec4<f32>(rgb, alpha));
-  return vec4<f32>(fogged.rgb * fogged.a, fogged.a);
+  return vec4<f32>(rgb * alpha, alpha);
 }

package/src/shaders/mesh.wgsl

@@ -1,6 +1,4 @@
 #define_import_path forgeax::vfx-render.particles.mesh
-#import forgeax_view::common::{View, FogViewParams, FogRay, view, fogRayFromNdc}
-#import forgeax_view::fog::{apply_fog}
 
 struct VertexOutput {
   @builtin(position) position: vec4<f32>,
@@ -66,10 +64,6 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
   let specular_color = mix(dielectric, input.color.rgb, metallic);
   let lit = input.color.rgb * diffuse * (1.0 - metallic * 0.55);
   let emissive = input.emissive_intensity.rgb * input.emissive_intensity.a;
-  let fogged = apply_fog(
-    view.fog,
-    fogRayFromNdc(input.clip_position),
-    vec4<f32>(lit + specular_color * specular + vec3<f32>(coat) + emissive, input.color.a),
-  );
-  return vec4<f32>(fogged.rgb * fogged.a, fogged.a);
+  let rgb = lit + specular_color * specular + vec3<f32>(coat) + emissive;
+  return vec4<f32>(rgb * input.color.a, input.color.a);
 }

package/src/shaders/ribbon.wgsl

@@ -1,6 +1,4 @@
 #define_import_path forgeax::vfx-render.particles.ribbon
-#import forgeax_view::common::{View, FogViewParams, FogRay, view, fogRayFromNdc}
-#import forgeax_view::fog::{apply_fog}
 
 struct SegmentInput {
   @location(0) start: vec3<f32>,
@@ -37,10 +35,5 @@ fn vs_main(input: SegmentInput, @builtin(vertex_index) vertexIndex: u32) -> Vert
 fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
   let base = vec4<f32>(0.2, 0.7, 1.0, 0.9);
   let alpha = base.a * input.color.a;
-  let fogged = apply_fog(
-    view.fog,
-    fogRayFromNdc(input.clip_position),
-    vec4<f32>(base.rgb * input.color.rgb, alpha),
-  );
-  return fogged;
+  return vec4<f32>(base.rgb * input.color.rgb * alpha, alpha);
 }

package/src/shaders/trail.wgsl

@@ -1,6 +1,4 @@
 #define_import_path forgeax::vfx-render.particles.trail
-#import forgeax_view::common::{View, FogViewParams, FogRay, view, fogRayFromNdc}
-#import forgeax_view::fog::{apply_fog}
 
 struct SegmentInput {
   @location(0) start: vec3<f32>,
@@ -45,10 +43,5 @@ fn vs_main(input: SegmentInput, @builtin(vertex_index) vertexIndex: u32) -> Vert
 fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
   let base = vec4<f32>(0.8, 0.35, 0.1, 1.0);
   let alpha = base.a * input.color.a;
-  let fogged = apply_fog(
-    view.fog,
-    fogRayFromNdc(input.clip_position),
-    vec4<f32>(base.rgb * input.color.rgb, alpha),
-  );
-  return vec4<f32>(fogged.rgb * fogged.a, fogged.a);
+  return vec4<f32>(base.rgb * input.color.rgb * alpha, alpha);
 }