diff --git a/README.md b/README.md index e3d86f1..9fc2ad9 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ The [Bubble continuation](docs/gameplay/bubble-implementation.md) adds its sourc controller, original sprite, automatic/high bounces and VR01 floor behavior. The [Baseball continuation](docs/gameplay/baseball-implementation.md) adds hold/ release aiming, original ball/TIME art and VR07's moving targets and trophy gate. +The [Grappler continuation](docs/gameplay/grappler-live.md) adds VR08 attachment, +shared body/contact state, source camera, rope/SWING/cursor and cleanup. The runtime includes recovered camera/speech triggers, moving props, Carl/Goddard patrol logic, pickups, objectives, the practice prompt, VR04 powered jumping and diff --git a/docs/architecture.md b/docs/architecture.md index feb633c..acc2404 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -298,3 +298,30 @@ 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. + +## Live bounded VR08 Grappler (2026-11-04) + +The component-only gates described above are now integrated for VR08. Main owns +GrapplerMemory across Run/scene reconstruction; LabSimulation owns the scene's +GrapplerGadget and body/camera state. Normal physics retains its sphere context, +then fresh controlled input runs camera followed by attached movement/aim/fire; +ordinary player apply still runs after an input early return. Retained entry +moves input after ordinary apply, preserving the existing registration boundary. +Attached Move reuses the preceding physics context, including stale last polygon; +support/ray metadata is separate. Both normal and attached wall callbacks reach +the recovered post-base detach rule. No new body integrator or direct-pull path. + +Camera locals retain their source writers; GrapplerCamera consumes them through +movement-mode-specific follow branches, obstruction and old shared-eye aim. +GrapplerVisuals appends exact prepared rope/SWING/target resources and draws at +source pivots. It applies the retained first-length scale to base rope geometry, +uses pre-collision desired root and replaces the standing draw only during SWING. +The existing generic sprite-facing bridge remains a documented rendering policy. + +PlayerSceneBinding handles selection, companion eligibility and authored cleanup. +RETURN explicitly releases selected Jimmy before staging; ordinary scene teardown +releases scene-local helpers/sound before SceneAudio disposal as a modern safety +boundary. Scalar memory survives; original TSK serialization is not expanded. +F3/R debug cleanup is separate from source ownership semantics. See +[coverage and verification](gameplay/grappler-live.md) for113 component observations, +13 live managed groups, native replay and excluded shared/special-level behavior. diff --git a/docs/compatibility.md b/docs/compatibility.md index 35080df..5846cec 100644 --- a/docs/compatibility.md +++ b/docs/compatibility.md @@ -7,6 +7,10 @@ Current Grappler scope is liveVR08: source ordinary body/shared sphere context, recovered camera, original rope/SWING/cursor, sounds and selection/RETURN cleanup. 113 original-component observations;13 managed live/40 Python checks pass. Native Linux GTX1070 and headless replay pass9 phases with zero Vulkan validation errors. +Both packages identify clean43806fe and contain9 exact Grappler resource files. +Standalone Linux from /tmp passes and matches all9 development captures. Full +scripts/test.sh passes297 Python+2 HUD/all managed and route/gadget/audio checks; +all539 original hashes verify unchanged. Exact art/capture and package evidence: gameplay/grappler-live.md. Whole-original VR08, native Windows, other levels and general dynamic pairs remain unverified. diff --git a/docs/gameplay/grappler-component.md b/docs/gameplay/grappler-component.md index 8b3b070..367fe4b 100644 --- a/docs/gameplay/grappler-component.md +++ b/docs/gameplay/grappler-component.md @@ -1,5 +1,8 @@ # Grappler scalar checkpoint +Historical component checkpoint; liveVR08 integration now supersedes its pending +gates. See [Grappler live status](grappler-live.md) for current scope and tests. + 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. diff --git a/docs/gameplay/grappler-live.md b/docs/gameplay/grappler-live.md index 87bebf6..39e7a64 100644 --- a/docs/gameplay/grappler-live.md +++ b/docs/gameplay/grappler-live.md @@ -38,29 +38,29 @@ performs a fresh trace when unattached. No cached cursor-to-anchor substitution. ## Checks and captured evidence --113 original-component observations total: prior72 scalar/aim/constraint/contact +- 113 original-component observations total: prior72 scalar/aim/constraint/contact plus41 body/support/ray/full-contact cases. Native probe generation/log/reference hashes are retained; source execution uses copies under artifacts, never Original. --13 managed live groups (`tests/GamePort.GrapplerLiveTests`) cover fresh/retained +- 13 managed live groups (`tests/GamePort.GrapplerLiveTests`) cover fresh/retained input order, attachment/normal body, held reel/simultaneous fire+jump, detach/ reattach/first-scale, strict60 impact, actual wall constraint collision, shared stale-contact replay/zero delta, camera consumers/transitions, ownership/intro, actual RETURN, noclip/reset/retained memory, helper art and close-surface gate. The actual-wall test explicitly positions Jimmy and sets rope/swing state; this is distinct from the unseeded input replay below. --40 Grappler Python checks: guarded original spans, camera projections, assets and - saved native-body observations. The broader Python suite passed296 tests before - adding the final source-presentation guard; its final total is297. --Existing managed suites,33-scene GPU/material audits and original hash check are - driven by scripts/test.sh. Selected-source Patrol/Interaction projects needed +- 40 Grappler Python checks: guarded original spans, camera projections, assets and + saved native-body observations. The final full Python suite passes297 tests plus2 separate HUD checks. +- The final scripts/test.sh run exits0:297 Python+2 HUD checks, all managed + suites, route/gadget GPU replays, checkpoint/transition and audio checks pass; + all539 original hashes verify. Log `artifacts/grappler-live-final-tests.log`. Selected-source Patrol/Interaction projects needed explicit Grappler/heading dependencies; initial compile failures were fixed. --Headless llvmpipe1280×720 and native Linux GTX1070/private Xvfb1920×1080 replay +- Headless llvmpipe1280×720 and native Linux GTX1070/private Xvfb1920×1080 replay pass all9 phases with enabled Vulkan validation, zero errors. SDL Left/Ctrl/Up/ Shift/F3 events are received.120 extra ordinary ticks reuse received input; no root/velocity/rope scalar/timer is seeded. Capture stages include attach, original SWING/rope, detach, reattach, cutscene, noclip and reset. Images inspected. Logs `artifacts/grappler-live-{smoke,window}.log`; captures share those prefixes. --1920×1080 Player-page capture (`artifacts/grappler-debug-wide.ppm`) fits all32 +- 1920×1080 Player-page capture (`artifacts/grappler-debug-wide.ppm`) fits all32 rows including Give/Select Grappler. Managed navigation/repeat/bounds checks pass. Reproduce from GamePort with `source scripts/env.sh`, then: @@ -88,4 +88,21 @@ scooter.md; recover them before implementing its vehicle behavior. Preserve the parked general collision work and avoid expanding Grappler to other levels until those shared contracts and actual original comparisons support it. -Package/provenance results are appended after final local packaging. +## Package validation + +Both self-contained packages identify clean source43806fe86224c685f56e897b88b4656305d16bdd +in BUILD-INFO.txt. Linux executable is native ELF x86-64, Windows is PE32+ x86-64. +All9 Grappler resource files compare byte-for-byte with extraction in both +packages, including both exact RGBA canvases, original morph samples and manifest. +`artifacts/grappler-live-package.log` records successful publishes/preparation; +NU1900 vulnerability-metadata lookup warnings are the existing restricted-network +condition, not compilation failures. No runtime online dependency was introduced. + +Final standalone Linux test ran from /tmp with DOTNET_ROOT/DOTNET_ROOT_X64 unset, +bundled assets, native GTX1070/SDL3 and private Xvfb1920×1080. All9 phases and +five injected SDL key bindings pass with zero enabled Vulkan validation errors; +all9 stage GPU readbacks are byte-identical to the development native run. Log: +`artifacts/grappler-live-standalone.log`; resource/readback hashes are retained in +`artifacts/grappler-live-package-check.json`. Packages are `dist/linux-x64` and +`dist/win-x64`. Native Windows gameplay and whole-original comparisons remain +pending; Windows publication is not represented as runtime validation. diff --git a/docs/gameplay/grappler-query.md b/docs/gameplay/grappler-query.md index db4f67c..0281cd1 100644 --- a/docs/gameplay/grappler-query.md +++ b/docs/gameplay/grappler-query.md @@ -1,5 +1,8 @@ # Grappler aim, constraint and contact checkpoint +Historical component checkpoint; liveVR08 integration now supersedes its pending +gates. See [Grappler live status](grappler-live.md) for current scope and tests. + 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 diff --git a/docs/progress.md b/docs/progress.md index fa469c8..9279859 100644 --- a/docs/progress.md +++ b/docs/progress.md @@ -11,7 +11,13 @@ pass. Native Linux GTX1070/private Xvfb1920×1080 input replay passes9 phases wi zero enabled Vulkan validation errors; headless replay also passes.32-row Player debug page includes Grappler and fits widescreen. Details/limits and final build evidence: [grappler-live.md](gameplay/grappler-live.md). Whole-original comparison -and native Windows gameplay remain pending. +and native Windows gameplay remain pending. Both packages identify clean43806fe; +all9 exact resource files match. Standalone Linux from /tmp passes the9 SDL +phases with validation enabled, and all9 stage readbacks match development +byte-for-byte. Full scripts/test.sh passes297 Python+2 HUD/all managed and +headless route/gadget/audio checks; all539 originals verify unchanged. Final +suite log: artifacts/grappler-live-final-tests.log. Package log: +artifacts/grappler-live-package.log. Earlier component-only status follows chronologically. diff --git a/docs/tasks.md b/docs/tasks.md index 283044d..dcc05fa 100644 --- a/docs/tasks.md +++ b/docs/tasks.md @@ -109,11 +109,12 @@ component reports remain evidence, not current live status. - [x] Close ordinary VR02 Rocketship callbacks, Euler/maneuver/camera and owned/GAM reset/attachment gates; integrate actual art/audio, F1 and live control with source RETURN/cutscene ownership regressions. General pair/lifetime remains bounded. -- [ ] Close Grappler ray/material context, attached dispatcher/camera/Euler and +- [x] Close boundedVR08 Grappler ray/material context, attached dispatcher/camera/Euler and helper lifetime before live mode7. No substitute hook/pull behavior. -Historical component-only claims are superseded for liveVR02 Rocketship. -Grappler scalar checkpoint is gameplay/grappler-component.md; it remains isolated. +Historical component-only claims are superseded for liveVR02 Rocketship and +liveVR08 Grappler. Scalar/query reports remain component evidence, not current +feature status; see gameplay/grappler-live.md. **Supplied friend's decomp assessment completed2026-11-03.** See [assessment](reviews/jn-engine-survey.md), independent gameplay/capture