forked from Ports/goldeneye-pc-port
D401: Rumble Pak -> real gamepad haptics (re-promotes D224/M-87)
Port layer only (zero src/ edits), per docs/dev/RUMBLE-PLAN.md: - port/src/input.c: inputRumbleSupported/inputRumble -> SDL_GameControllerRumble; detection via SDL_GameControllerHasRumble (SDL >= 2.0.18) else SDL_JoystickIsHaptic + known-type Windows fallback; zeroed on pad close. Single global gRumbleScale (dflt 0.5) registered as Input.RumbleScale. - port/src/libultra.c: the two M-87 blockers resolved - g_contStatus[i].status now sets CONT_CARD_ON for connected rumble-capable pads (so joyRumblePakInit arms) and osPfsInit returns PFS_ERR_DEVICE for them (so osMotorInit is attempted); osMotorInit/Start/Stop drive the haptics API. - port/src/optionsoverlay.c: one global 'Rumble strength' ROW_SLIDER (Input.RumbleScale, 0.05 detents, %.2f) in the INPUT section + kResetDefaults entry. The four per-player Input.PlayerN.RumbleScale keys were dropped (user decision 2026-09-28); stale keys in an existing ini log four 'unknown key' LOG_NOTE lines and self-clean on next configSave. - Real-pad haptics confirmed working by the user (2026-09-28). Build env: build-pc.sh self-heal guard revision - re-exec now writes a self-contained .ps1 (msys->native argv conversion mangles $-bearing -Command strings; file write is conversion-free), builds PATH explicitly, picks TMP from writable candidates (GetTempPath honours the broken inherited TMP), self-logs to build-pc/ge007-native-reexec-*.log, and treats a null LASTEXITCODE as 'did not execute' (PS 5.1 piped native commands error non-terminating). OPEN: the guard still fails inside build-pc.sh while the identical standalone .ps1 invocation works - AGENTS.md documents the workaround. docs: RUMBLE-PLAN.md (new, tracked), findings.md D401 entry + index rows, QOL-INVENTORY D224 -> DONE (D401), findings-index.csv regenerated.
This commit is contained in:
James Dansereau committed
1 parent
a548fc4de6
commit
471eecd6d3
10 files changed
+702
-13
No files matched your search
@@ -33,7 +33,7 @@ ScreenShakeIntensity. Debug: FrameDump, InputLog.
|
||||
| **DisplayFPS** _(DONE M-83, D213)_ | config `Video.DisplayFPS` | P | S | Top-right readout, config-only; ~0.5 s sample window. |
|
||||
| **Anisotropic filtering** _(DONE M-83, D212)_ | `Video.Anisotropy` (1–16, dflt 4) | P | S | fast3d already had the GL hook + a hardcoded 4×; M-83 exposed it as config. MipmapFilter / TextureFilter2D still not surfaced. |
|
||||
| Per-pad tuning: per-stick deadzones, stick scale, rumble scale, device index, swap sticks, C-button mapping | `input.c` padsCfg block | P | M | Medium. Matters for real-controller users; PD pattern is a config section per pad. **M-87 survey addendum:** PD does *incremental* hot-plug (`SDL_CONTROLLERDEVICEADDED/REMOVED` opens/closes individual pads into the first free slot, remembers `deviceIndex=-1` on removal so a replugged pad returns to its configured seat, `input.c:473-491`); GE's port instead does a full rescan-close-and-reopen-everything (`inputRescanPads()`, `input.c:983-1000`) and the game itself latches the controller mask at boot, so a pad added later merges into controller 0 for play. PD's incremental-with-remembered-seat approach is the natural implementation shape for this row and sidesteps the boot-latch merge — fold into the design when this row gets built, not a separate item. |
|
||||
| **Rumble → D224 (M-87). DEPRIORITIZED (M-87, user call) — gamepad-only, this release targets mouse/keyboard as primary.** GE's port fully no-ops the N64 Rumble Pak (`port/src/libultra.c:1220-1223` `osMotorInit/Start/Stop` all stubbed "no accessories on the PC") — GE genuinely has a rumble subsystem (`src/motor.c`, `src/joy.c`) that never reaches any output. **PD's PC port wires this straight through to real gamepad rumble**: `inputRumbleSupported()`/`inputRumble()` call `SDL_GameControllerRumble()` when the connected pad reports haptics, `Input.PadN.RumbleScale` config + an options-menu slider, `osMemSize`-style "pretend the accessory is there" pattern applied to a real one instead of faked. | P | M | Concrete PD-port precedent, straightforward port-layer wiring, ready whenever gamepad support is prioritized (no `src/` game-logic touch — GE's `motor.c` calls already exist, just need `osMotorStart/Stop` in `libultra.c` to route to a real `SDL_GameControllerRumble` call the way PD's do). |
|
||||
| **Rumble** _(DONE D401 — D224 / M-87, re-promoted 2026-09-27)_ | `port/src/input.c` + `port/src/libultra.c` + `port/src/optionsoverlay.c` | P | M | D401 implements the PD precedent per `docs/dev/RUMBLE-PLAN.md`: `inputRumbleSupported()`/`inputRumble()` → `SDL_GameControllerRumble()` when the pad reports haptics (SDL ≥ 2.0.18 `HasRumble`, else `SDL_JoystickIsHaptic` + known-type Windows fallback), per-pad haptics detection (`SDL_GameControllerHasRumble` / `SDL_JoystickIsHaptic` + known-type Windows fallback), a single global `Input.RumbleScale` (0..1, dflt 0.5) config + one `Rumble strength` slider row; `libultra.c` sets `CONT_CARD_ON` in `g_contStatus` for rumble-capable pads and routes `osPfsInit` → `PFS_ERR_DEVICE`, `osMotorInit/Start/Stop` → the haptics API — the two M-87 addendum blockers that kept `joyRumblePakInit` from arming. Zero `src/` edits. **Real-pad haptics confirmed working by the user (2026-09-28).** Plan item 3 landed the same day: the original four per-player rows were replaced (user decision) with one global `Rumble strength` slider in the F10 overlay + front options screen (`optionsoverlay.c`, shared `rows[]`), 0.05 detents, `kResetDefaults` 0.5; the four `Input.PlayerN.RumbleScale` ini keys were dropped (stale keys self-clean on the next save). A disabled-when-unsupported row state is deferred with the per-pad tuning row (needs a generic row-disabled mechanism). Unverified: `RumbleScale=0` silence check (trivial early-out). |
|
||||
| FakeGamepads / FirstGamepadNum / UseHIDAPI | `input.c` | P | S–M | Niche (local MP on PC); defer until MP is actually played. |
|
||||
| Window polish: DefaultFullscreen/Maximize, CenterWindow, AllowHiDpi, ExclusiveFullscreen | `video.c` vid* block | P | S | HiDpi + center are the useful ones on modern Windows. |
|
||||
| VSync adaptive (−1..10) | `Video.VSync` range | P | S | Note for FPS plan — GE's 0/1 toggle is fine until then. |
|
||||
|
||||
@@ -0,0 +1,264 @@
|
||||
# Rumble Pak → real gamepad haptics (port plan)
|
||||
|
||||
Status: **IMPLEMENTED — finding D401 (2026-09-27/28).** Items 1+2+3 all
|
||||
landed (port layer only; zero `src/` edits), re-promoting the
|
||||
DEPRIORITIZED finding **D224** (M-87) to DONE. **Real-pad haptics confirmed
|
||||
working by the user (2026-09-28).** Menu shape: **one global `Rumble
|
||||
strength` slider** (`Input.RumbleScale`, user decision 2026-09-28 — the
|
||||
four per-player rows were dropped). Only the `RumbleScale=0` silence check
|
||||
remains unverified (trivial early-out path).
|
||||
|
||||
Scope: wire the N64 Rumble Pak path (already present in `src/`) through to
|
||||
`SDL_GameControllerRumble()` on the PC. **Port-layer only — zero `src/game` or
|
||||
`src/` logic edits**, so rule 2 / ABI-exception do not apply.
|
||||
|
||||
Reference: the PD PC port (local checkout `../pd_port`, `port/src/input.c`
|
||||
+ `port/src/libultra.c`) implements the identical feature for the same Rare
|
||||
engine family. Copy its shape; the only friction is that **GE's `src/joy.c`
|
||||
calls the classic libultra names** (`osMotorInit/Start/Stop`, `osPfsInit/
|
||||
osPfsIsPlug`) while PD's engine renamed them (`osMotorProbe`,
|
||||
`__osMotorAccess`, `osPfsInitPak`). We translate names, not logic.
|
||||
|
||||
---
|
||||
|
||||
## Ground truth (current state)
|
||||
|
||||
Game side — **already correct, untouched:**
|
||||
- `src/joy.c` full Rumble-Pak state machine: `joyRumblePakInit` (:178),
|
||||
`joyRumblePakTick` (:298), `joyRumblePakStart`/`Stop`. Call sites (verified
|
||||
2026-09-27 for D401) live in `gunfire.c:3284` (start) / `:3288` (stop),
|
||||
`bondview2.c:9722` (start) / `:9726` (stop, incl. 2P second pad),
|
||||
`lv.c:1688` (stop at level start), plus `sched.c:272` (stop on level
|
||||
teardown).
|
||||
- `src/motor.c` is **EXCLUDED** from the PC build (N64 SI-DMA driver), replaced
|
||||
by no-op stubs. CMakeLists.txt:525 documents this.
|
||||
|
||||
Port side — **all no-oped today, in `port/src/libultra.c`:**
|
||||
- `osPfsInit` (:1413) → `return PFS_ERR_NOPACK;`
|
||||
- `osPfsIsPlug` (:1415) → `*pattern = 0; return 0;`
|
||||
- `osMotorInit` (:1417) → `return -1;`
|
||||
- `osMotorStart` (:1419) → `return -1;`
|
||||
- `osMotorStop` (:1420) → `return -1;`
|
||||
- `g_contStatus[i].status = 0;` (:1102) — `CONT_CARD_ON` **never set**.
|
||||
|
||||
Gamepad side — **exists, no change needed:**
|
||||
- `port/src/input.c` owns `static SDL_GameController *pads[MAX_PADS]`
|
||||
(MAX_PADS = 4, aligned with `MAXCONTROLLERS`), open/close, hotplug,
|
||||
`inputComputePad()`. This is the exact object `SDL_GameControllerRumble()`
|
||||
needs.
|
||||
|
||||
## The two upstream blockers (D224 M-87 addendum — MUST land together)
|
||||
|
||||
`joyRumblePakInit` (src/joy.c:178) only drives the motor if BOTH pass:
|
||||
1. `g_ContStatus[index].status & CONT_CARD_ON` → today always 0, so init
|
||||
never even runs.
|
||||
2. `osPfsInit(...)` returns `PFS_ERR_ID_FATAL` **or** `PFS_ERR_DEVICE` →
|
||||
today returns `PFS_ERR_NOPACK`, so `osMotorInit` is never attempted.
|
||||
|
||||
If the SDL wiring is done without (1)+(2), the state machine parks at
|
||||
`RUMBLEPAKINITSTATE_NOT_READY` forever and nothing rumbles despite "looking
|
||||
wired." Both fixes are in the same file we already touch, so no extra cost.
|
||||
|
||||
---
|
||||
|
||||
## Work items
|
||||
|
||||
### 1. `port/src/input.c` — detection + API
|
||||
|
||||
Add per-pad fields (GE uses flat statics, not PD's `padsCfg[]` array):
|
||||
```c
|
||||
static int padRumbleOn[MAX_PADS]; // set where pads[i] is opened (line ~582)
|
||||
static float padRumbleScale[MAX_PADS] = { 0.5f, 0.5f, 0.5f, 0.5f };
|
||||
```
|
||||
On pad open (in the `SDL_GameControllerOpen` path, line ~575-589), mirror PD:
|
||||
```c
|
||||
#if SDL_VERSION_ATLEAST(2, 0, 18)
|
||||
padRumbleOn[i] = SDL_GameControllerHasRumble(pads[i]);
|
||||
#else
|
||||
padRumbleOn[i] = SDL_JoystickIsHaptic(SDL_GameControllerGetJoystick(pads[i]));
|
||||
if (!padRumbleOn[i]) {
|
||||
const SDL_GameControllerType t = SDL_GameControllerGetType(pads[i]);
|
||||
padRumbleOn[i] = t && (t != SDL_CONTROLLER_TYPE_VIRTUAL); // Win no-haptic fallback
|
||||
}
|
||||
#endif
|
||||
```
|
||||
On pad close, `padRumbleOn[i] = 0;`. GE has no `inputCloseController`
|
||||
(PD-only) — the close sites are `inputDestroy()` and the close loop in
|
||||
`inputRescanPads()`, both of which zero it (`inputOpenPads` re-detects on
|
||||
open anyway).
|
||||
|
||||
New public fns (declare in `port/include/input.h`, define in input.c):
|
||||
```c
|
||||
int inputRumbleSupported(int idx); // 0<=idx<MAX_PADS ? padRumbleOn[idx] : 0
|
||||
void inputRumble(int idx, float strength, float time); // scaled SDL_GameControllerRumble
|
||||
float inputRumbleGetScale(int idx);
|
||||
void inputRumbleSetScale(int idx, float v);
|
||||
```
|
||||
`inputRumble` body (from PD, verbatim logic):
|
||||
```c
|
||||
if (idx < 0 || idx >= MAX_PADS || !pads[idx]) return;
|
||||
if (padRumbleScale[idx] <= 0.f) return;
|
||||
if (padRumbleOn[idx]) {
|
||||
strength *= padRumbleScale[idx];
|
||||
if (strength <= 0.f) { strength = 0; time = 0; }
|
||||
else { strength *= 65535.f; time *= 1000.f; }
|
||||
SDL_GameControllerRumble(pads[idx], (Uint16)strength, (Uint16)strength, (Uint32)time);
|
||||
}
|
||||
```
|
||||
In init, add the two PS4/5 hints (PD input.c:696-697) so BT pads report
|
||||
haptics:
|
||||
```c
|
||||
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
|
||||
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
|
||||
```
|
||||
Register per-pad config (in the existing `configRegister*` block, ~line 2457+):
|
||||
```c
|
||||
char key[48];
|
||||
for (int c = 0; c < MAX_PADS; ++c) {
|
||||
sprintf(key, "Input.Player%d.RumbleScale", c + 1);
|
||||
configRegisterFloat(key, &padRumbleScale[c], 0.f, 1.f);
|
||||
}
|
||||
```
|
||||
Note: **`strFmt` is NOT available in `input.c`** (0 uses, no decl in
|
||||
`port/include`) — use a local `sprintf` buffer as above. `configRegisterFloat`
|
||||
is declared in `port/include/config.h` (already included by input.c:80); it's
|
||||
used elsewhere (video.c) so the symbol is already in the link set.
|
||||
|
||||
### 2. `port/src/libultra.c` — rewire the shims
|
||||
|
||||
`contSnapshotFromKeyboard` (:1096): set the status bit for connected,
|
||||
rumble-capable pads (need a per-channel capability check → call
|
||||
`inputRumbleSupported(i)`; it's declared in input.h so include it):
|
||||
```c
|
||||
g_contStatus[i].type = connected ? CONT_TYPE_NORMAL : 0;
|
||||
g_contStatus[i].status = (connected && inputRumbleSupported(i)) ? CONT_CARD_ON : 0;
|
||||
```
|
||||
Replace the 5 accessory stubs (:1413-1420) with real routing (PD libultra.c:235-351):
|
||||
```c
|
||||
s32 osPfsInit(OSMesgQueue *q, OSPfs *pfs, int channel) {
|
||||
(void)q;
|
||||
// "pretend the Rumble Pak is present" when the real pad can rumble:
|
||||
// returning PFS_ERR_DEVICE is what joyRumblePakInit (src/joy.c:186-190)
|
||||
// needs to proceed to osMotorInit.
|
||||
return inputRumbleSupported(channel) ? PFS_ERR_DEVICE : PFS_ERR_NOPACK;
|
||||
}
|
||||
s32 osPfsIsPlug(OSMesgQueue *q, u8 *pattern) {
|
||||
(void)q;
|
||||
if (pattern) {
|
||||
*pattern = 0;
|
||||
for (int i = 0; i < MAXCONTROLLERS; ++i)
|
||||
if (inputRumbleSupported(i)) *pattern |= (u8)(1 << i);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
s32 osMotorInit(OSMesgQueue *mq, OSPfs *pfs, int channel) {
|
||||
if (pfs && inputRumbleSupported(channel)) {
|
||||
pfs->queue = mq;
|
||||
pfs->channel = channel;
|
||||
pfs->activebank = 0xff; // PD's osMotorProbe stores this too
|
||||
// NOTE: PFS_MOTOR_INITIALIZED is NOT defined in GE's headers, and
|
||||
// joy.c never reads pfs->status — it only checks (osMotorInit()==0)
|
||||
// to set RUMBLEPAKINITSTATE_READY (src/joy.c:190). Skip the status store.
|
||||
return 0;
|
||||
}
|
||||
(void)mq; (void)channel;
|
||||
return PFS_ERR_NOPACK;
|
||||
}
|
||||
s32 osMotorStart(OSPfs *pfs) {
|
||||
if (!pfs) return PFS_ERR_NOPACK;
|
||||
// N64 motor has no duration; the game's joyRumblePakTimer60 (joy.c) turns it
|
||||
// off. Issue one generous window, PD-style ("hope the timer stops it"):
|
||||
inputRumble(pfs->channel, 1.0f, 5.0f);
|
||||
return 0;
|
||||
}
|
||||
s32 osMotorStop(OSPfs *pfs) {
|
||||
if (!pfs) return PFS_ERR_NOPACK;
|
||||
inputRumble(pfs->channel, 0.0f, 0.0f); // zero-duration / zero-strength = stop
|
||||
return 0;
|
||||
}
|
||||
```
|
||||
**JPN note (2026-09-27):** `_HW_VERSION_1` defines `MAXCONTROLLERS` as 6
|
||||
while `MAX_PADS` is 4 — the `MAXCONTROLLERS`-bounded loops above are safe
|
||||
because `inputRumbleSupported()` bounds-checks against `MAX_PADS` and reports
|
||||
unsupported (silent) for `i >= 4`. `osPfsIsPlug` has **no GE game-side call
|
||||
sites** — its rewiring is completeness/hygiene only; the load-bearing stubs
|
||||
are `osPfsInit`/`osMotor*`.
|
||||
|
||||
Headers confirmed: `OSPfs` (`include/PR/os.h:282`) has `queue` + `channel`; the
|
||||
error macros `PFS_ERR_DEVICE` (:642) and `PFS_ERR_ID_FATAL` (:641) and
|
||||
`PFS_ERR_NOPACK` (:631) are all defined there. **`PFS_MOTOR_INITIALIZED` is NOT
|
||||
defined** anywhere in GE's headers and `joy.c` never reads `pfs->status`, so it
|
||||
is not needed. `input.h` is already included by libultra.c (line 50), so
|
||||
`inputRumbleSupported` is directly callable there.
|
||||
|
||||
### 3. (DONE 2026-09-28) options-menu slider — single global
|
||||
|
||||
Landed in `port/src/optionsoverlay.c` (not PD's `optionsmenu.c` — GE's F10
|
||||
overlay + front options screen share `rows[]`, walked by `frontoptions.c`
|
||||
via the `optionsRow*` accessors): ONE `ROW_SLIDER` row `Rumble strength`
|
||||
on `Input.RumbleScale` (0.05 detents, generic `CONFIG_OPT_FLOAT` display
|
||||
`%.2f`), in the INPUT section after the controller rows, plus a
|
||||
`kResetDefaults` entry (0.5, the `gRumbleScale` C initializer) so INPUT's
|
||||
"Reset to defaults" covers it.
|
||||
|
||||
**Decision (user, 2026-09-28):** the original four-per-player-row design
|
||||
(`Rumble (Player 1..4)` on `Input.Player%d.RumbleScale`) was coded and
|
||||
reviewed, then replaced with the single global row **before its first
|
||||
compile**: the scale applies to every rumble-capable pad, and the four
|
||||
`Input.PlayerN.RumbleScale` ini keys are dropped — stale keys in an
|
||||
existing ini log four harmless `unknown key` `LOG_NOTE` lines at config
|
||||
load and self-clean on the next `configSave` (which rewrites the whole
|
||||
file with the registered keys). Per-player rumble tuning stays a G-class
|
||||
stretch goal (QOL-INVENTORY) — and a per-pad override-on-top-of-global
|
||||
design would be a no-op for everyone anyway, because `configSave`
|
||||
rewrites all registered keys and the "user explicitly set this?" signal
|
||||
is burned as soon as any key exists at the 0.5 default. The
|
||||
row-disabled-when-unsupported state is deferred with the per-pad tuning
|
||||
row (the overlay has no generic row-disabled mechanism); the row is inert
|
||||
(no-op) on non-rumble setups.
|
||||
|
||||
**Original plan (for reference):** PD wires the per-pad scale into the
|
||||
options menu (`optionsmenu.c:533-540`): `inputRumbleGetScale(player)`,
|
||||
`inputRumbleSetScale(player, v/10)`, disabled when
|
||||
`!inputRumbleSupported(player)`. In GE this maps onto
|
||||
`port/src/optionsoverlay.c` / the per-pad tuning row (QOL-INVENTORY.md).
|
||||
Config file value alone is enough for the feature; the UI is the polish.
|
||||
|
||||
---
|
||||
|
||||
## Verification ritual (AGENTS.md)
|
||||
|
||||
- [x] `./build-pc.sh ntsc-final` compiles clean (2026-09-27). New
|
||||
`inputRumble*` defined once in input.c, declared in input.h; no new
|
||||
undefined/duplicate symbols (full `/linkcheck` sweep pending at D401
|
||||
close).
|
||||
- [x] `CONT_CARD_ON` + `PFS_ERR_DEVICE` land (the two-blocker addendum);
|
||||
the state machine's READY path is provable by code read — the runtime
|
||||
proof is folded into the real-pad test below.
|
||||
- [x] **By-hand, real pad:** user confirmed the rumble works on a real
|
||||
controller (2026-09-28) — fire a weapon (`gunfire.c:3284` recoil),
|
||||
explosion rumble, 2P second pad (`bondview2.c:9722/9726`). Non-rumble
|
||||
pad and mouse/keyboard-only stay silent by construction (`pads[idx]`
|
||||
NULL / `padRumbleOn` 0 ⇒ `inputRumble` no-op).
|
||||
- [ ] `Input.RumbleScale=0` fully silences (unverified — the trivial
|
||||
`gRumbleScale <= 0` early-out in `inputRumble`); max value loud
|
||||
(confirmed implicitly by the working playtest at scale 0.5).
|
||||
|
||||
## Finding log
|
||||
|
||||
Done (2026-09-27): **D401** added to `docs/dev/findings.md` (§F index +
|
||||
full entry) documenting the D224 implementation + the two-blocker
|
||||
resolution; the `QOL-INVENTORY.md` M-87/D224 row re-promoted
|
||||
DEPRIORITIZED → DONE (D401); `docs/dev/findings-index.csv` regenerated.
|
||||
|
||||
---
|
||||
|
||||
## Effort
|
||||
|
||||
- Items 1+2: **~1–2 h** coding (mostly a rename + copy from PD) + build/linkcheck.
|
||||
- Hands-on pad testing: **~30 min–1 h** (the only genuinely open-ended part —
|
||||
feels-right tuning).
|
||||
- Item 3 (UI slider): **~1 h**, landed 2026-09-28 as the single global
|
||||
`Rumble strength` row.
|
||||
|
||||
**Total for working core: half a day max, <2 h of pure code.**
|
||||
@@ -31,7 +31,7 @@ D192,CLOSED,Front-end mission/level-select grid pointer still can't reach the ou
|
||||
D221,FIXED,SELECT FILE mouse hit-box offset —,"FIXED (M-91) — explicit {min,max} coord2d pairs under #ifdef PORT; human mouse-playtest confirmed."
|
||||
D222,FIXED,High Video.FovScale breaks culling —,"FIXED, awaiting visual verification (M-121)."
|
||||
D223,FIXED,QoL ask: mouse-wheel weapon cycling should be directional like a normal PC shooter —,"FIXED (M-105, port/src/input.c) —…"
|
||||
D224,?,"QoL gap (M-87, from a PD-PC-port survey):","DEPRIORITIZED (M-87, user call)."
|
||||
D224,PARTIAL,"QoL gap (M-87, from a PD-PC-port survey):","LANDED via D401 (2026-09-27, re-promoted from DEPRIORITIZED)."
|
||||
D225,FIXED,"Dev-tooling QoL (M-87, user ask):","FIXED (2026-09-18) — GE_DEBUG_UNLOCKALL=1 short-circuits fileGetIsCheatUnlocked() (src/game/file2.c, #ifdef PORT, cached getenv) to always return TRUE; default off, no save mutation."
|
||||
D226,FIXED,"QoL ask: player-adjustable HUD scale for the ammo counter, bottom-left pickup/item status text, and top-of-screen dialogue/subtitle text.","FIXED (2026-09-24): Game.HudScale 75–150% (user-verified, capped at 150) via fast3d G_HUDSCALE_EXT rect scaling about per-element anchors; dialogue/bottom messages width-capped."
|
||||
D227,FIXED,Sky renders as two independently-moving halves —,"FIXED (M-100b, PR #43) —"
|
||||
@@ -277,3 +277,4 @@ D397,RESOLVED,SELECT FILE background + intro gun-barrel show an interlaced/comb
|
||||
D398,FIXED,PC Options label: D348's procedural slider glyph replaced with an existing mainfolderimages texture (2026-09-27).,"SUPERSEDED by D400 (icon removed, text-only label; purple-hover bug moot; the D400 textMeasure arg-swap bug was found and fixed there)."
|
||||
D399,PARTIAL,File-select bottom row (SELECT FILE text + Copy/Erase + PC Options dot/label) shifted 15px left as a block (user sign-off 2026-09-27).,"LANDED (port-only, D343 class):"
|
||||
D400,PARTIAL,"File-select ""PC Options"" label:","LANDED (port-only, frontoptions.c):"
|
||||
D401,PARTIAL,Rumble Pak → real gamepad haptics (re-promotes D224/M-87):,"LANDED (port-only, input.c/input.h/libultra.c + optionsoverlay.c per docs/dev/RUMBLE-PLAN.md; zero src/ edits)."
|
||||
|
+97
-1
@@ -415,7 +415,7 @@ covers D24–D69; the log continues in §H (D32 procedure, D70–D121).
|
||||
| D221 | **SELECT FILE mouse hit-box offset — compiler stack-layout dependency, not coordinate mismatch (M-87 QA / M-91 fix).** — full `## D221` entry at file tail | **FIXED (M-91)** — explicit `{min,max}` `coord2d` pairs under `#ifdef PORT`; human mouse-playtest confirmed. Distinct from D192 (mode-0 clamp range, still open). |
|
||||
| D222 | **High `Video.FovScale` breaks culling — NPCs and some world objects stop rendering near the screen edges (M-87, user QA).** — full `## D222` entry at file tail | **FIXED, awaiting visual verification (M-121).** Root cause traced one step further than the original write-up… |
|
||||
| D223 | **QoL ask: mouse-wheel weapon cycling should be directional like a normal PC shooter — wheel up = next weapon, wheel down = previous — instead of both directions…** — full `## D223` entry at file tail | **FIXED (M-105, `port/src/input.c`) —… |
|
||||
| D224 | **QoL gap (M-87, from a PD-PC-port survey): the N64 Rumble Pak is fully dropped instead of modernized.** — full `## D224` entry at file tail | **DEPRIORITIZED (M-87, user call).** Gamepad-only —… |
|
||||
| D224 | **QoL gap (M-87, from a PD-PC-port survey): the N64 Rumble Pak is fully dropped instead of modernized.** — full `## D224` entry at file tail | **LANDED via D401 (2026-09-27, re-promoted from DEPRIORITIZED).** Rumble Pak now drives real SDL gamepad haptics (`SDL_GameControllerRumble`) via the port-layer `inputRumble*` API + `CONT_CARD_ON`/`PFS_ERR_DEVICE` gating; single global `Input.RumbleScale` (0..1) config + one `Rumble strength` slider row. Real-pad playtest owed. Gamepad-only —… |
|
||||
| D225 | **Dev-tooling QoL (M-87, user ask): a debug-build/env toggle that unlocks all missions + all cheats, for testing.** — full `## D225` entry at file tail | **FIXED (2026-09-18)** — `GE_DEBUG_UNLOCKALL=1` short-circuits `fileGetIsCheatUnlocked()` (`src/game/file2.c`, `#ifdef PORT`, cached getenv) to always return TRUE; default off, no save mutation. Build-verified; headless boot with `GE_STARTMENU=7` (mission select) crash-free. |
|
||||
| D226 | **QoL ask: player-adjustable HUD scale for the ammo counter, bottom-left pickup/item status text, and top-of-screen dialogue/subtitle text.** — full `## D226` entry at file tail | **FIXED (2026-09-24)**: Game.HudScale 75–150% (user-verified, capped at 150) via fast3d G_HUDSCALE_EXT rect scaling about per-element anchors; dialogue/bottom messages width-capped. |
|
||||
| D227 | **Sky renders as two independently-moving halves — "two sky processes" (M-93 QA; root cause M-100b: unit error, `unk20`/`unk24` are S10.5 not texels).** — full `## D227` entries (M-94→M-100b) at file tail | **FIXED (M-100b, PR #43)** — also fixed "scrolls too fast" (M-96) + over-tiling; human play-test confirmed. Full history in the sections. |
|
||||
@@ -685,6 +685,7 @@ covers D24–D69; the log continues in §H (D32 procedure, D70–D121).
|
||||
| D398 | **PC Options label: D348's procedural slider glyph replaced with an existing mainfolderimages texture (2026-09-27).** Full `## D398` entry at file tail. | SUPERSEDED by D400 (icon removed, text-only label; purple-hover bug moot; the D400 `textMeasure` arg-swap bug was found and fixed there). |
|
||||
| D399 | **File-select bottom row (SELECT FILE text + Copy/Erase + PC Options dot/label) shifted 15px left as a block (user sign-off 2026-09-27).** Full `## D399` entry at file tail. | LANDED (port-only, D343 class): `selectpos.f[0]` 110→95 (new `#ifdef PORT` in front.c), Copy 200/222→185/207, Erase 282/304→267/289 (D343 PORT block), `LABEL_X` 358→343 (`frontoptions.c`); hit bounds recompute from the shifted positions. Clean build, PCDUMP frame 195 no overlaps; by-eye check owed. |
|
||||
| D400 | **File-select "PC Options" label: icon removed, text-only; fixed a swapped textMeasure() arg bug and a 7px vertical misalignment vs Copy/Erase (user sign-off 2026-09-27).** Full `## D400` entry at file tail. | LANDED (port-only, `frontoptions.c`): D398's dot icon dropped on user instruction ("most straightforward design"); label now a plain `textRender` word, GAP 28 after Erase. Two measurement bugs fixed: (1) `textMeasure(textheight, textwidth)` args passed swapped -> label 35px above the bar, hot band transposed; (2) bare-label height measures 0 (vs 14 for newline-terminated Copy/Erase) -> 7px lower tops; fixed by restoring the `kLabelNL` height measure. PCDUMP frame 195: tops aligned 279.8 vs 279.3, 31px clearance from Erase; by-eye check owed. |
|
||||
| D401 | **Rumble Pak → real gamepad haptics (re-promotes D224/M-87): `CONT_CARD_ON` gate + `osPfs*`/`osMotor*` shims rewired to `SDL_GameControllerRumble`, single global `Rumble strength` slider on `Input.RumbleScale` (2026-09-27/28).** Full `## D401` entry at file tail. | LANDED (port-only, `input.c`/`input.h`/`libultra.c` + `optionsoverlay.c` per `docs/dev/RUMBLE-PLAN.md`; zero `src/` edits). Both M-87 addendum blockers: `g_contStatus[i].status` now sets `CONT_CARD_ON` for connected rumble-capable pads (so `joyRumblePakInit` arms) and `osPfsInit` returns `PFS_ERR_DEVICE` for them (so `osMotorInit` is attempted). New `inputRumble*` API + global `Input.RumbleScale` (0..1, dflt 0.5; the four per-player `Input.PlayerN.RumbleScale` keys were dropped in the final menu-shape decision); `osMotorStart/Stop` drive it. **Real-pad haptics confirmed working by user (2026-09-28)**; plan item 3 (one global `Rumble strength` slider in the F10 overlay + front options screen, reset-table entry) landed the same day. `RumbleScale=0` silence check still unverified (trivial early-out path). |
|
||||
|
||||
|
||||
Phase 2 replaced the Phase-1 demo loop with the real `mainproc()` on real OS
|
||||
@@ -10772,6 +10773,13 @@ D243 (cutscene shake/duplication, its own CONSOLIDATED NEXT STEPS block appears
|
||||
|
||||
## D224 — QoL gap (M-87, from a PD-PC-port survey): the N64 Rumble Pak is fully dropped instead of modernized.
|
||||
|
||||
**DONE via D401 (2026-09-27).** Re-promoted from DEPRIORITIZED; implemented per
|
||||
`docs/dev/RUMBLE-PLAN.md` exactly as the M-87 addendum prescribed — both
|
||||
upstream blockers (`CONT_CARD_ON` gate + `osPfsInit` → `PFS_ERR_DEVICE`) landed
|
||||
with the `SDL_GameControllerRumble` wiring, plus `Input.PlayerN.RumbleScale`
|
||||
config (options-menu slider deferred). Real-pad playtest + `RumbleScale=0`
|
||||
silence check owed. See `## D401` (file tail) for the full record.
|
||||
|
||||
**QoL gap (M-87, from a PD-PC-port survey): the N64 Rumble Pak is fully dropped instead of modernized.** GE genuinely has a rumble subsystem (`src/motor.c`, `src/joy.c`) but the port's `osMotorInit/Start/Stop` (`port/src/libultra.c:1220-1223`) are all hard stubs — "no accessories on the PC," `osMotorStart`/`osMotorStop` return `-1` unconditionally, `osPfsFindFile`-family returns `PFS_ERR_NOPACK`. So every in-game rumble event (weapon recoil, explosions, etc.) computes and calls into a dead path. **PD's PC port wires the equivalent straight through to real gamepad rumble:** `inputRumbleSupported(idx)` checks `SDL_GameControllerHasRumble`/`SDL_JoystickIsHaptic` (with a Windows fallback: some pads report no haptics but rumble anyway), `inputRumble(idx, strength, time)` calls `SDL_GameControllerRumble()` scaled by a per-pad `RumbleScale` config value (options-menu slider, `Input.PadN.RumbleScale`), and `osPfsFindFile` reports a "Rumble Pak" present exactly when a real pad supports rumble (`libultra.c` — same "pretend the N64 accessory is there" pattern GE's port already uses for `osMemSize`/Expansion Pak, just applied to a real capability instead of faked). Cross-ref `QOL-INVENTORY.md` (folded into the existing "per-pad tuning" row).
|
||||
|
||||
**Status (from §F table):** **DEPRIORITIZED (M-87, user call).** Gamepad-only — irrelevant to mouse/keyboard, which is the primary target for this next release; no keyboard/mouse play is affected by NOT doing this. Root cause + fix still valid whenever gamepad support becomes a priority (no `src/` game-logic touch: GE's `motor.c`/`joy.c` call sites already exist and already call the `osMotor*` shims; the fix is entirely in `port/src/libultra.c` + `input.c` — add `inputRumbleSupported`/`inputRumble` per the PD shape, wire `osMotorStart`/`osMotorStop` to them, add `Input.PadN.RumbleScale` config). **M-87 PD-legacy-survey addendum (`docs/dev/notes/PD-LEGACY-SURVEY.md` candidate 1, high confidence) — the D224 fix as originally stated is NOT sufficient by itself.** Two more upstream blockers sit before the stubbed `osMotorInit/Start/Stop` ever gets reached: (1) `port/src/libultra.c:1096-1098` sets `g_contStatus[i].status = 0` for every pad — `CONT_CARD_ON` is never set, and `src/joy.c:184` gates the *entire* rumble-pak init path on that bit, so `joyRumblePakInit()` never even calls `osPfsInit`. (2) `src/joy.c:186-190` only attempts `osMotorInit` if `osPfsInit`'s return is `PFS_ERR_ID_FATAL` or `PFS_ERR_DEVICE` — but the port's stub (`libultra.c:1214`) returns `PFS_ERR_NOPACK`, so motor init is never attempted even once (1) is fixed. PD's exact trick (`libultra.c:213-227,349-351`): set `CONT_CARD_ON` for connected pads, and make `osPfsInitPak()` return `PFS_ERR_DEVICE` specifically when the pad supports rumble. **Whenever D224 gets implemented, both of these must land alongside the `SDL_GameControllerRumble` wiring** or the game's state machine parks at `RUMBLEPAKINITSTATE_NOT_READY` forever and nothing audibly changes despite looking wired up correctly.
|
||||
@@ -15293,3 +15301,91 @@ right margin (canvas 440). **Owed: by-eye check via `scratch\playtest_v040.bat`
|
||||
(idle legibility, gold hover not purple, click opens the F10 overlay, vertical
|
||||
alignment with Copy/Erase).** Cross-ref D348 (glyph lineage), D398
|
||||
(superseded icon approach), D399 (bottom-row 15px shift).
|
||||
|
||||
## D401 — Rumble Pak → real gamepad haptics: `CONT_CARD_ON` gate + `osPfs*`/`osMotor*` shims rewired to `SDL_GameControllerRumble`, global `Input.RumbleScale` slider (2026-09-27/28).
|
||||
|
||||
Implements **D224 (M-87)** per `docs/dev/RUMBLE-PLAN.md` — the N64 Rumble
|
||||
Pak state machine (`src/joy.c` `joyRumblePakInit`/`joyRumblePakTick`/Start/Stop,
|
||||
call sites `gunfire.c:3284/3288`, `bondview2.c:9722/9726`, `lv.c:1688`,
|
||||
`sched.c:272`) now drives real SDL gamepad haptics. **Port layer only: zero
|
||||
`src/` edits**, so rule 2 / the ABI exception are not implicated.
|
||||
|
||||
**The two M-87 addendum blockers** (both `port/src/libultra.c`):
|
||||
|
||||
1. `contSnapshotFromKeyboard` left `g_contStatus[i].status = 0`, so
|
||||
`joyRumblePakInit` (`src/joy.c:178` — requires `status & CONT_CARD_ON`) never
|
||||
ran and `joyRumblePak` was never populated. Now
|
||||
`status = (connected && inputRumbleSupported(i)) ? CONT_CARD_ON : 0` —
|
||||
gated on real capability so non-rumble pads never enter the rumble path
|
||||
(cleaner than PD's unconditional bit; `joyRumblePakInit` is the real gate).
|
||||
`type` stays `CONT_TYPE_NORMAL` (includes `CONT_JOYPORT`; PD's
|
||||
`CONT_ABSOLUTE` would have broken the init gate).
|
||||
2. `osPfsInit` stubbed `PFS_ERR_NOPACK`, so `osMotorInit` was never
|
||||
attempted (`src/joy.c:186-190` proceeds only on `PFS_ERR_ID_FATAL` or
|
||||
`PFS_ERR_DEVICE`). Now returns `PFS_ERR_DEVICE` ("Rumble Pak present, not a
|
||||
Memory Pak") for rumble-capable channels, `PFS_ERR_NOPACK` otherwise.
|
||||
|
||||
**`port/src/input.c`** (flat statics, GE style — not PD's `padsCfg[]`):
|
||||
`padRumbleOn[MAX_PADS]` + a single global `gRumbleScale` (default 0.5) —
|
||||
the per-pad `padRumbleScale[]` array was superseded 2026-09-28 by the
|
||||
global slider (see "Menu row" below). Detection in
|
||||
`inputOpenPads`: `SDL_GameControllerHasRumble` on SDL ≥ 2.0.18, else
|
||||
`SDL_JoystickIsHaptic` with the known-type Windows no-haptic fallback; zeroed
|
||||
on close in `inputDestroy`/`inputRescanPads`. PS4/PS5 HIDAPI rumble hints in
|
||||
`inputInit`. New API: `inputRumbleSupported(idx)` (bounds-checked against
|
||||
`MAX_PADS` — JPN `_HW_VERSION_1` has `MAXCONTROLLERS == 6`, so out-of-range
|
||||
channels report unsupported and stay silent), `inputRumble(idx, strength,
|
||||
time)` (no-op on `gRumbleScale <= 0`; scales strength, `*65535` / `*1000`
|
||||
units, `SDL_GameControllerRumble`; `(0,0)` stops), global
|
||||
`inputRumbleGetScale(void)`/`inputRumbleSetScale(f32)`. Config: a single
|
||||
`Input.RumbleScale` (range 0..1, default 0.5) registered in
|
||||
`inputConfigInit`; the four per-player `Input.Player%d.RumbleScale` keys
|
||||
were dropped in the same-day menu-shape decision (stale keys in an
|
||||
existing ini log four `unknown key` `LOG_NOTE` lines and self-clean on the
|
||||
next `configSave`). `keyboard`/mouse-only play stays silent: no pad open
|
||||
⇒ `pads[idx]` NULL ⇒ `inputRumble` no-ops.
|
||||
|
||||
**`port/src/libultra.c`** shims: `osPfsInit` as above; `osPfsIsPlug` sets its
|
||||
pattern bits for the capable channels over `MAXCONTROLLERS` (completeness
|
||||
only — **no GE game call sites**); `osMotorInit` stores `pfs->queue`,
|
||||
`pfs->channel`, `pfs->activebank = 0xff` (PD `osMotorProbe` shape) and returns
|
||||
0 for capable channels, `PFS_ERR_NOPACK` otherwise (no `PFS_MOTOR_INITIALIZED`
|
||||
store — not defined in GE headers and `joy.c` never reads `pfs->status`);
|
||||
`osMotorStart` → `inputRumble(channel, 1.0f, 5.0f)` (one generous window;
|
||||
the game's `joyRumblePakTimer60` normally stops it, PD-style), `osMotorStop` →
|
||||
`inputRumble(channel, 0.0f, 0.0f)`; both return 0 for non-NULL `pfs`.
|
||||
|
||||
**Verification.** `./build-pc.sh ntsc-final` clean (no new undefined/duplicate
|
||||
symbols; `inputRumble*` defined once in input.c, declared in input.h).
|
||||
**Real-pad haptics confirmed working by the user (2026-09-28)** — the gun-
|
||||
impact rumble path is live on a real controller. The `RumbleScale=0`
|
||||
silence check remains unverified (it is the trivial `gRumbleScale <= 0`
|
||||
early-out in `inputRumble`). Same-session environment fix: the
|
||||
recurring `Cannot create temporary file in C:\Windows\: Permission denied`
|
||||
link failure is now self-healed by `build-pc.sh` (native-TMP probe →
|
||||
cmake+ninja re-run under PowerShell with `TMP`/`TEMP` set natively; see the
|
||||
AGENTS.md "Build" note), and `cannot open output file ... Permission denied`
|
||||
is documented as the running-`.exe`-lock case (close the game before
|
||||
rebuilding).
|
||||
|
||||
**Menu row (plan item 3, 2026-09-28).** The deferred options-menu slider
|
||||
landed the day after the user confirmed the haptics, as a **single global
|
||||
row** (user decision — "making the rumble menu just 1 player"):
|
||||
`port/src/optionsoverlay.c` gains one `ROW_SLIDER` row — `Rumble strength`
|
||||
on `Input.RumbleScale` (0.05 detents; the generic `CONFIG_OPT_FLOAT`
|
||||
value/display path, shown `%.2f`) — placed in the INPUT section after the
|
||||
other controller rows, with a `kResetDefaults` entry (0.5, the
|
||||
`gRumbleScale` C initializer) so INPUT's "Reset to defaults" covers it.
|
||||
The originally-coded four per-player rows (`Rumble (Player 1..4)` on
|
||||
`Input.Player%d.RumbleScale`) were replaced before first compile; the
|
||||
four ini keys are dropped rather than kept as hidden overrides (stale ones
|
||||
self-clean on the next save, and a per-pad override would be a no-op since
|
||||
`configSave` rewrites all registered keys — see `RUMBLE-PLAN.md` item 3).
|
||||
Both the F10 overlay and the front options screen walk the shared `rows[]`
|
||||
(`frontoptions.c` via the `optionsRow*` accessors), so the row appears in
|
||||
both. A "row disabled when no pad is rumble-capable" state is NOT
|
||||
implemented — the overlay has no generic row-disabled mechanism; the row is
|
||||
inert (no-op) on unsupported/absent pads, and the disabled state is deferred
|
||||
with the per-pad tuning row (`QOL-INVENTORY.md`), which will need the same
|
||||
mechanism for deadzone/swap rows.
|
||||
|
||||
Reference in new issue
Block a user