Fix original cutscene music lifecycle and verify walking lab route
This commit is contained in:
1 parent
c929f942e1
commit
b58138d7ba
16 files changed
+282
-18
No files matched your search
@@ -43,3 +43,30 @@ output in Original. Managed merge tests reject conflicting identities. The SDL
|
||||
dummy-device --effects-audio-smoke consumes original58/59 streams, retains a
|
||||
one-shot while stopping the loop, adds230 independently and clears all streams.
|
||||
No physical speaker, original timing/position or native Windows audio claim follows.
|
||||
|
||||
|
||||
## Cutscene music correction from user testing
|
||||
|
||||
The user reported music continuing during cutscenes in the packaged build.
|
||||
The prior consumer always looped STRT music underneath all speech. Original CAM
|
||||
activation416776..4167E1 explicitly checks current music database696004, obtains
|
||||
Jimmy complete+0xA38 handle, calls47D7A0(handle,0), unloads his selected music
|
||||
archive+0xA4C and clears696004. This happens before the new speech starts.
|
||||
DEFAULT447D5C returns early if Jimmy already controls the player; otherwise
|
||||
447F12..447F45 reloads his selected music and starts it again (source wave0).
|
||||
|
||||
SceneDirector now emits MusicStopped before an actual CAM speech and MusicRestarted
|
||||
when DEFAULT returns control from a sequence. SceneAudio disposes the music stream
|
||||
on stop and restarts the selected track on return; this is a restart, not a silent
|
||||
advancing/resumed loop. Speech, effects and source scene actions remain separate.
|
||||
The lab chain begins with CAM, so music stays stopped through its intervening MCA
|
||||
shots until DEFAULT. A standalone MCA has its own source path431280; a universal
|
||||
mute-on-any-speech rule is not established and has not been invented.
|
||||
|
||||
Seven exact EXE instruction checks guard the stop/restart sites. Director tests
|
||||
check stop-before-speech, silence between chained shots, one natural restart,
|
||||
no repeat restart with Jimmy already controlled, and skip restoration. The SDL
|
||||
dummy --cutscene-audio-smoke runs the actual16-cue lab chain against original audio
|
||||
resources and verifies zero queued music throughout, natural restart, reset silence
|
||||
and skip restart. It passes. This fixes the implemented lab music lifecycle;
|
||||
physical output/native Windows comparison remains user/runtime validation work.
|
||||
@@ -108,3 +108,10 @@ SceneAudio mixes independent SDL streams for music/speech/one-shots and owner-ke
|
||||
effect loops. Pickup and mechanism events are connected, including loop stop on
|
||||
bar movement completion/reset. Original positional/channel/volume policies and
|
||||
jetpack sound callbacks remain open; no online audio or services are used.
|
||||
|
||||
|
||||
Original CAM music stop and DEFAULT restart are director events subscribed by
|
||||
SceneAudio. Stopping disposes the loop and retains its selected resource identity;
|
||||
return starts the selected track again. Standalone speech streams do not decide
|
||||
music policy. Tests distinguish source CAM lifecycle from generic music/speech
|
||||
mixing and cover natural completion, reset and skip.
|
||||
@@ -35,11 +35,11 @@ separate evidence categories. **The game is not fully reconstructed/playable yet
|
||||
| TSK saves/task gates | All12 originals byte-round-trip | Bounded parse/write, task/items/score/checkpoint CLI resume; full game-state/menu save incomplete |
|
||||
| Lab CAM/MCA/AI interpreter | Source sequence tests + Linux GPU pass |16 speech cues, recovered camera formulas, skip/actions/control restoration; no original comparison |
|
||||
| Dynamic actors/sprites/models | Linux GPU pass |Carl/Goddard/Jimmy morphs, source Canv timing and9 original lab props; billboard/alpha, pivots and playback timing remain provisional |
|
||||
| Scene music/speech | Linux dummy-device pass |Independent stream consumption and speech replacement; speakers/latency/Windows audio unverified |
|
||||
| Scene music/speech | Linux dummy-device pass |CAM stops music before speech; full lab chain stays silent, DEFAULT restarts on completion/skip; reset tested. Packaged Linux/Wine64 lifecycle checks pass; speakers/latency/native Windows unverified |
|
||||
| VR01 star/trophy contacts | Source-data tests pass |5-point stars,300 trophy, acquired flags and contact-enter semantics; distance/exclusions/box approximation |
|
||||
| RETURN / renderer recreation | Linux headless pass |Original VR01 RETURN dispatch renders VR01 thenLV1B, zero validation errors; fades/window transition unverified |
|
||||
| Supplied scene availability |All35 GAMs supplied;33 have OMT geometry |Level3B/E GAMs are duplicate four-entity records apart from level code; registered OMT archives absent, normal gameplay use unverified; no substitution or established blocker |
|
||||
| Lab task/contact route | Managed and headless GPU pass |Explanation/jetpack/Carl/exit reachesSCENE60, score150 andlevel1; direct contacts do not verify navigation |
|
||||
| Lab task/contact route | Managed input replay + headless GPU pass |888 input-only movement steps with live contacts/NPC updates reachSCENE60, score150, jetpack andlevel1; separate direct-contact GPU rebuild check |
|
||||
| Patrol/support |10 patrol +13 support groups pass |Source phases/profiles and8 DLL magnitude refs; Carl sensing, Goddard follow and full wall response incomplete |
|
||||
| Buttons/doors | Source state tests and GPU props pass |Cooldown, hold/reversal, original model transforms; source broadphase/box order with modern narrowphase |
|
||||
| Dynamic collision |10 managed groups pass |Includes actual closed/open lab bars; full source solver/activation exclusions incomplete |
|
||||
|
||||
+25
-3
@@ -4,6 +4,25 @@
|
||||
user-verified Windows rendering checkpoint into an interactive original lab and
|
||||
jet pack tutorial flow. This is not a verified faithful complete scene or release.
|
||||
|
||||
## Latest user-tested correction
|
||||
|
||||
User testing found background music continuing during cutscenes. Recovered CAM
|
||||
416776..4167E1 stops/unloads the selected music; DEFAULT447F12..447F45 restarts it
|
||||
when control returns. The runtime now performs that handoff. Source-byte/director
|
||||
checks and actual SDL dummy streams verify silence through all16 lab cues, normal
|
||||
completion restart, reset silence and skip restart. See analysis/sound-effects.md.
|
||||
Both platform executables were republished with this correction. The packaged
|
||||
Linux and isolated Wine64 Windows executables pass the full music-lifecycle audio
|
||||
check. Linux packaged prompt/input/resize still passes with zero Vulkan validation
|
||||
errors. Native Windows listening remains unverified by the agent; source user
|
||||
report and exact static rules support this fix.
|
||||
|
||||
An additional managed replay now walks through explanation, jet pack, Carl and
|
||||
outside LOAD using only movement inputs, source live contacts and NPC patrol/body
|
||||
updates. It reachesSCENE60/score150 with jet pack owned after888 movement steps
|
||||
and7100.55 travel; the player is never repositioned. This strengthens port lab
|
||||
navigation coverage without proving original collision/cadence fidelity.
|
||||
|
||||
## Current integrated behavior
|
||||
|
||||
- Default play runs LV1B STARTEXP and its16-cue CAM/MCA/AI camera/speech sequence.
|
||||
@@ -57,7 +76,7 @@ confidence and approximation boundaries are retained there.
|
||||
|
||||
Managed checks cover source data, director/actions/cameras, task/interactions,
|
||||
patrol, recovered support, moving-box collision, jetpack states and HUD composition.
|
||||
Python currently has35 top-level regression tests plus2 targeted UI extraction tests.
|
||||
Python currently has36 top-level regression tests plus2 targeted UI extraction tests.
|
||||
Existing11 collision and13 movement groups pass;14 jetpack groups pass. Eight
|
||||
quick-magnitude float results are checked against an isolated original DLL probe.
|
||||
Original mode2 standing/jump animation probes confirm zero dynamic-point offsets
|
||||
@@ -70,9 +89,12 @@ jumps once, rises418.98 units and lands; VR immunity retains20 energy. The ordin
|
||||
with the explicit state table. These measurements verify port behavior only.
|
||||
See artifacts/full-integration-test.log and practice/jetpack logs for current checks.
|
||||
|
||||
The full scripts/test.sh integration passed:35 Python regressions,2 targeted UI
|
||||
The full scripts/test.sh integration passed at c929f94:35 Python regressions,2 targeted UI
|
||||
checks, all managed groups, GPU story/route/practice/VR04 replays, SDL dummy streams
|
||||
and539 unchanged original hashes. Both self-contained packages rebuilt successfully.
|
||||
and539 unchanged original hashes. The subsequent music correction passes targeted
|
||||
source-byte/director/SDL audio checks on both packages, plus native Linux window
|
||||
and input-only managed navigation regressions; hashes were reverified.
|
||||
Both self-contained packages rebuilt successfully.
|
||||
Linux package runs the12s story without SDK/source/Original mounted, zero Vulkan
|
||||
validation errors. Its GTX1070/Xvfb practice window pauses, receives N, resumes11
|
||||
steps and resizes800x600 with zero validation errors and original pickup audio.
|
||||
|
||||
+8
-6
@@ -24,12 +24,14 @@ compile, runtime and original-fidelity verification are separate.
|
||||
|
||||
## Immediate continuation
|
||||
|
||||
1. Integration suite and both packages pass; commit this stable milestone locally.
|
||||
Keep native Windows story/input/audio pending and preserve current evidence.
|
||||
Re-run checks only when new changes or unresolved concerns justify them.
|
||||
2. Exercise the lab route through actual walking/navigation, buttons and doors.
|
||||
Current lab-route smoke directly invokes source contacts; it is not navigation
|
||||
or original-fidelity evidence. Recover runtime42AF00 checkpoint restoration on
|
||||
1. Integration milestone c929f94 and the subsequent cutscene music/navigation
|
||||
correction are implemented/tested and republished. Preserve native Windows
|
||||
story/input/audio as pending; source user feedback is distinct from agent Wine
|
||||
checks. Continue original physics/audio/UI recovery and lab underground traversal.
|
||||
2. Managed input-only lab navigation now reaches the outside LOAD with live source
|
||||
contacts and NPC updates. Keep the direct-contact smoke distinguished from this
|
||||
replay. Extend coverage to underground button/door traversal and runtime
|
||||
reference comparison. Recover runtime42AF00 checkpoint restoration on
|
||||
VR return separately from saved STRT/RETURN strings and unknown TSK StoredVector.
|
||||
3. Recover47BD80 collision response/479D20 movement phase and source object exclusions.
|
||||
Support trace/magnitude/radii/factors and dynamic broadphase are recovered;
|
||||
|
||||
Reference in new issue
Block a user