Recover Grappler aim gating and implement verified ray constraint components

This commit is contained in:
UnixNight committed 2026-11-03 22:22:45 -05:00
1 parent 0c913d15aa
commit ffea678e90
21 files changed
+1604 -16

No files matched your search

+8
View File
@@ -290,3 +290,11 @@ GrapplerMotion implements the isolated attachment/reel/damping arithmetic and
independent fire/jump detach predicate, compared with30 copied-original cases.
It owns no body/ray/camera/helper lifetime and is not called by live simulation;
integration gates and retained source/REA findings are in gameplay/grappler-component.md.
GrapplerGeometry adds source aim early-return/rope-constraint/post-base contact
rules. GrapplerRay binds the verifiedVR08 static profile and captures selected
polygon/material with the hit via OriginalCameraRay.TraceSelectedGeometry, which
is independent of camera debug disabling. No live simulation calls these yet.
The active-input return must gate later primary dispatch while normal Jimmy frame
publication continues. Shared collision context/base contact and helper/camera
ownership remain integration work; see gameplay/grappler-query.md.
+8
View File
@@ -3,6 +3,14 @@
Compilation, native runtime, original behavior and full feature completion are
separate evidence categories. **The game is not fully reconstructed/playable yet.**
Grappler query/constraint checkpoint:42 new copied-original observations (72
total),10 managed/18 Python groups,11 camera/13 Rocketship groups and main build
pass. ActualVR08 ray/filter/material integration works in tests. Lab gameplay
readback is byte-identical; lab and VR08 geometry preview render with enabled
Vulkan validation, zero errors.539 original hashes verify. Attached world-body/
base-contact composition, camera and helper presentation/lifetime remain open;
Grappler is not live and playable packages remain70cba65. See gameplay/grappler-query.md.
Grappler scalar checkpoint:30 copied-original Wine32 observations match5 managed
groups,14 Python source/projection checks,25 movement/15 gadget groups and main
build pass. No live Grappler, new Vulkan path or original/native Windows gameplay
+9 -2
View File
@@ -270,9 +270,16 @@
left-handed view/projection; apply the shared Vulkan Y correction only once.
Regress screen right/up and depth across camera poses, not frame presence
alone. The modern inspector is separate from recovered original camera logic.
46. **Keep Grappler cursor/attachment and input/normal gates distinct.** Cursor
distance/material rejection does not prevent attachment on a ray hit.
46. **Keep Grappler cursor/attachment and input/normal gates distinct.** The leaf
attachment helper lacks cursor filters, but aim's earlier true return ends
active input before that helper. Do not interpret it as a rejection bypass.
Attached input may return early while ordinary Jimmy frame publication still
runs. Compare isolated sqrt/first-scale/reel/damping with original snippets
before composing body/camera/helper ownership; do not invent250 clamps or a
detach impulse. GrapplerMotion remains isolated until those gates close.
47. **Keep Grappler query metadata and component boundaries explicit.** Capture
the actual first selected polygon/material with its hit. Preserve root versus
swing-pivot origins, quick-magnitude constraint order and strict>60 contact
detach. Native aim/constraint/post-base suffix probes do not establish the
full body context, base contact, camera or helper lifecycle; close those
contracts before liveVR08. See gameplay/grappler-query.md.
+4
View File
@@ -1,5 +1,9 @@
# Grappler scalar checkpoint
Continuation: [aim/constraint/contact checkpoint](grappler-query.md) adds42
original component observations and corrects the enclosing aim→primary gate.
The attachment leaf's broad acceptance does not bypass aim's earlier return.
2026-11-03. Continues user-requested gadgets after the Rocketship/orbit fixes.
The latest playable packages include the orbit Left/Right correction70cba65.
GrapplerMotion is an isolated component; no live equip/ray/swing/camera path is
+120
View File
@@ -0,0 +1,120 @@
# Grappler aim, constraint and contact checkpoint
2026-11-03. Continues [scalar checkpoint](grappler-component.md). Adds a bounded
VR08 ray/material adapter and isolated aim/rope-constraint/post-base contact
implementation. **Grappler is not enabled in live gameplay yet.** The next gates
are shared body collision state, camera and helper presentation/lifetime.
## Corrected active-input ownership
The attachment leaf426A70 accepts a ray hit without repeating the cursor filter.
That does not mean ordinary input can attach to every hidden-cursor surface:
- 426084 calls438A60 input, then426098 calls complete188→429D00.
- 42609E tests AL;4260A0 branches to4269C3 on true.4269C3..4269CD is a direct
epilogue/return, before later primary1C0→426A70 at4266C8.
- Aim distance<450 hides the cursor and returns true; rejected material does
the same. Both therefore end the remaining active-input pass. Ordinary Jimmy
normal/frame publication still runs separately, as previously recovered.
- The rejected-material branch42A4F8..42A535 may subtract250*dt when held fire
or consuming Enter46A3E0(13) accepts and old rope length>250. The close-distance
branch does not execute that reeling. Neither adds a final length clamp.
- 42A7A0 already polls Enter among primary inputs; the extra consuming Enter path
is separate and short-circuited when the primary predicate is true. The managed
component receives those predicates; keyboard state consumption belongs to its
future caller, not this pure geometry API.
This corrects the earlier interpretation that cursor rejection could simply be
bypassed by held primary. No live behavior had been connected to that assumption.
GrapplerAim.EndsActiveInput records the enclosing return, rather than only whether
a fire button happened to be held.
## Source evidence and implemented scope
Authoritative EXE f5281076…1aea8 and OMT2.dll3ec41ead…54943 are required by
`tools/binary/grappler_query.py`. Full hashes, each span hash/file offset and the
native generator/executable/log identities are in the committed numeric fixture.
Text file offsets below are VA−400000. Runtime globals are not file offsets.
| Source span, exclusive end | File offset | Contract |
| --- | --- | --- |
|42A406..42A652|2A406|Aim hit/miss, strict450 threshold, selected polygon/material/definition distinction, blocked ranges, cursor point and early return.|
|429EA0..429FA4|29EA0|Anchor minus root+116, X/Z perturbation by swing*dt*30, original DLL quick-magnitude normalization, rope-length constraint and desired root before body clipping.|
|42A69B..42A6F1|2A69B|After base contact, zero swing X/Z; only sqrt(X²+Z²)>60 dispatches detach and sets Jimmy action latch1E25.|
|426030..4260A6,4269C3..4269CD|26030,269C3|Input→aim→true-return gate, separate from later primary helper.|
|42A7A0..42A7D6,46A3E0..46A3FB|2A7A0,6A3E0|Primary held predicate and consuming key-array read.|
Selected polygon global695D54 points to material+4, definition+0C, ID+8; global
5CFC60 holds the hit point. Missing polygon or definition passes the material
gate; present polygon without a material blocks. IDs60..69,80..89,210..219,−1,170
block. Visible cursor position uses hit−100*normalized(full ray), not normalized
hit offset. Normalization uses the original quantized quick_magnitude.
VR08 constructor's game table4D00D0 has slot134 at4D0204→475CD0, whose exact
bytes32C0C21800 return false while popping its24-byte arguments. Therefore the
existing NC/checkpoint admission and wall-first/grid/FIFO query are valid there.
Actual VR08 has240 polygons and only collision material IDs0/2/3/4, all ordinary.
GrapplerRay rejects other levels/profiles instead of inventing material context.
It queries the actual root and full-Euler local(0,2400,2400), not root+116.
OriginalCameraRay.TraceSelectedGeometry captures hit plus original polygon
metadata together. It uses the existing traversal and is independent of the
modern camera query toggle. Camera-only disabling must not disable gadget rays.
Tests retain a farther first-hit blocked material instead of silently selecting a
nearer allowed material. No global source state is manufactured from cursor art.
The source constraint stores normalized X/Y before scaling, while Z retains its
unrounded intermediate. Managed code preserves that order with double arithmetic;
general x87 identity remains unclaimed. Zero-vector normalization is explicitly
outside the finite modern component boundary (the source produces nonfinite
geometry); it is not silently repaired with a new position.
## Original-code and port verification
`grappler_query_probe.c` copies three bounded EXE slices into private memory,
relocates whitelisted operands, calls our copied original DLL quick_magnitude,
and supplies synthetic ray/material/cursor/primary/detach accessors. It never
runs the game entrypoint, actual world ray traversal, body dispatcher, base
contact43AA40, camera, rope renderer or full detach lifecycle. The constraint
exits before47B4B0; impact starts after43AA40. These bounds matter.
42 observations complete in the isolated copied Wine32 environment with no
network or Original mount:23 aim,10 constraint and9 post-base impact cases.
Combined with the previous30 scalar observations,72 copied-original observations are
checked by10 managed groups. New vector tolerance is.004 units (including large
coordinates); scalar checkpoint retains.0002. Flags and owner/gate states compare
exactly. The actual VR08 authored start yields two cardinal aiming hits with
retained material identities. No original gameplay/render comparison is claimed.
18 Python Grappler source/projection/evidence groups,11 existing camera groups,
13 Rocketship groups and main .NET10 build pass. Final two-frame lab gameplay
readback is byte-identical to the prior corrected-camera baseline. Actual VR08
geometry preview also renders two frames; both runs enable Vulkan validation and
report zero errors.539 original files verify unchanged. No new gameplay package
was needed; playable packages remain70cba65.
Logs: artifacts/grappler-query/{probe/wine.log,probe/capture.json,managed-final.log,
python.log,camera.log,rocketship.log,build-final.log,gameplay.log,vr08.log,
originals.log}. One synthetic first-hit test initially used the opposite of the
source winding; its failed log is retained and the fixture winding was corrected.
The first leaf guard expected a plain return, then was corrected to the actual
stdcall24-byte return before importing references.
REA's existing47C210 evidence
ev_ff5aab3bdc275e6626753743a3567a556f698209ad9f65689cf49a4b5f56107d
and43AA40/47B4B0 evidence in grappler-component.md remain supporting static
records. A new local REA/Ghidra426030 pseudocode query was not recognized; the
complete error/export/closed snapshot are retained in
artifacts/grappler-live/rea-input/. No repeated selector/config repair or
successful pseudocode is claimed. Exact guarded caller bytes plus the copied
aim execution establish the early-return correction.
## Next integration
Carry the original shared sphere/selected-contact context across ordinary
physics and the attached47B4B0 call, including42A660→43AA40. Do not treat the
post-base contact suffix alone as full collision integration. Then finish helper
rope/cursor material/transforms, follow-camera fields and equip/detach/control
loss/RETURN persistence. The cursor's retainedsprites Canv8 is already exported
for Baseball; rope HIROPE→rope01.ASE still needs a verified runtime binding.
Only then enable boundedVR08 with input-driven attach/reel/swing/detach checks.
+5
View File
@@ -2,6 +2,9 @@
Continuation: [scalar implementation and30 copied-original cases](grappler-component.md).
The component remains isolated; live ray/body/camera/helper gates below still apply.
Later [aim/constraint checkpoint](grappler-query.md) proves the enclosing input
gate:429D00 returning true prevents later primary attachment dispatch. The leaf
helper's lack of duplicate material checks must not be read as a bypass.
2026-11-03. Item7/raw7, using the supplied target6 decompiler bodies as leads,
then independently reading the hashed EXE instructions. No friend gameplay code
@@ -79,6 +82,8 @@ precedes that shared zero-energy reject. Do not add an energy cost from menu ind
Polygon without material blocks; material without definition passes this test;
absent selected polygon passes it. A valid cursor is placed100 back from the
hit along ray direction. This is not a query for the nearest3GRA entity.
Its true return at close/rejected surfaces ends426030 before primary dispatch;
rejected-material held fire/consuming Enter may still reel the existing length.
- **Attach / held primary:**426A70 returns false outside raw7; otherwise consumes
primary even on a miss. While unattached it stops+A3C, repeats the root/local
point ray, stores hit anchor, sets current length=distance(root,hit)−100.
+24 -2
View File
@@ -1,5 +1,27 @@
# Progress — 2026-11-03
## Grappler ray, constraint and contact checkpoint
Added boundedVR08 GrapplerRay and first-hit polygon/material capture, plus aim
gating, quick-magnitude rope constraint and post-base contact response.42 new
copied-original cases (23 aim/10 constraint/9 impact) match; with earlier30,
10 managed groups cover72 observations.18 Python,11 camera/13 Rocketship groups
and .NET10 build pass. ActualVR08 authored-start rays hit with correct metadata;
lab gameplay readback remains byte-identical and actualVR08 preview renders with
enabled Vulkan validation, zero errors.539 originals unchanged.
Important correction: the attach leaf's lack of duplicate material filters does
not bypass aim rejection.426098..4260A0 ends active input on429D00's true return;
close/rejected surfaces therefore prevent later primary dispatch. Rejected
material may reel before returning; close distance does not. Strict>60 post-base
contact detach and normalized source rope offsets are independently probed.
Source/evidence/limits: [grappler-query.md](gameplay/grappler-query.md).
No live Grappler or package update is claimed. Next: shared47B4B0 collision state
and43AA40 composition, follow camera, rope/cursor render+reset/lifetime, then
boundedVR08 live attach/reel/swing/detach/control-loss/RETURN. Pure constraint and
post-base suffixes do not establish those integrations. Playable70cba65 retained.
## Grappler scalar checkpoint
Implemented isolated GrapplerMotion attachment length/first-scale, held/fast reel,
@@ -26,8 +48,8 @@ Build/package validation follows in orbit-camera.md.
Grappler is the next gadget. Independent investigations retained REA/source
artifacts before reaching usage limits; primary owns all files again. Preserve
artifacts/grappler-{ray,motion,resources}/. Important recovered leads: attach uses
any ray hit and does not repeat cursor distance/material rejection; VR08 slot134
artifacts/grappler-{ray,motion,resources}/. Important recovered leads: the attach
leaf uses any ray hit, but earlier aim rejection can prevent its dispatch; VR08 slot134
returns false through475CD0; root-local ray discards the swing pivot+116. Attach
uses x87 sqrt, swing normalization uses OMTquick magnitude; ordinary437940 frame
still runs after the swing input short-circuit. Rope is HIROPE→rope01.ASE with
+6
View File
@@ -5,6 +5,12 @@ offsets, virtual addresses, API symbols or observed behavior. Decompiled output
evidence, not original source. Original gameplay has not yet been observed successfully; isolated original DLL
probes and modern runtime checks are recorded separately.
- `gameplay/grappler-query.md`: enclosing426030 early-return correction,
VR08 static filter/selected-material metadata,42 copied-original aim/constraint/
post-base contact cases and corresponding managed components. The attachment
leaf's broad acceptance does not bypass earlier aim rejection. Full attached
body/base-contact, camera and helper presentation/lifetime remain separate.
- `gameplay/grappler-component.md`:30 copied-original attachment/reel/damping
observations, isolated managed component and retained ray/body/resource REA
evidence. Cursor rejection differs from attach acceptance, and input swing
+7
View File
@@ -46,6 +46,13 @@ compile, runtime and original-fidelity verification are separate.
## Immediate continuation
- [x] Grappler aim/root-Euler ray/first-hit material, normalized constraint and
post-base contact:42 additional original cases,72 total/10 managed/18 Python;
actualVR08 query and existing camera/Rocketship/GPU regressions pass.
- [ ] Grappler live gates: carry shared sphere/contact context through attached
47B4B0 and43AA40; complete follow camera and rope/cursor presentation/lifetime,
then actualVR08 attach/reel/swing/detach/control-loss/RETURN. See grappler-query.md.
- [x] User-clarified orbit Left/Right inversion: reverse horizontal azimuth
mapping while preserving correct Up/Down and gameplay controls.
- [x] Grappler isolated attachment/reel/damping component:30 copied-original