mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-08-10 18:59:56 +00:00
The heat-coloured fret-number row is drawn as a band BELOW the board (sY(lowest) - S_GAP*1.4), but camUpdate's self-correcting framing only anchors the board CENTRE to the lower third of the screen and reserves no headroom for that row. So a tight zoom on a centred active span (worst mid-neck; fine at either end of the neck) pushes the numbers past the bottom edge -- which is why testers saw it "only when centered" and "not every song." Tilt can't fix it (it would only trade a bottom clip for a top clip); the vertical-extent problem at tight zoom needs camera distance. Add a fret-row fit guard: project the row band with the final camera and, when it falls below FRET_ROW_FIT_NDC_MIN, raise a capped, hysteretic _fretRowFitBoost applied to the curDist lerp target (the span-driven tgtDist still owns zooming IN). The boost rises promptly (proportional to the deficit), relaxes lazily past a deadband, and is capped at FRET_ROW_FIT_BOOST_MAX (+60%) so the zoom can't pop or hunt. It cooperates with the tilt loop (pull-back shrinks the scene, tilt keeps the centre anchored) and yields entirely to the Camera Director free-cam. Surgical: passages where the row is already visible never trigger it, so framing is unchanged everywhere it already worked. plugin.json 3.30.0 -> 3.30.2 (screen.js cache-buster; 3.30.1 is taken by the FPS-counter PR). Tests: tests/js/highway_3d_camera_framing.test.js (guard constants, the boosted curDist lerp, the projected-row hysteresis, free-cam yield). Fixes #632 Claude-Session: https://claude.ai/code/session_01QbexxfTt8q2tAn436MqGWF Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
192 lines
8.4 KiB
JavaScript
192 lines
8.4 KiB
JavaScript
// Pins the camera framing + lookahead behaviour in
|
|
// plugins/highway_3d/screen.js.
|
|
//
|
|
// Two independent pieces are covered:
|
|
// 1. Zoom-dependent framing — the cam.position height/depth multipliers are
|
|
// interpolated by zoom distance between a NEAR (tight, nut-position) and a
|
|
// FAR (wide, whole-neck) view via the CAM_FRAME_* constants, instead of
|
|
// being fixed literals.
|
|
// 2. Measure-based lookahead — the camera lookahead window spans
|
|
// CAM_LOOKAHEAD_MEASURES measures ahead (derived from the chart beats,
|
|
// ignoring intra-measure measure === -1 beats) instead of a fixed number
|
|
// of seconds.
|
|
//
|
|
// A refactor that re-hardcodes the framing multipliers, drops the measure
|
|
// cache, or reverts the lookahead window to seconds would silently regress the
|
|
// camera. Also guards that the temporary debug hook stayed removed.
|
|
//
|
|
// Source-level only — same strategy as the other tests/js/ files.
|
|
|
|
const { test } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
|
|
const SCREEN_JS = path.join(__dirname, '..', '..', 'plugins', 'highway_3d', 'screen.js');
|
|
const src = fs.readFileSync(SCREEN_JS, 'utf8');
|
|
|
|
// ── Zoom-dependent framing ──────────────────────────────────────────────────
|
|
|
|
test('framing NEAR/FAR multiplier constants are defined', () => {
|
|
for (const name of [
|
|
'CAM_FRAME_DIST_NEAR', 'CAM_FRAME_DIST_FAR',
|
|
'CAM_FRAME_H_NEAR', 'CAM_FRAME_H_FAR',
|
|
'CAM_FRAME_D_NEAR', 'CAM_FRAME_D_FAR',
|
|
]) {
|
|
assert.match(src, new RegExp('const\\s+' + name + '\\s*='),
|
|
`${name} must be declared as a framing constant`);
|
|
}
|
|
});
|
|
|
|
test('cam.position uses interpolated framing multipliers, not literals', () => {
|
|
// The height/depth multipliers are computed (_hMul / _dMul), not inlined.
|
|
// The base position is assigned into _camX/_camY/_camZ so the opt-in
|
|
// free-camera bridge (#771) can layer orbit/zoom/height on top before the
|
|
// single cam.position.set; the multipliers must still feed _camY/_camZ.
|
|
assert.match(
|
|
src,
|
|
/_camX\s*=\s*curX\s*\+\s*shoulderOffset\s*,\s*_camY\s*=\s*h\s*\*\s*_hMul\s*,\s*_camZ\s*=\s*dist\s*\*\s*_dMul/,
|
|
'the base camera position must use the interpolated _hMul / _dMul multipliers',
|
|
);
|
|
assert.match(
|
|
src,
|
|
/cam\.position\.set\(\s*_camX\s*,\s*_camY\s*,\s*_camZ\s*\)/,
|
|
'cam.position.set must apply the computed _camX / _camY / _camZ',
|
|
);
|
|
});
|
|
|
|
test('framing multipliers are a clamped zoom-distance interpolation', () => {
|
|
// _zt is clamped to [0,1] and lerps each multiplier between NEAR and FAR.
|
|
assert.match(
|
|
src,
|
|
/Math\.max\(0,\s*Math\.min\(1,[\s\S]*?CAM_FRAME_DIST_NEAR[\s\S]*?CAM_FRAME_DIST_FAR/,
|
|
'_zt must clamp (dist - NEAR)/(FAR - NEAR) into [0,1]',
|
|
);
|
|
assert.match(
|
|
src,
|
|
/CAM_FRAME_H_NEAR\s*\+\s*\(\s*CAM_FRAME_H_FAR\s*-\s*CAM_FRAME_H_NEAR\s*\)\s*\*\s*_zt/,
|
|
'height multiplier must lerp NEAR->FAR by _zt',
|
|
);
|
|
assert.match(
|
|
src,
|
|
/CAM_FRAME_D_NEAR\s*\+\s*\(\s*CAM_FRAME_D_FAR\s*-\s*CAM_FRAME_D_NEAR\s*\)\s*\*\s*_zt/,
|
|
'depth multiplier must lerp NEAR->FAR by _zt',
|
|
);
|
|
});
|
|
|
|
// ── Measure-based lookahead window ──────────────────────────────────────────
|
|
|
|
test('lookahead window is expressed in measures with a seconds fallback', () => {
|
|
assert.match(src, /const\s+CAM_LOOKAHEAD_MEASURES\s*=\s*9\b/,
|
|
'CAM_LOOKAHEAD_MEASURES must default to 9');
|
|
assert.match(src, /const\s+CAM_LOOKAHEAD_SEC\s*=\s*3\.0\b/,
|
|
'CAM_LOOKAHEAD_SEC must stay as the no-beats fallback');
|
|
});
|
|
|
|
test('measure-start cache only keeps beats with measure >= 0', () => {
|
|
// Intra-measure beats carry measure === -1 and must be skipped.
|
|
assert.match(
|
|
src,
|
|
/Number\.isFinite\(\s*_b\.measure\s*\)\s*&&\s*_b\.measure\s*>=\s*0[\s\S]*?_measureStarts\s*=\s*_ms/,
|
|
'only measure-start beats (measure >= 0) feed _measureStarts',
|
|
);
|
|
});
|
|
|
|
test('lookaheadEndTime targets the measure CAM_LOOKAHEAD_MEASURES ahead', () => {
|
|
assert.match(
|
|
src,
|
|
/function\s+lookaheadEndTime\s*\(\s*now\s*\)/,
|
|
'lookaheadEndTime(now) helper must exist',
|
|
);
|
|
assert.match(
|
|
src,
|
|
/const\s+targetIdx\s*=\s*curIdx\s*\+\s*CAM_LOOKAHEAD_MEASURES/,
|
|
'target measure index = current measure + CAM_LOOKAHEAD_MEASURES',
|
|
);
|
|
// No beats → seconds fallback.
|
|
assert.match(
|
|
src,
|
|
/if\s*\(\s*!ms\s*\|\|\s*ms\.length\s*===\s*0\s*\)\s*return\s+now\s*\+\s*CAM_LOOKAHEAD_SEC/,
|
|
'lookaheadEndTime must fall back to seconds when there are no measures',
|
|
);
|
|
});
|
|
|
|
test('fret-bounds scan drives its window off lookaheadEndTime, not fixed seconds', () => {
|
|
assert.match(
|
|
src,
|
|
/function\s+lookaheadComputeFretBounds[\s\S]*?const\s+tEnd\s*=\s*lookaheadEndTime\(\s*now\s*\)/,
|
|
'lookaheadComputeFretBounds must derive tEnd from lookaheadEndTime(now)',
|
|
);
|
|
});
|
|
|
|
test('measure-start cache is invalidated on song change', () => {
|
|
// The song-change reset (reconnect path) resets _camSnapped; it must also
|
|
// drop the measure-start cache, otherwise lookaheadEndTime sizes the window
|
|
// off the previous song's measure grid and over-zooms the first-data snap.
|
|
assert.match(
|
|
src,
|
|
/_camSnapped\s*=\s*false\s*;[\s\S]*?_measureStarts\s*=\s*\[\]\s*;\s*_measureStartsRef\s*=\s*null\s*;/,
|
|
'song-change reset must clear _measureStarts / _measureStartsRef alongside _camSnapped',
|
|
);
|
|
});
|
|
|
|
// ── Fret-row fit guard ──────────────────────────────────────────────────────
|
|
// Keeps the heat-coloured fret-number row from clipping off the bottom edge
|
|
// when a tight, centred zoom (worst mid-neck) drops it below the lower-third
|
|
// framing. camUpdate dollies the camera back via a capped, hysteretic boost.
|
|
|
|
test('fret-row fit guard constants are defined', () => {
|
|
for (const name of [
|
|
'FRET_ROW_FIT_NDC_MIN', 'FRET_ROW_FIT_DEADBAND', 'FRET_ROW_FIT_BOOST_MAX',
|
|
]) {
|
|
assert.match(src, new RegExp('const\\s+' + name + '\\s*='),
|
|
`${name} must be declared as a fit-guard constant`);
|
|
}
|
|
});
|
|
|
|
test('the curDist lerp target applies the fit-guard dolly boost', () => {
|
|
// The span-driven tgtDist still owns zooming in; the boost only pulls back.
|
|
assert.match(
|
|
src,
|
|
/curDist\s*\+=\s*\(\s*tgtDist\s*\*\s*_fretRowFitBoost\s*-\s*curDist\s*\)\s*\*\s*lerp/,
|
|
'curDist must lerp toward tgtDist * _fretRowFitBoost',
|
|
);
|
|
});
|
|
|
|
test('the guard projects the fret-row band and adjusts the boost with hysteresis', () => {
|
|
// Row band Y mirrors the render position (sY(lowest) - S_GAP * 1.4).
|
|
assert.match(
|
|
src,
|
|
/Math\.min\(\s*sY\(0\)\s*,\s*sY\(nStr\s*-\s*1\)\s*\)\s*-\s*S_GAP\s*\*\s*1\.4/,
|
|
'the guard must probe the same row band the fret-number row is drawn at',
|
|
);
|
|
// Prompt pull-back when below the min, capped at BOOST_MAX.
|
|
assert.match(
|
|
src,
|
|
/_rowNdcY\s*<\s*FRET_ROW_FIT_NDC_MIN[\s\S]*?Math\.min\(\s*FRET_ROW_FIT_BOOST_MAX/,
|
|
'below the min NDC the boost rises, capped at FRET_ROW_FIT_BOOST_MAX',
|
|
);
|
|
// Lazy relax only once past the deadband, floored at 1.
|
|
assert.match(
|
|
src,
|
|
/_rowNdcY\s*>\s*FRET_ROW_FIT_NDC_MIN\s*\+\s*FRET_ROW_FIT_DEADBAND[\s\S]*?Math\.max\(\s*1\s*,\s*_fretRowFitBoost/,
|
|
'past the deadband the boost relaxes back toward 1',
|
|
);
|
|
});
|
|
|
|
test('the fit guard yields to the free-cam (Camera Director)', () => {
|
|
// When the free-cam owns the view the auto dolly must reset to 1, not fight it.
|
|
assert.match(
|
|
src,
|
|
/if\s*\(\s*_freeCam\s*&&\s*_freeCam\.enabled\s*\)\s*\{\s*if\s*\(\s*_fretRowFitBoost\s*!==\s*1\s*\)\s*_fretRowFitBoost\s*=\s*1/,
|
|
'with the free-cam enabled the guard must drop any auto dolly back to 1',
|
|
);
|
|
});
|
|
|
|
// ── Debug hook stayed removed ───────────────────────────────────────────────
|
|
|
|
test('temporary camera debug hook is not present', () => {
|
|
assert.doesNotMatch(src, /h3dCamDebug/,
|
|
'the window.h3dCamDebug tuning hook must not ship in the renderer');
|
|
});
|