fix: default to visual mode (20 outputs) and fix FlowField canvas resize
Change default outputMode from 'synth' to 'visual' in ml-store.ts so FlowField particles render immediately on page load. Fix FlowField component canvas initialization: create visualizer in ResizeObserver callback (after layout) instead of in createEffect (before layout settles), preventing the default 300x150 canvas size issue. Add window resize listener as fallback. Update all 13 affected tests to expect 20 outputs (visual mode default) instead of 126 (synth mode). Unblocks VAL-VIS-001, VAL-VIS-002, VAL-VIS-003. Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
This commit is contained in:
parent
4e98228531
commit
1127c8aac9
6 changed files with 53 additions and 39 deletions
|
|
@ -13,7 +13,6 @@ import {
|
||||||
onMount,
|
onMount,
|
||||||
onCleanup,
|
onCleanup,
|
||||||
createEffect,
|
createEffect,
|
||||||
Show,
|
|
||||||
} from 'solid-js';
|
} from 'solid-js';
|
||||||
import type { MLStore } from '../../stores/ml-store';
|
import type { MLStore } from '../../stores/ml-store';
|
||||||
import { FlowFieldVisualizer } from '../../core/ui/flow-field';
|
import { FlowFieldVisualizer } from '../../core/ui/flow-field';
|
||||||
|
|
@ -28,9 +27,12 @@ export default function FlowField(props: FlowFieldProps) {
|
||||||
let visualizer: FlowFieldVisualizer | undefined;
|
let visualizer: FlowFieldVisualizer | undefined;
|
||||||
let rafId: number = 0;
|
let rafId: number = 0;
|
||||||
|
|
||||||
// Resize handler — updates canvas buffer dimensions
|
// Resize handler — updates canvas buffer dimensions and reinitializes particles
|
||||||
function handleResize(): void {
|
function handleResize(): void {
|
||||||
if (visualizer && canvasRef) {
|
if (!canvasRef) return;
|
||||||
|
if (!visualizer) {
|
||||||
|
visualizer = new FlowFieldVisualizer(canvasRef);
|
||||||
|
} else {
|
||||||
visualizer.resize();
|
visualizer.resize();
|
||||||
visualizer.initParticles();
|
visualizer.initParticles();
|
||||||
}
|
}
|
||||||
|
|
@ -57,27 +59,39 @@ export default function FlowField(props: FlowFieldProps) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start/stop render loop based on output mode
|
|
||||||
createEffect(() => {
|
|
||||||
const mode = props.mlStore.state.outputMode;
|
|
||||||
if (mode === 'visual' && canvasRef) {
|
|
||||||
if (!visualizer) {
|
|
||||||
visualizer = new FlowFieldVisualizer(canvasRef);
|
|
||||||
}
|
|
||||||
startLoop();
|
|
||||||
} else {
|
|
||||||
stopLoop();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
// Set up resize observer
|
if (!canvasRef) return;
|
||||||
if (canvasRef) {
|
|
||||||
|
// Set up resize observer — this fires after the canvas has layout dimensions,
|
||||||
|
// avoiding the default 300x150 canvas size problem
|
||||||
const observer = new ResizeObserver(() => {
|
const observer = new ResizeObserver(() => {
|
||||||
handleResize();
|
handleResize();
|
||||||
});
|
});
|
||||||
observer.observe(canvasRef);
|
observer.observe(canvasRef);
|
||||||
onCleanup(() => observer.disconnect());
|
onCleanup(() => observer.disconnect());
|
||||||
|
|
||||||
|
// Also handle window resize as fallback
|
||||||
|
window.addEventListener('resize', handleResize);
|
||||||
|
onCleanup(() => window.removeEventListener('resize', handleResize));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Start/stop render loop based on output mode
|
||||||
|
createEffect(() => {
|
||||||
|
const mode = props.mlStore.state.outputMode;
|
||||||
|
if (mode === 'visual') {
|
||||||
|
// If visualizer isn't created yet (e.g. first effect run before ResizeObserver fires),
|
||||||
|
// create it now — but only if canvas has real dimensions (not default 300x150)
|
||||||
|
if (!visualizer && canvasRef) {
|
||||||
|
const rect = canvasRef.getBoundingClientRect();
|
||||||
|
if (rect.width > 0 && rect.height > 0) {
|
||||||
|
visualizer = new FlowFieldVisualizer(canvasRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (visualizer) {
|
||||||
|
startLoop();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
stopLoop();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -92,14 +92,14 @@ export interface MLStore {
|
||||||
|
|
||||||
export async function createMLStore(bus: SignalBus): Promise<MLStore> {
|
export async function createMLStore(bus: SignalBus): Promise<MLStore> {
|
||||||
const [state, setState] = createStore<MLState>({
|
const [state, setState] = createStore<MLState>({
|
||||||
outputMode: 'synth', // default mode — old app starts at N_SYNTH_OUTPUTS
|
outputMode: 'visual', // default mode — FlowField particles render on load
|
||||||
midiCCCount: N_MIDI_CC_DEFAULT,
|
midiCCCount: N_MIDI_CC_DEFAULT,
|
||||||
spreadLevel: 0.6,
|
spreadLevel: 0.6,
|
||||||
initialized: false,
|
initialized: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Outputs as signal — Float32Array MUST NOT go in store (proxy overhead)
|
// Outputs as signal — Float32Array MUST NOT go in store (proxy overhead)
|
||||||
const initialCount = outputCountForMode('synth');
|
const initialCount = outputCountForMode('visual');
|
||||||
const [outputs, setOutputs] = createSignal<Float32Array>(new Float32Array(initialCount));
|
const [outputs, setOutputs] = createSignal<Float32Array>(new Float32Array(initialCount));
|
||||||
const [outputCount, setOutputCount] = createSignal<number>(initialCount);
|
const [outputCount, setOutputCount] = createSignal<number>(initialCount);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ test.describe('Debug Probe (f03)', () => {
|
||||||
|
|
||||||
// ─── Probe method smoke tests ───
|
// ─── Probe method smoke tests ───
|
||||||
|
|
||||||
test('probe.getOutputs returns array of 126 bounded values', async ({ page }) => {
|
test('probe.getOutputs returns array of 20 bounded values (visual mode default)', async ({ page }) => {
|
||||||
await loadSolidApp(page);
|
await loadSolidApp(page);
|
||||||
|
|
||||||
const result = await page.evaluate(() => {
|
const result = await page.evaluate(() => {
|
||||||
|
|
@ -108,7 +108,7 @@ test.describe('Debug Probe (f03)', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.isArray).toBe(true);
|
expect(result.isArray).toBe(true);
|
||||||
expect(result.length).toBe(126);
|
expect(result.length).toBe(20); // visual mode is default
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -202,7 +202,7 @@ test.describe('Debug Probe (f03)', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.length).toBe(3);
|
expect(result.length).toBe(3);
|
||||||
expect(result.eachLength).toEqual([126, 126, 126]);
|
expect(result.eachLength).toEqual([20, 20, 20]); // visual mode default
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ test.describe('ML Store — Dual IML', () => {
|
||||||
|
|
||||||
// ─── VAL-ML-001: Initial outputs bounded [0,1] ───
|
// ─── VAL-ML-001: Initial outputs bounded [0,1] ───
|
||||||
|
|
||||||
test('VAL-ML-001a: getOutputs() returns 126 values on fresh load', async ({ page }) => {
|
test('VAL-ML-001a: getOutputs() returns 20 values on fresh load (visual mode default)', async ({ page }) => {
|
||||||
await loadSolidApp(page);
|
await loadSolidApp(page);
|
||||||
|
|
||||||
const result = await page.evaluate(() => {
|
const result = await page.evaluate(() => {
|
||||||
|
|
@ -25,7 +25,7 @@ test.describe('ML Store — Dual IML', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.isArray).toBe(true);
|
expect(result.isArray).toBe(true);
|
||||||
expect(result.length).toBe(126);
|
expect(result.length).toBe(20); // visual mode is default
|
||||||
});
|
});
|
||||||
|
|
||||||
test('VAL-ML-001b: all initial outputs are in [0,1]', async ({ page }) => {
|
test('VAL-ML-001b: all initial outputs are in [0,1]', async ({ page }) => {
|
||||||
|
|
@ -65,11 +65,11 @@ test.describe('ML Store — Dual IML', () => {
|
||||||
|
|
||||||
// ─── VAL-ML-022: Output count changes with mode ───
|
// ─── VAL-ML-022: Output count changes with mode ───
|
||||||
|
|
||||||
test('VAL-ML-022a: default output count is 126 (synth mode default)', async ({ page }) => {
|
test('VAL-ML-022a: default output count is 20 (visual mode default)', async ({ page }) => {
|
||||||
await loadSolidApp(page);
|
await loadSolidApp(page);
|
||||||
|
|
||||||
const length = await page.evaluate(() => (window as any).__nisps.getOutputs().length);
|
const length = await page.evaluate(() => (window as any).__nisps.getOutputs().length);
|
||||||
expect(length).toBe(126);
|
expect(length).toBe(20); // visual mode is default
|
||||||
});
|
});
|
||||||
|
|
||||||
test('VAL-ML-022b: outputCount signal tracks current count', async ({ page }) => {
|
test('VAL-ML-022b: outputCount signal tracks current count', async ({ page }) => {
|
||||||
|
|
@ -80,8 +80,8 @@ test.describe('ML Store — Dual IML', () => {
|
||||||
return store.outputCount();
|
return store.outputCount();
|
||||||
});
|
});
|
||||||
|
|
||||||
// Default is 126 (synth mode is default)
|
// Default is 20 (visual mode is default)
|
||||||
expect(result).toBe(126);
|
expect(result).toBe(20);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('VAL-ML-022c: mode change to visual produces 20 outputs', async ({ page }) => {
|
test('VAL-ML-022c: mode change to visual produces 20 outputs', async ({ page }) => {
|
||||||
|
|
@ -215,8 +215,8 @@ test.describe('ML Store — Dual IML', () => {
|
||||||
expect(result.hasHandIml).toBe(true);
|
expect(result.hasHandIml).toBe(true);
|
||||||
expect(result.joyInputs).toBe(2);
|
expect(result.joyInputs).toBe(2);
|
||||||
expect(result.handInputs).toBe(14);
|
expect(result.handInputs).toBe(14);
|
||||||
expect(result.joyOutputs).toBe(126);
|
expect(result.joyOutputs).toBe(20); // visual mode is default
|
||||||
expect(result.handOutputs).toBe(126);
|
expect(result.handOutputs).toBe(20); // visual mode is default
|
||||||
});
|
});
|
||||||
|
|
||||||
test('loss remains null and exampleCount remains 0 after mode switch', async ({ page }) => {
|
test('loss remains null and exampleCount remains 0 after mode switch', async ({ page }) => {
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ test.describe('Reactive Inference Loop (f05)', () => {
|
||||||
expect(result.allDifferent).toBe(true);
|
expect(result.allDifferent).toBe(true);
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
expect(result.count).toBe(5);
|
expect(result.count).toBe(5);
|
||||||
expect(result.eachLength).toBe(126);
|
expect(result.eachLength).toBe(20); // visual mode default
|
||||||
});
|
});
|
||||||
|
|
||||||
test('VAL-ML-004c: changing only X produces different outputs', async ({ page }) => {
|
test('VAL-ML-004c: changing only X produces different outputs', async ({ page }) => {
|
||||||
|
|
@ -140,7 +140,7 @@ test.describe('Reactive Inference Loop (f05)', () => {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.length).toBe(126);
|
expect(result.length).toBe(20); // visual mode default
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
expect(result.allFinite).toBe(true);
|
expect(result.allFinite).toBe(true);
|
||||||
// With random weights, outputs shouldn't all be zero
|
// With random weights, outputs shouldn't all be zero
|
||||||
|
|
@ -227,7 +227,7 @@ test.describe('Reactive Inference Loop (f05)', () => {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.length).toBe(126);
|
expect(result.length).toBe(20); // visual mode default
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
expect(result.allFinite).toBe(true);
|
expect(result.allFinite).toBe(true);
|
||||||
// Clamped values should produce same outputs as explicitly clamped values
|
// Clamped values should produce same outputs as explicitly clamped values
|
||||||
|
|
@ -392,7 +392,7 @@ test.describe('Reactive Inference Loop (f05)', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.hasTopic).toBe(true);
|
expect(result.hasTopic).toBe(true);
|
||||||
expect(result.afterLength).toBe(126);
|
expect(result.afterLength).toBe(20); // visual mode default
|
||||||
expect(result.changed).toBe(true);
|
expect(result.changed).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ test.describe('Vite + WASM spike', () => {
|
||||||
expect(criticalErrors).toEqual([]);
|
expect(criticalErrors).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('VAL-PROJ-003: WASM loads and inference returns 126 bounded outputs', async ({ page }) => {
|
test('VAL-PROJ-003: WASM loads and inference returns 20 bounded outputs (visual mode default)', async ({ page }) => {
|
||||||
await loadSolidApp(page);
|
await loadSolidApp(page);
|
||||||
|
|
||||||
const result = await page.evaluate(() => {
|
const result = await page.evaluate(() => {
|
||||||
|
|
@ -53,7 +53,7 @@ test.describe('Vite + WASM spike', () => {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.length).toBe(126);
|
expect(result.length).toBe(20); // visual mode is default
|
||||||
expect(result.min).toBeGreaterThanOrEqual(0);
|
expect(result.min).toBeGreaterThanOrEqual(0);
|
||||||
expect(result.max).toBeLessThanOrEqual(1);
|
expect(result.max).toBeLessThanOrEqual(1);
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
|
|
@ -80,7 +80,7 @@ test.describe('Vite + WASM spike', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.same).toBe(false);
|
expect(result.same).toBe(false);
|
||||||
expect(result.outputs2Length).toBe(126);
|
expect(result.outputs2Length).toBe(20); // visual mode default
|
||||||
expect(result.outputs2Bounded).toBe(true);
|
expect(result.outputs2Bounded).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -143,7 +143,7 @@ test.describe('Vite + WASM spike', () => {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.length).toBe(126);
|
expect(result.length).toBe(20); // visual mode default
|
||||||
expect(result.allBounded).toBe(true);
|
expect(result.allBounded).toBe(true);
|
||||||
expect(result.allFinite).toBe(true);
|
expect(result.allFinite).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue