@flighthq/effects-gl 0.4.0-next.1602.af48ed1 → 0.4.0-next.1663.d9c5746

package/dist/glKuwaharaEffect.js

@@ -31,16 +31,16 @@ void main() {
   int r = int(min(float(R), u_radius));
   vec3 means[4];
   float vars[4];
-  ivec2 lo[4] = ivec2[4](ivec2(-1, -1), ivec2(0, -1), ivec2(-1, 0), ivec2(0, 0));
   for (int q = 0; q < 4; q++) {
+    int ox = (q & 1) == 0 ? -r : 0;
+    int oy = (q & 2) == 0 ? 0 : -r;
     vec3 sum = vec3(0.0);
     vec3 sumSq = vec3(0.0);
     float n = 0.0;
     for (int y = 0; y <= R; y++) {
       for (int x = 0; x <= R; x++) {
         if (x > r || y > r) continue;
-        ivec2 d = ivec2(x, y) * sign(lo[q] + ivec2(1)) + lo[q] * r;
-        vec2 off = vec2(float(d.x), float(d.y)) * texel;
+        vec2 off = vec2(float(ox + x), float(oy + y)) * texel;
         vec3 col = texture(u_texture0, v_texCoord + off).rgb;
         sum += col;
         sumSq += col * col;
@@ -54,12 +54,18 @@ void main() {
   }
   float minVar = vars[0];
   vec3 result = means[0];
+  float tiedCount = 1.0;
   for (int q = 1; q < 4; q++) {
     if (vars[q] < minVar) {
       minVar = vars[q];
       result = means[q];
+      tiedCount = 1.0;
+    } else if (vars[q] == minVar) {
+      result += means[q];
+      tiedCount += 1.0;
     }
   }
+  result /= tiedCount;
   o_color = vec4(result, texture(u_texture0, v_texCoord).a);
 }`;
 //# sourceMappingURL=glKuwaharaEffect.js.map

package/dist/glKuwaharaEffect.js.map

@@ -1 +1 @@
-{"version":3,"file":"glKuwaharaEffect.js","sourceRoot":"","sources":["../src/glKuwaharaEffect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,kGAAkG;AAClG,sGAAsG;AACtG,wEAAwE;AACxE,MAAM,UAAU,uBAAuB,CACrC,KAAoB,EACpB,MAAgC,EAChC,IAA8B,EAC9B,MAAgC;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,CAAC;IACzF,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACrE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAChF,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;IACjF,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,MAAwB,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,UAAU,wBAAwB,CAAC,KAAoB;IAC3D,sBAAsB,CAAC,KAAK,EAAE,gBAAgB,EAAE,6BAA6B,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2C5B,CAAC"}
+{"version":3,"file":"glKuwaharaEffect.js","sourceRoot":"","sources":["../src/glKuwaharaEffect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,kGAAkG;AAClG,sGAAsG;AACtG,wEAAwE;AACxE,MAAM,UAAU,uBAAuB,CACrC,KAAoB,EACpB,MAAgC,EAChC,IAA8B,EAC9B,MAAgC;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,CAAC;IACzF,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACrE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAChF,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;IACjF,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,MAAwB,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,UAAU,wBAAwB,CAAC,KAAoB;IAC3D,sBAAsB,CAAC,KAAK,EAAE,gBAAgB,EAAE,6BAA6B,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiD5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/effects-gl",
-  "version": "0.4.0-next.1602.af48ed1",
+  "version": "0.4.0-next.1663.d9c5746",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,14 +38,14 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/adjustments": "0.4.0-next.1602.af48ed1",
-    "@flighthq/color": "0.4.0-next.1602.af48ed1",
-    "@flighthq/effects": "0.4.0-next.1602.af48ed1",
-    "@flighthq/geometry": "0.4.0-next.1602.af48ed1",
-    "@flighthq/log": "0.4.0-next.1602.af48ed1",
-    "@flighthq/render-gl": "0.4.0-next.1602.af48ed1",
-    "@flighthq/registry": "0.4.0-next.1602.af48ed1",
-    "@flighthq/types": "0.4.0-next.1602.af48ed1"
+    "@flighthq/adjustments": "0.4.0-next.1663.d9c5746",
+    "@flighthq/color": "0.4.0-next.1663.d9c5746",
+    "@flighthq/effects": "0.4.0-next.1663.d9c5746",
+    "@flighthq/geometry": "0.4.0-next.1663.d9c5746",
+    "@flighthq/log": "0.4.0-next.1663.d9c5746",
+    "@flighthq/render-gl": "0.4.0-next.1663.d9c5746",
+    "@flighthq/registry": "0.4.0-next.1663.d9c5746",
+    "@flighthq/types": "0.4.0-next.1663.d9c5746"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/glDisplacementEffect.test.ts

@@ -1,23 +1,129 @@
+import { createGlRenderState } from '@flighthq/render-gl/contract';
+import type { DisplacementEffect, GlRenderState, GlRenderTarget } from '@flighthq/types/contract';
+
+const programMock = vi.hoisted(() => ({
+  getGlEffectProgram: vi.fn((_state: unknown, _key: string, _source: string) => ({ program: {} })),
+}));
+const glMock = vi.hoisted(() => ({
+  uniform1f: vi.fn((_location: unknown, _value: number) => {}),
+  uniform2f: vi.fn((_location: unknown, _x: number, _y: number) => {}),
+}));
+
+vi.mock('./glEffectProgramCache', () => programMock);
+
+vi.mock('@flighthq/render-gl/contract', async () => {
+  const actual = (await vi.importActual('@flighthq/render-gl/contract')) as Record<string, unknown>;
+  return {
+    ...actual,
+    drawGlFullscreenPass: vi.fn((_state, _program, _textures, _dest, setUniforms) => {
+      setUniforms({ ...glMock, getUniformLocation: (_program: unknown, name: string) => name }, { program: {} });
+    }),
+  };
+});
+
 import {
   applyDisplacementEffectToGl,
   defaultGlDisplacementEffectRunner,
   registerGlDisplacementEffect,
 } from './glDisplacementEffect';
+import { getGlRenderEffectRunner } from './glRenderEffectRegistry';
+import { evaluateGlslScalarExpression, extractGlslExpression } from './glShaderTestHelper';
+
+const SOURCE_WIDTH = 128;
+const SOURCE_HEIGHT = 64;
+
+beforeEach(() => {
+  programMock.getGlEffectProgram.mockClear();
+  glMock.uniform1f.mockClear();
+  glMock.uniform2f.mockClear();
+});
+
+function apply(effect: Readonly<Partial<DisplacementEffect>> = {}): void {
+  const target = { height: SOURCE_HEIGHT, texture: {}, width: SOURCE_WIDTH } as unknown as GlRenderTarget;
+  applyDisplacementEffectToGl({ gl: {} } as unknown as GlRenderState, target, target, {
+    kind: 'DisplacementEffect',
+    ...effect,
+  } as DisplacementEffect);
+}
+
+function shaderSource(): string {
+  apply();
+  return programMock.getGlEffectProgram.mock.calls[0]![2] as string;
+}
+
+function uniformValue(name: string): number {
+  const call = glMock.uniform1f.mock.calls.find((entry) => entry[0] === name);
+  if (call === undefined) throw new Error(`no uniform1f call for ${name}`);
+  return call[1] as number;
+}
 
 describe('applyDisplacementEffectToGl', () => {
-  it('is a function', () => {
-    expect(typeof applyDisplacementEffectToGl).toBe('function');
+  // The defect repaired in 1d71634fc used the bottom-left texcoord directly for this phase. The test
+  // evaluates the shader's own image-row and wave expressions, so restoring that line either loses the
+  // required imageY binding or produces the opposite row's phase.
+  it('drives the horizontal warp from top-left image space', () => {
+    const source = shaderSource();
+    const imageY = evaluateGlslScalarExpression(extractGlslExpression(source, /float imageY = ([^;]+);/), {
+      'v_texCoord.y': 0.8,
+    });
+    const warpX = evaluateGlslScalarExpression(extractGlslExpression(source, /vec2 warp = vec2\(\s*([^,]+),/s), {
+      f: 2.5,
+      imageY,
+      u_seed: 0.3,
+    });
+    const expected = Math.sin(0.2 * 2.5 + 0.3) + Math.sin(0.2 * 2.5 * 2.3 + 0.3 * 1.7) * 0.5;
+
+    expect(imageY).toBeCloseTo(0.2, 10);
+    expect(warpX).toBeCloseTo(expected, 10);
+  });
+
+  it('negates a vertical image-space offset on the way back to bottom-left texcoords', () => {
+    const expression = extractGlslExpression(shaderSource(), /vec2 displaced = vec2\([^,]+,\s*([^)]+)\);/);
+    const displacedY = evaluateGlslScalarExpression(expression, {
+      'offset.y': 0.1,
+      'v_texCoord.y': 0.4,
+    });
+
+    expect(displacedY).toBeCloseTo(0.3, 10);
+  });
+
+  it('passes the descriptor and source dimensions through to the shader uniforms', () => {
+    apply({ frequency: 7, intensity: 3, seed: 0.25 });
+
+    expect(uniformValue('u_intensity')).toBe(3);
+    expect(uniformValue('u_frequency')).toBe(7);
+    expect(uniformValue('u_seed')).toBeCloseTo(0.25, 6);
+    expect(glMock.uniform2f).toHaveBeenCalledWith('u_resolution', SOURCE_WIDTH, SOURCE_HEIGHT);
+  });
+
+  it('uses the documented displacement defaults', () => {
+    apply();
+
+    expect(uniformValue('u_intensity')).toBe(8);
+    expect(uniformValue('u_frequency')).toBe(12);
+    expect(uniformValue('u_seed')).toBe(0);
   });
 });
 
 describe('defaultGlDisplacementEffectRunner', () => {
-  it('is a function', () => {
-    expect(typeof defaultGlDisplacementEffectRunner).toBe('function');
+  it('routes the runner context through to the pass', () => {
+    const target = { height: 8, texture: {}, width: 8 } as unknown as GlRenderTarget;
+
+    defaultGlDisplacementEffectRunner(
+      { dest: target, pool: { free: [], inUse: [] }, source: target, state: { gl: {} } } as never,
+      { intensity: 4, kind: 'DisplacementEffect' } as DisplacementEffect,
+    );
+
+    expect(uniformValue('u_intensity')).toBe(4);
   });
 });
 
 describe('registerGlDisplacementEffect', () => {
-  it('is a separately importable registration primitive', () => {
-    expect(registerGlDisplacementEffect).toBeTypeOf('function');
+  it('makes the runner resolvable for the DisplacementEffect kind', () => {
+    const state = createGlRenderState(document.createElement('canvas'));
+
+    expect(getGlRenderEffectRunner(state, 'DisplacementEffect')).toBeNull();
+    registerGlDisplacementEffect(state);
+    expect(getGlRenderEffectRunner(state, 'DisplacementEffect')).toBe(defaultGlDisplacementEffectRunner);
   });
 });

package/src/glScanlinesEffect.test.ts

@@ -1,23 +1,107 @@
+import { createGlRenderState } from '@flighthq/render-gl/contract';
+import type { GlRenderState, GlRenderTarget, ScanlinesEffect } from '@flighthq/types/contract';
+
+const programMock = vi.hoisted(() => ({
+  getGlEffectProgram: vi.fn((_state: unknown, _key: string, _source: string) => ({ program: {} })),
+}));
+const glMock = vi.hoisted(() => ({
+  uniform1f: vi.fn((_location: unknown, _value: number) => {}),
+}));
+
+vi.mock('./glEffectProgramCache', () => programMock);
+
+vi.mock('@flighthq/render-gl/contract', async () => {
+  const actual = (await vi.importActual('@flighthq/render-gl/contract')) as Record<string, unknown>;
+  return {
+    ...actual,
+    drawGlFullscreenPass: vi.fn((_state, _program, _textures, _dest, setUniforms) => {
+      setUniforms({ ...glMock, getUniformLocation: (_program: unknown, name: string) => name }, { program: {} });
+    }),
+  };
+});
+
+import { getGlRenderEffectRunner } from './glRenderEffectRegistry';
 import {
   applyScanlinesEffectToGl,
   defaultGlScanlinesEffectRunner,
   registerGlScanlinesEffect,
 } from './glScanlinesEffect';
+import { evaluateGlslScalarExpression, extractGlslExpression } from './glShaderTestHelper';
+
+beforeEach(() => {
+  programMock.getGlEffectProgram.mockClear();
+  glMock.uniform1f.mockClear();
+});
+
+function apply(effect: Readonly<Partial<ScanlinesEffect>> = {}): void {
+  const target = { height: 60, texture: {}, width: 80 } as unknown as GlRenderTarget;
+  applyScanlinesEffectToGl({ gl: {} } as unknown as GlRenderState, target, target, {
+    kind: 'ScanlinesEffect',
+    ...effect,
+  } as ScanlinesEffect);
+}
+
+function lineAtImageY(imageY: number, count: number): number {
+  apply();
+  const source = programMock.getGlEffectProgram.mock.calls[0]![2] as string;
+  const expression = extractGlslExpression(source, /float line = ([^;]+);/);
+  return evaluateGlslScalarExpression(expression, {
+    'v_texCoord.y': 1 - imageY,
+    u_count: count,
+  });
+}
+
+function uniformValue(name: string): number {
+  const call = glMock.uniform1f.mock.calls.find((entry) => entry[0] === name);
+  if (call === undefined) throw new Error(`no uniform1f call for ${name}`);
+  return call[1] as number;
+}
 
 describe('applyScanlinesEffectToGl', () => {
-  it('is a function', () => {
-    expect(typeof applyScanlinesEffectToGl).toBe('function');
+  // The shader runs against bottom-left texcoords while the effect is authored in top-left image space.
+  // A non-integral count makes the two rows observably different; an integral count can put both on the
+  // same sine phase and let the origin conversion disappear behind a passing assertion.
+  it('anchors the pattern to top-left image rows rather than bottom-left texcoords', () => {
+    const count = 2.5;
+
+    expect(lineAtImageY(0.2, count)).toBeCloseTo(1, 6);
+    expect(lineAtImageY(0.8, count)).toBeCloseTo(0.5, 6);
+  });
+
+  it('passes the descriptor values through to the shader uniforms', () => {
+    apply({ count: 17, intensity: 0.45 });
+
+    expect(uniformValue('u_count')).toBe(17);
+    expect(uniformValue('u_intensity')).toBeCloseTo(0.45, 6);
+  });
+
+  it('uses the documented scanline defaults', () => {
+    apply();
+
+    expect(uniformValue('u_count')).toBe(240);
+    expect(uniformValue('u_intensity')).toBeCloseTo(0.3, 6);
   });
 });
 
 describe('defaultGlScanlinesEffectRunner', () => {
-  it('is a function', () => {
-    expect(typeof defaultGlScanlinesEffectRunner).toBe('function');
+  it('routes the runner context through to the pass', () => {
+    const target = { height: 8, texture: {}, width: 8 } as unknown as GlRenderTarget;
+
+    defaultGlScanlinesEffectRunner(
+      { dest: target, pool: { free: [], inUse: [] }, source: target, state: { gl: {} } } as never,
+      { count: 13, kind: 'ScanlinesEffect' } as ScanlinesEffect,
+    );
+
+    expect(uniformValue('u_count')).toBe(13);
   });
 });
 
 describe('registerGlScanlinesEffect', () => {
-  it('is a separately importable registration primitive', () => {
-    expect(registerGlScanlinesEffect).toBeTypeOf('function');
+  it('makes the runner resolvable for the ScanlinesEffect kind', () => {
+    const state = createGlRenderState(document.createElement('canvas'));
+
+    expect(getGlRenderEffectRunner(state, 'ScanlinesEffect')).toBeNull();
+    registerGlScanlinesEffect(state);
+    expect(getGlRenderEffectRunner(state, 'ScanlinesEffect')).toBe(defaultGlScanlinesEffectRunner);
   });
 });