Keep presentation alive across levels and scale UI for widescreen
This commit is contained in:
1 parent
113e9a41cc
commit
69d0187a21
26 files changed
+889
-70
No files matched your search
+12
-4
@@ -68,8 +68,9 @@ remain provisional.
|
||||
TaskStates and TaskActivation retain original case/sentinel/numeric gates.
|
||||
OriginalSave accounts for every TSK byte and preserves unknown data. SceneInteractions
|
||||
implements star/trophy/lab jetpack contacts, Carl dialogue dispatch and LOAD requests, tracking
|
||||
contact entry by source offset (duplicate tags remain distinct). Main disposes
|
||||
renderer/window/audio before rebuilding the next scene, carrying task/items/score.
|
||||
contact entry by source offset (duplicate tags remain distinct). Main owns a
|
||||
RenderSession across loads, replacing scene resources and per-level audio while
|
||||
preserving the window/Vulkan core and carrying task/items/score.
|
||||
Checkpoint CLI saves use atomic replacement outside asset directories; complete
|
||||
runtime saves, menus and configuration are not yet implemented.
|
||||
|
||||
@@ -98,8 +99,9 @@ PracticePrompt implements source strict Yes/No regions and keyboard dispatch;
|
||||
Program pauses simulation while modal, clears held input and rebuilds VR04 on Yes.
|
||||
SceneHud appends source640x480 screen quads; the Vulkan overlay pipeline disables
|
||||
depth and draws after world geometry using identity transforms. Full HUD state
|
||||
and practice highlighting remain incomplete. Fixed-size authored art
|
||||
is scaled with the viewport; input uses matching logical-window coordinates.
|
||||
and practice highlighting remain incomplete. UiViewport applies uniform art scale
|
||||
and explicit anchors; input maps logical coordinates into actual drawable pixels
|
||||
before inverse modal mapping.
|
||||
|
||||
Prepared effects/effects.json preserves251 original SoundEffects.omt identities
|
||||
and RIFF payloads, including one MPEG-in-RIFF resource whose playback is unverified.
|
||||
@@ -170,3 +172,9 @@ key and never enters the menu's pause/input-reset boundary. F1 selects the full
|
||||
menu layout while open, otherwise the same overlay ranges display compact live
|
||||
diagnostics. The source viewport/projection decision supplies actual camera/far
|
||||
data. No debug visibility state is written into the original TSK wire format.
|
||||
|
||||
RenderSession owns presentation until exit. Renderer replacement stages scene
|
||||
buffers/textures/descriptors, preserving device/surface/swapchain/layouts/pipelines
|
||||
and current targets. Resize/fullscreen replace size-dependent resources. Revision
|
||||
and native identities support checks. See presentation-and-ui.md for rollback,
|
||||
widescreen policy and runtime verification boundaries.
|
||||
+11
-1
@@ -23,6 +23,8 @@ separate evidence categories. **The game is not fully reconstructed/playable yet
|
||||
| Null-material visibility | Binary rule implemented/tested | Original DX renderer skips null pointers; proxy geometry retained |
|
||||
| SDL3 presentation/input | Linux Xvfb + GTX1070 | Six frames; injected keyboard event received |
|
||||
| Swapchain resize | Linux tested | 960x720 ->800x600, zero validation errors |
|
||||
| Persistent level presentation | Native GTX1070 six-load pass |One window/renderer; stable IDs/core resources, bounds/focus/fullscreen; invalid load retains rendering; zero cumulative Vulkan errors |
|
||||
| Widescreen HUD/debug UI | Managed matrix + native captures/pointer pass |Uniform proportions, centered modal/F1, anchored HUD/F2;4:3/16:9/21:9/32:9, DPI and strict boundary checks |
|
||||
| F1 debug menu | Managed/SDL audio tests + native Linux GTX1070 window pass |Pause/actions/input capture/resume/800x600 resize, zero validation errors;33 prepared scene/start choices; intentional modern tools, no new Windows runtime claim |
|
||||
| F1 Force Control | Menu/director/interaction checks + native Linux SDL pass |Persistent override through source shots; disable/reset restores normal ownership; actual movement with neutron1a active, zero Vulkan errors; music handoff regression passes |
|
||||
| F2 live debug overlay | Managed timing/layout/menu + native Linux SDL pass |Non-pausing movement, visibility/repeat/menu priority and800x600 resize; all checks true, zero Vulkan errors; session persistence; modern tools, no new Windows runtime claim |
|
||||
@@ -40,7 +42,7 @@ separate evidence categories. **The game is not fully reconstructed/playable yet
|
||||
| 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 |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 |Source byte/helper/director tests + Linux headless pass |Lab/VR04/lab restores live departure root and companion, retains STRT yaw and suppresses intro once; fresh TSK loading separate; fades/window transition unverified |
|
||||
| RETURN / scene reload |Source/director tests + Linux headless pass |Lab/VR04/lab restores departure root/companion using one renderer, retains STRT yaw and suppresses intro; fresh TSK loading separate; original fades 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 |887 input-only movement steps with live contacts/NPC updates reachSCENE60, score150, jetpack andlevel1; separate direct-contact GPU rebuild check |
|
||||
| Lab underground passage |2763-step managed input replay pass |Both switches,2 clear crossings and timed reclosure; closed-gate negative sweep; explicit riverlab/SCENE65 fixture, prior progression and original comparison unverified |
|
||||
@@ -94,6 +96,14 @@ pass. See artifacts/live-debug-window.log and live-debug-return.log. No new
|
||||
Windows runtime claim is made.
|
||||
Both self-contained platform packages rebuild successfully with this addition.
|
||||
|
||||
Persistent presentation/widescreen checkpoint: full regression suite passes in
|
||||
artifacts/persistent-widescreen-full-tests.log, including539 preserved hashes.
|
||||
Native6-load/one-window/one-renderer fullscreen/bounds/focus/pointer checks pass
|
||||
with zero enabled-layer errors (artifacts/window-transition-final.log). F1/force
|
||||
and F2 input checks still pass. Both packages rebuild; packaged Linux1920x1080
|
||||
lab/VR04/lab retains one renderer and exact RETURN state with validation unavailable.
|
||||
No new native Windows runtime claim is made.
|
||||
|
||||
Known visual/behavior limits include incomplete lighting/fog/blend/culling/material
|
||||
mapping, inferred model/root pivot, provisional collision/cadence/animation timing,
|
||||
close-wall camera clipping near Jimmy, incomplete class-specific triggers/interactions,
|
||||
|
||||
@@ -106,3 +106,7 @@ Native Linux GTX1070 window test passes with zero Vulkan validation errors:
|
||||
artifacts/debug-window.log. GPU screenshots debug-menu.png and debug-window.open.ppm
|
||||
show the menu. Source/build/regression evidence does not constitute new native
|
||||
Windows verification. Full regression and package status is in progress.md.
|
||||
|
||||
Debug text scales uniformly with resolution. F1 uses a centered authored canvas
|
||||
on widescreen; F2 stays top-left. The window/device survive level changes. See
|
||||
presentation-and-ui.md for lifecycle, ultrawide and high-DPI pointer checks.
|
||||
@@ -92,3 +92,11 @@
|
||||
across scene rebuilds in memory, independently of TSK state. Reuse the existing
|
||||
font/buffers, give F1 display priority and measure wall-frame intervals separately
|
||||
from simulation ticks. Report the rendered camera/projection, not a guessed mode.
|
||||
21. **Own presentation at application lifetime.** Replace scene GPU resources
|
||||
transactionally, retaining the SDL window, Vulkan core and user window state.
|
||||
Size changes may recreate targets/swapchain. Per-level audio/gameplay remain
|
||||
separate; source fades are still open.
|
||||
22. **Uniform UI with anchors.** Preserve4:3 source positions, center modal/F1
|
||||
canvases and anchor objectives bottom/right and F2 top-left. Map logical input
|
||||
through actual drawable dimensions with double precision for strict bounds.
|
||||
This is authorized modern widescreen policy, not original algorithm recovery.
|
||||
@@ -1,5 +1,11 @@
|
||||
# Native infrastructure and package scope
|
||||
|
||||
Presentation now survives level loads: one SDL window/device with scene-resource
|
||||
replacement. Uniform widescreen UI and input mapping are documented in
|
||||
presentation-and-ui.md. The optional scripts/test-window-transitions.sh uses
|
||||
installed Xvfb/Xfwm/D-Bus for isolated Linux fullscreen checks; these are not game
|
||||
dependencies. --width/--height choose initial window/offscreen dimensions.
|
||||
|
||||
Verified environment: Ubuntu 24.04 x86-64; project-local .NET SDK 10.0.402,
|
||||
Silk.NET 2.23.0, SDL 3.4.2 built from official source (Linux) and official x64
|
||||
SDL3.dll (Windows). GLSL compiled to Vulkan 1.3 SPIR-V and checked by spirv-val.
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
# Persistent presentation and widescreen UI
|
||||
|
||||
User-requested modern presentation/layout, 2026-10-25. Original assets and hashes
|
||||
remain unchanged. These policies are separate from original fade/progression recovery.
|
||||
|
||||
## Presentation lifetime
|
||||
|
||||
Program.Main owns RenderSession until application exit. Each Run replaces level,
|
||||
controller and audio state; SDL window/title changes do not recreate the window.
|
||||
Position, logical/drawable dimensions, focus and fullscreen state survive loading.
|
||||
|
||||
VulkanRenderer.ReplaceScene validates bounds and stages vertex/index buffers,
|
||||
textures, sampler and descriptor pool/sets after DeviceWaitIdle. Instance, device,
|
||||
surface, swapchain, targets, pipelines and layouts stay alive. Resize/fullscreen
|
||||
changes still replace size-dependent swapchain/targets. SceneRevision increments
|
||||
on success and RendererIdentity exposes core handles for verification.
|
||||
|
||||
Old scene resources remain available until staging succeeds. Failure cleans partial
|
||||
new resources and restores the prior set. Invalid indices/RGBA are runtime-tested
|
||||
to preserve revision, identities and rendering; allocation-failure rollback is
|
||||
implemented without fault injection. Loading remains synchronous; source fades
|
||||
and loading presentation remain unfinished.
|
||||
|
||||
## Uniform layout and pointer mapping
|
||||
|
||||
UiViewport uses scale=min(drawableWidth/640,drawableHeight/480). Logical dimensions
|
||||
are drawable dimensions divided by that common scale. Art/glyph X/Y proportions
|
||||
match while the3D scene fills the viewport.
|
||||
|
||||
| UI | Anchor |
|
||||
| --- | --- |
|
||||
| Objective pad/text/digit | Bottom-right delta from authored640x480 |
|
||||
| Practice prompt/F1 menu | Centered authored canvas |
|
||||
| F2 live panel | Top-left safe inset |
|
||||
|
||||
Original4:3 positions, objective edge clipping and strict practice hit regions
|
||||
remain. Widescreen anchors are an explicit port policy. --width/--height choose
|
||||
initial window/offscreen dimensions64..8192; subsequent loads retain actual size.
|
||||
|
||||
Mouse coordinates map from SDL logical dimensions into actual drawable pixels
|
||||
before inverse modal mapping. Double precision avoids ultrawide cancellation that
|
||||
turned boundary225 into225.00003. Fractional DPI with independently rounded pixel
|
||||
dimensions uses the same mapping.
|
||||
|
||||
## Verification
|
||||
|
||||
UiViewport/Hud/DebugOverlay tests cover nine aspect/resolution fixtures,4:3
|
||||
equivalence,16:9/21:9/32:9, square/portrait,1.5x/2x DPI and fractional rounded
|
||||
drawable dimensions. They verify glyph/art proportions, anchors, centered layouts
|
||||
and strict Yes/No boundaries. The full suite passes in
|
||||
artifacts/persistent-widescreen-full-tests.log, including539 unchanged originals.
|
||||
|
||||
Actual headless lab/VR04/lab Run transitions retain one renderer with revisions
|
||||
1/2/3 at1280x720, exact RETURN root/companion and zero Vulkan errors
|
||||
(artifacts/persistent-practice-return.log).
|
||||
|
||||
Native GTX1070: six loads, one window/renderer at960x720,1280x720,1680x720,
|
||||
2560x720 and fullscreen3440x1440. Checks assert unchanged window ID/bounds/focus,
|
||||
renderer identities across loading, fullscreen retention/restored windowed bounds,
|
||||
native practice pointer mapping, rejected-load retention and zero cumulative
|
||||
validation errors. Captures were visually inspected. Evidence:
|
||||
artifacts/window-transition-final.log and window-transitions/*.png. Existing F1/
|
||||
force-control and F2 input checks also pass from widescreen startup sizes.
|
||||
|
||||
```
|
||||
source scripts/env.sh
|
||||
dotnet build
|
||||
scripts/test-window-transitions.sh
|
||||
```
|
||||
|
||||
The runner uses installed Xvfb/Xfwm with private X11/D-Bus and artifact-backed
|
||||
configuration. Bare Xvfb lacks a window manager to honor fullscreen requests.
|
||||
NEUTRON_WINDOW_TEST=1 scripts/test.sh can use an existing managed display. These
|
||||
are test dependencies; the game adds none. Linux runtime/cross-publishing does
|
||||
not establish new native Windows or original visual/gameplay equivalence.
|
||||
|
||||
Both platform self-contained builds pass. The packaged Linux executable also
|
||||
passes1920x1080 lab/VR04/lab with one renderer and exact RETURN root/companion
|
||||
(artifacts/package-persistent-return.log; validation layers unavailable for this
|
||||
standalone invocation). Native source/fullscreen checks above enable validation.
|
||||
@@ -4,6 +4,28 @@
|
||||
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.
|
||||
|
||||
## Persistent window/renderer and widescreen UI
|
||||
|
||||
Main now owns one RenderSession. Per-level Run replaces scene resources while
|
||||
retaining the SDL window and Vulkan core; resize/fullscreen replace size-dependent
|
||||
targets. Window bounds, focus and fullscreen survive loading. Invalid replacement
|
||||
validation retains rendering. Per-level audio/gameplay still rebuild; fades remain
|
||||
unfinished. UiViewport scales art/glyphs uniformly with bottom/right HUD anchors,
|
||||
centered prompts/F1 and top-left F2. Pointer mapping handles logical/drawable size,
|
||||
fractional DPI rounding and strict source boundaries.
|
||||
|
||||
Nine aspect/resolution fixtures and high-DPI checks pass. Full suite passes with
|
||||
539 unchanged originals; final targeted viewport checks pass. Native GTX1070:
|
||||
six loads, one window/renderer, stable native/core IDs and bounds/focus/fullscreen,
|
||||
restored windowed bounds,4:3 through32:9/fullscreen3440x1440, native Yes/No mapping,
|
||||
rejected-load retention and zero validation errors (artifacts/window-transition-final.log).
|
||||
Captures were visually inspected. F1/force and F2 input checks still pass. Actual
|
||||
headless lab/VR04/lab retains one renderer/revisions1/2/3 and exact RETURN root/
|
||||
companion at1280x720. Both self-contained packages are rebuilt. The packaged Linux
|
||||
1920x1080 lab/VR04/lab check also retains one renderer and exact RETURN state
|
||||
(validation unavailable in that standalone invocation). No new Windows runtime
|
||||
check is claimed. Details: presentation-and-ui.md.
|
||||
|
||||
## User-requested live debug overlay
|
||||
|
||||
F2 toggles a compact, non-pausing live diagnostics panel. F1 also offers Live
|
||||
|
||||
@@ -35,6 +35,10 @@ compile, runtime and original-fidelity verification are separate.
|
||||
restores authored ownership when disabled, clears on reset/new scene.
|
||||
- [x] F2 live diagnostics plus F1 visibility toggle; non-pausing compact overlay,
|
||||
measured frame timing and session-owned visibility across scene rebuilds.
|
||||
- [x] Application-owned window/Vulkan renderer across loads; bounded scene
|
||||
replacement and native fullscreen/bounds/focus retention checks.
|
||||
- [x] Uniform widescreen game/debug UI with anchors and matched native pointer
|
||||
mapping, strict boundaries and high-DPI rounding checks.
|
||||
|
||||
## Immediate continuation
|
||||
|
||||
|
||||
Reference in new issue
Block a user