Restore original airborne steering for jumps and jetpack bursts
This commit is contained in:
1 parent
b58138d7ba
commit
976e677019
16 files changed
+357
-54
No files matched your search
@@ -0,0 +1,85 @@
|
||||
# Corrected airborne keyboard input
|
||||
|
||||
User testing exposed an error in the earlier reconstruction: Jimmy could rise
|
||||
with the jet pack but could not begin moving/turning in the air. This report
|
||||
supersedes the no-air-steering claim in the original movement checkpoint.
|
||||
Read-only Neutron.exe addresses are VAs; text file offsets are VA-0x400000.
|
||||
|
||||
## Dispatch error and recovered handler
|
||||
|
||||
The signed mode at interface+704 (complete+7C4) selects jump table438BA4:
|
||||
mode0->438B31, mode1->438B60, mode2->438B6D, mode3->438B82. Mode1 logs at
|
||||
438B60, removes its printf argument at438B6A, then **falls through** to438B6D.
|
||||
438B76 calls complete-object virtual128, whose Jimmy vtable4A3BDC entry is439900.
|
||||
It does not return after logging. The earlier report incorrectly read that
|
||||
control flow and a regression test encoded the error. Both have been corrected.
|
||||
|
||||
Normal jump/jetpack movement uses mode1 and the following keyboard subset of
|
||||
439900. Special movement mode2 (distinct from gadget selection) shares the input
|
||||
handler but has extra turn/pose/camera behavior; that full mode is not implemented.
|
||||
|
||||
| Input/rule | Source | Implemented arithmetic |
|
||||
| --- | --- | --- |
|
||||
| Left before Right |439943/439966|Left precedence; adjust turn rate by+100*dt or-100*dt|
|
||||
| Release keyboard turn |439989..439A19|Move prior turn rate toward0 by100*dt, clamp crossing|
|
||||
| Normal air turn limit |439D81..439DB7|Clamp rate to[-30,+30] degrees/sec|
|
||||
| Up |439AE6..439B69|Add source30 speed per call, cap600|
|
||||
| Coast |439B69..439BA2|If speed>600*0.909090936, subtract35*.5; otherwise retain|
|
||||
| Down with positive speed |439C1D..439C78|Subtract35*.5, clamp at0|
|
||||
| Down with negative speed |439C7A..439CB2|Add35 toward0, clamp crossing|
|
||||
|
||||
Forward acceleration precedes braking when Up/Down are both held. Turn alone
|
||||
does not use ground acceleration. At normal maximum600, release coasts down
|
||||
600->582.5->565->547.5->530 and retains530 until another input/ground phase.
|
||||
Down brakes, rather than starting reverse air movement. These are source rules,
|
||||
not a replacement walking controller enabled wholesale in the air.
|
||||
|
||||
## Velocity and integration
|
||||
|
||||
Air apply437F90 preserves vertical velocity, adds turnRate*dt to current yaw
|
||||
at438011..43802B, and calculates lateral velocity at43803B..438062 as:
|
||||
|
||||
```
|
||||
sideSpeed = turnRate * (1-friction) * speed * float(1/55)
|
||||
velocityXZ = forward(yaw)*speed + right(yaw)*sideSpeed
|
||||
```
|
||||
|
||||
Source friction is0.8. Air sideSpeed lacks the additional ground dt factor;
|
||||
ground437CDx uses (turnRate*(1-friction)*speed/45+keyboardSide)*dt instead.
|
||||
The port now preserves the shared turn-rate field through landing and clears it
|
||||
on scene reset. Air input's destination yaw is current yaw (439E2B), so the ground
|
||||
keyboard target offset does not override its direct yaw update.
|
||||
|
||||
AirSteering.cs translates this keyboard subset. LabSimulation calls it while
|
||||
airborne, including before burst activation and after release. The
|
||||
existing jetpack vertical state/effect/energy behavior remains a separate phase.
|
||||
Full original input/update/rotation phase order, mouse/analog, pitch/roll/lean,
|
||||
special flight mode2, collision response and camera are still incomplete. Current
|
||||
integration is yaw-only at fixed60Hz with the provisional collision capsule.
|
||||
|
||||
## Verification
|
||||
|
||||
-2 Python source tests guard all four dispatch-table entries, mode1 fall-through,
|
||||
vtable128 and decisive keyboard/constants/air-lateral instruction sites.
|
||||
-16 movement groups pass, replacing the invalid no-air-steering fixture with
|
||||
ordinary-jump response, exact keyboard arithmetic, powered takeoff-from-rest
|
||||
steering/braking, left/right paths and60/120/144Hz equivalent replay.
|
||||
-14 vertical jetpack groups remain passing. Input-only lab navigation still
|
||||
reachesSCENE60, score150, owned jet pack and the original outside LOAD.
|
||||
-The upgraded VR04 smoke starts vertically, presses Up/Left/Down during active
|
||||
flight, releases the burst and lands. Headless llvmpipe renders300 frames:
|
||||
powered horizontal travel403.88, one burst/landing, maximum rise418.98,
|
||||
zero Vulkan validation errors. It requires actual powered horizontal travel
|
||||
and nonzero turn rate, so the previous frozen-air implementation fails it.
|
||||
-Window mode injects all four Up/Left/Down/Shift keys through SDL, runs300 frames
|
||||
and resizes800x600. Package/runtime results are recorded in compatibility.md.
|
||||
|
||||
These are static and port runtime regressions; original gameplay comparison and
|
||||
native Windows verification remain distinct. Original assets remain unchanged.
|
||||
|
||||
Final package checks: Linux self-contained GTX1070 and Windows self-contained
|
||||
under isolated Wine64 both receive the full SDL input sequence, resize and finish
|
||||
with identical403.88 powered travel and grounded position. Linux reports zero
|
||||
validation errors; Wine validation is disabled. Logs: artifacts/package-jetpack-steering.log
|
||||
and artifacts/windows-jetpack-steering-package/wine.log. Native Windows remains
|
||||
unverified by the agent. All539 original hashes still match.
|
||||
@@ -97,3 +97,12 @@ timer, energy clamp/VR immunity, depletion, explicit phase differences, absent
|
||||
effect and bounded malformed input. The existing13 movement groups still pass.
|
||||
These are static/data/port algorithm checks. Original gameplay/native Windows
|
||||
comparison remains required before a fidelity claim.
|
||||
|
||||
|
||||
## Airborne steering correction
|
||||
|
||||
User testing found frozen horizontal control during powered flight. The original
|
||||
mode1 dispatcher falls through to439900; the earlier no-input interpretation was
|
||||
wrong. AirSteering now supplies the separate source airborne keyboard path for
|
||||
both jumps and bursts. Up accelerates, Left/Right ramp turn rate, Down brakes.
|
||||
See air-steering.md for dispatch proof, exact arithmetic and new movement/GPU tests.
|
||||
@@ -44,14 +44,12 @@ support can receive the full 550 impulse with no net gravity that step,
|
||||
before airborne acceleration begins. A port's immediate grounded-to-airborne
|
||||
transition can differ by one tick; do not claim an exact original jump apex.
|
||||
|
||||
Movement dispatcher mode 1 (`0x438B60`) logs and returns without running
|
||||
walking input. Ordinary arrow acceleration/turn input is therefore absent
|
||||
while that air mode is active. Air apply reuses takeoff speed and rotation,
|
||||
preserving vertical velocity; with the default extra turn rate zero, it has
|
||||
no new keyboard steering. Its nonzero extra-turn lateral calculation uses
|
||||
`turnRate*(1-friction)*speed/55`, without the ground branch's additional `dt`
|
||||
on lateral magnitude, and omits the keyboard side contribution. A port that
|
||||
allows normal walking input in the air should identify that as an approximation.
|
||||
**Correction from user testing:** mode1 (`0x438B60`) logs and falls through
|
||||
`0x438B6D` to complete virtual128=`0x439900`, the separate airborne input handler.
|
||||
The earlier claim that it returned without input was wrong. Normal jumps and
|
||||
jet pack flight allow Up acceleration, Down braking and Left/Right turn-rate
|
||||
control. The corrected source arithmetic, regressions and remaining integration
|
||||
limits are in [air-steering.md](air-steering.md). Ground input remains separate.
|
||||
|
||||
## Normal keyboard walking
|
||||
|
||||
|
||||
@@ -115,3 +115,10 @@ SceneAudio. Stopping disposes the loop and retains its selected resource identit
|
||||
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.
|
||||
|
||||
|
||||
AirSteering provides439900's normal airborne keyboard subset independently of
|
||||
walking input. Mode1 logs then falls through to its real handler; it is not a
|
||||
no-input state. LabSimulation preserves the turn-rate field, uses recovered air
|
||||
coasting/braking and applies the distinct ground/air lateral formulas. Mouse,
|
||||
analog, full lean/camera and original global phase order remain incomplete.
|
||||
@@ -27,11 +27,11 @@ separate evidence categories. **The game is not fully reconstructed/playable yet
|
||||
| Mouse/relative input/controller | Incomplete | SDL entry point declaration alone is not behavior |
|
||||
| Audio stream | Linux dummy device | Original11025Hz mono WAV consumed10752bytes/500ms; speakers untested |
|
||||
| Physics fragments/RNG | Standalone C# tests | Recovered arithmetic; controller/jump/collision state incomplete |
|
||||
| No-gadget walking/jump controller | Linux tests and GPU replay pass | Recovered speed/yaw/ballistic formulas; transient jump state/order approximated |
|
||||
| Walking/jump/air controller |16 movement groups + GPU replay pass |Corrected mode1 fall-through to source air handler: acceleration/braking/turning during jumps and bursts; phase/collision/lean remain provisional |
|
||||
| Static source collision | 11 deterministic groups pass | Capsule sweep/slide, walls/ceilings/slopes/ledges; all2869 lab triangles retained; masks/dimensions provisional |
|
||||
| Simulation cadence | 13 movement groups pass | Fixed60Hz independent of60/120/144Hz rendering, ten-minute finite run; original cadence unresolved |
|
||||
| Simulation cadence |16 movement groups pass | Fixed60Hz independent of60/120/144Hz rendering, ten-minute finite run; original cadence unresolved |
|
||||
| Walking camera and animation | Linux headless/window pass | Original five motion clips, recovered eye180/target99; pivot, timing and obstruction solver provisional |
|
||||
| Walk SDL input/resize | GTX1070/Xvfb240-step pass | Arrows/Shift injected through SDL; travel1250.12,jump/landing; resize800x600; zero validation errors |
|
||||
| Walk SDL input/resize | Earlier GTX1070/Xvfb240-step pass |Historical pre-air-fix travel1250.12; current corrected managed/headless replay1264.55. Current powered SDL check is below |
|
||||
| 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 |
|
||||
@@ -39,12 +39,13 @@ separate evidence categories. **The game is not fully reconstructed/playable yet
|
||||
| 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 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 |
|
||||
| Lab task/contact route | Managed input replay + headless GPU pass |914 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 |
|
||||
| Lab objectives/practice | Art/data/managed/headless + native Linux window pass |Exact source coordinates, modal pause, Y/N/pointer rules; N resumes and resize800x600 onGTX1070, zero errors; slide/highlight incomplete |
|
||||
| Jetpack tutorial |14 state groups +300-step VR04 GPU pass |FLY/fire effect, radius/timer/energy/VR rules; maxrise418.98/landing, zero validation errors; phase/shadow/collision approximations |
|
||||
| Jetpack tutorial |14 vertical groups +16 movement groups +300-step VR04 GPU pass |Powered horizontal travel403.88, turn/brake/release and landing; rise418.98, zero validation errors; phase/shadow/collision/lean approximations |
|
||||
| Powered SDL/package steering |Linux GTX1070 and preliminary Wine64 window pass |300 frames, Up/Left/Down/Shift received, resize800x600, travel403.88/landing; Linux zero validation errors, Wine validation disabled; native Windows pending |
|
||||
| Default effects bank |251 exact RIFF exports, SDL dummy pass |Pickup/button/door sounds and owner-loop stop; positional/volume/channel policy incomplete; MPEG-in-RIFF bird1/id162 unsupported by SDL WAV |
|
||||
| Complete scene/gameplay loop | Incomplete |Lab navigation, exact collision/pivot/cadence and original reference comparison still required |
|
||||
| Menus/AI/combat/progression/saves | Incomplete | Required future work |
|
||||
|
||||
+19
-6
@@ -4,6 +4,19 @@
|
||||
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.
|
||||
|
||||
## Jetpack steering correction
|
||||
|
||||
User testing exposed frozen airborne steering. The earlier recovery incorrectly
|
||||
read mode1's log branch as an early return; it actually falls through to439900.
|
||||
The port now uses the original airborne Up acceleration, Down braking and
|
||||
Left/Right turn-rate rules for jumps and jet pack bursts. Source byte checks,
|
||||
16 movement groups,14 vertical burst groups and the full input-only lab route pass.
|
||||
VR04 GPU replay travels403.88 horizontally during powered flight, turns and lands
|
||||
with zero validation errors. The rebuilt Linux package and Windows package under isolated Wine64 pass300
|
||||
SDL-input frames with Up/Left/Down/Shift and resize800x600, matching403.88 travel.
|
||||
Linux GTX1070 validation reports zero errors; Wine validation is disabled.
|
||||
Native Windows retesting remains unverified by the agent. Details and remaining fidelity limits: analysis/air-steering.md.
|
||||
|
||||
## Latest user-tested correction
|
||||
|
||||
User testing found background music continuing during cutscenes. Recovered CAM
|
||||
@@ -19,8 +32,8 @@ 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
|
||||
updates. It reachesSCENE60/score150 with jet pack owned after914 movement steps
|
||||
and7038.29 travel with corrected airborne input; the player is never repositioned. This strengthens port lab
|
||||
navigation coverage without proving original collision/cadence fidelity.
|
||||
|
||||
## Current integrated behavior
|
||||
@@ -76,16 +89,16 @@ 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 has36 top-level regression tests plus2 targeted UI extraction tests.
|
||||
Existing11 collision and13 movement groups pass;14 jetpack groups pass. Eight
|
||||
Python currently has38 top-level regression tests plus2 targeted UI extraction tests.
|
||||
Existing11 collision and16 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
|
||||
for the tested clips. This is DLL evidence, not observed original game behavior.
|
||||
|
||||
Headless llvmpipe runs render the story, model actors, practice prompt, lab exit
|
||||
and VR04 entry with zero Vulkan validation errors. The300-step VR04 powered replay
|
||||
jumps once, rises418.98 units and lands; VR immunity retains20 energy. The ordinary
|
||||
240-step replay travels1250.12 and rises137.62; port landing-count telemetry changed
|
||||
jumps once, rises418.98 units and lands; VR immunity retains20 energy. The corrected ordinary
|
||||
240-step replay travels1264.55 and rises137.62; port landing-count telemetry changed
|
||||
with the explicit state table. These measurements verify port behavior only.
|
||||
See artifacts/full-integration-test.log and practice/jetpack logs for current checks.
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ probes and modern runtime checks are recorded separately.
|
||||
- `analysis/dynamic-collision.md`: source3DUD broadphase/triangle order and modern response boundary.
|
||||
- `analysis/buttons-doors.md`: button contact/cooldown and moving-bar state machine.
|
||||
- `analysis/ui.md`: original objective/practice canvases, coordinates, input and return strings.
|
||||
- `analysis/air-steering.md`: corrected mode1 fall-through, airborne keyboard handler and source regression evidence.
|
||||
- `analysis/jetpack.md`: corrected lab pickup identity, powered-jump/effect/energy phases.
|
||||
- `analysis/sound-effects.md`: default bank identity, preserved wave payloads and loop lifecycle.
|
||||
- `original-manifest.json`: complete original SHA-256 baseline.
|
||||
|
||||
@@ -21,6 +21,8 @@ compile, runtime and original-fidelity verification are separate.
|
||||
- [x] Shared Goddard/Carl patrol subset and recovered body support with DLL checks.
|
||||
- [x] Button/vertical-door behavior and source dynamic broadphase/box triangle rules.
|
||||
- [x] Powered-jump state/effect/energy arithmetic, original FLY/fire morphs and GPU replay.
|
||||
- [x] Correct mode1 input dispatch and source airborne steering for jumps/bursts;
|
||||
Up acceleration, Down braking, Left/Right turn and powered travel regressions.
|
||||
|
||||
## Immediate continuation
|
||||
|
||||
|
||||
Reference in new issue
Block a user