CydandClaude Opus 5
61563c9efe
Replicates the RP412 cockpit line into BT411's own architecture -- porting the geometry and keeping our renderers, so BT_SHOT single-frame verification stays intact. MODE RESOLVER. Where the secondary displays go was decided in TWO places with duplicated precedence, and the boot banner read NEITHER -- it announced "per-display cockpit windows" for every glass boot, surround included. The split had also broken BT_COCKPIT=0: documented as the dock-bottom opt-out, the profile block converted it to BT_GLASS_PANELS=1, so the docked strip was UNREACHABLE under the glass profile. One resolver now, consumed by the banner, the pad-panel decision and the window sizing; BT_GLASS_PANELS is explicit-only; dock/window modes auto-raise BT_PAD_PANEL so the button field always has a home. L4RIOBANK -- one button geometry. Both renderers carried their own copy and had drifted: an MFD button was 156x138 reaching under the glass in the exploded window and a 76x24 sliver entirely OUTSIDE the glass in the surround. One module owns it now, both are consumers, placement stays per-renderer. The pod's under-glass rule (RP412 L4MFDVIEW): reach half the glass in behind the display, leave a lamp strip clearing the edge, paint buttons first and imagery over -- so the lamp reads as a bar and practically the whole display is the press target. The strip scales off the display's SHORT axis (the map is portrait) with a readable floor. Retired L4GLASSWIN's three local placers and seven layout constants. LAMP FLASH DECODE was wrong [T1]. BTLampBrightnessOf returned max(state1, state2) and blanked on the alternate phase; RIO::LampState (L4RIO.h [T0]) says solid shows state 1 and flashing ALTERNATES the two. Agrees only when one state is Off -- true for the Panic lamp, which is why it survived -- but L4LAMP.cpp:252 commands flashFast + state1Dim + state2Bright, a dim->bright pulse that rendered as a hard bright->off blink. Three copies existed (l4vb16.h, L4GLASSWIN, L4PADPANEL), all three wrong; the two locals now forward to the one fixed inline. THE COCKPIT SCALES. The fixed canvas was stretched into whatever the client area was, so a window dragged to a different shape squashed the instruments (the projection was aspect-corrected in task #20; the panels never were). Now one uniform scale, centred, leftover black. D3D9 applies it as a Present destination rect, which DISCARD forbids -- so the WINDOWED swap effect becomes COPY when the surround is up and multisampling is off. The click mapping had to follow (mapping against the full client drifts the hit test off every button by the bar width), as did the world aspect (under a uniform scale it is the view rect's own). -fit / -windowed-fullscreen: borderless over the monitor. - ordering trap: the first WM_SIZE beats the device, so a -fit boot logged aspect=3.14 and applied it on frame 1. The letterbox INTENT is decided in btl4main; L4VIDEO only confirms or withdraws it. PLAYER-TUNABLE DISPLAYS. BT_MFD_SCALE (+ _UL/_UC/_UR/_LL/_LR), BT_RADAR_SCALE, BT_RADAR_POS (CENTER/LEFT/RIGHT/MIDLEFT/MIDRIGHT). The surround BANDS derive from the resolved sizes -- that is why the sizes could not stay constants: the band a display hangs in has to grow with it or the canvas clips it. 100% reproduces the historical L276 R276 T223 B336 exactly. A corner map goes flush to the CANVAS edge and the lower MFD slides beside it (measuring off the view edge overlapped them by 232px). MAP LEGEND GRID -- measured, not inherited. scratchpad/measurelegend.py over a native capture: top 3, cell 102, pitch 107 of 640. RP412's map is 13 + 6x102 @ 105 -- same cell height, different top and pitch, so its numbers do NOT transfer. Our old even division had the pitch right by luck and sat 3px high of the labels. environ.ini. It was read ~300 lines into WinMain, AFTER the platform-profile block had run its getenv()s -- so every setting the profile reads was silently ignored FROM THE FILE and only worked as a real env var. It also putenv()'d comments verbatim. Now loaded immediately after the first-breath line, comments skipped, the real environment WINS over the file, and a fully documented default is written on first run (the bindings.txt convention: untracked, so extract-over-top never clobbers a player's settings). VERIFICATION HARNESS (new, reusable): BT_RIOBANK_LOG=1 dumps every bank; checkbank.py proves no address is SHADOWED (an address whose rect is covered by earlier buttons is dead however big it looks -- the overlapping under-glass banks make that a live hazard); clickbank.py posts a real click at every button centre. Verified: 72/72 placed, 0 shadowed, 72/72 dispatched in BOTH modes, after a resize, at 150%/135%, and at 75%+BOTTOMRIGHT; wide/tall drags and -fit undistorted on a 3440x1440; exploded/dock/pod/dev un-regressed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
92 lines
3.2 KiB
Python
92 lines
3.2 KiB
Python
"""Measure the map's PAINTED legend grid, and compare the lamp bars against it.
|
|
|
|
The side button columns should line up with the legend cells the map imagery
|
|
paints beside them. RP412 measured ITS map at 13 + 6x102 on a 105 pitch of 640
|
|
-- a different game's art, so those numbers do not transfer. This finds ours.
|
|
|
|
Two scans over a native Secondary/Radar capture:
|
|
* the LEGEND: horizontal rules of the six bordered cells in the map imagery
|
|
* the LAMPS: the runs of the yellow button strip at the window's left edge
|
|
and reports the offset between them, which is what a misalignment looks like.
|
|
|
|
py measurelegend.py <capture.png> <caption_h> <lamp_x> <legend_x0> <legend_x1>
|
|
"""
|
|
import sys
|
|
from PIL import Image
|
|
|
|
|
|
def main():
|
|
path = sys.argv[1]
|
|
caption = int(sys.argv[2]) if len(sys.argv) > 2 else 30
|
|
lamp_x = int(sys.argv[3]) if len(sys.argv) > 3 else 12
|
|
lx0 = int(sys.argv[4]) if len(sys.argv) > 4 else 22
|
|
lx1 = int(sys.argv[5]) if len(sys.argv) > 5 else 118
|
|
|
|
image = Image.open(path).convert("RGB")
|
|
w, h = image.size
|
|
px = image.load()
|
|
print("capture %dx%d (client starts at y=%d)" % (w, h, caption))
|
|
|
|
# --- the legend: rows carrying a long horizontal ORANGE rule -------------
|
|
def orange(p):
|
|
return p[0] > 110 and p[1] > 45 and p[2] < 90 and p[0] > p[2] + 60
|
|
|
|
rules = []
|
|
for y in range(caption, h):
|
|
run = 0
|
|
best = 0
|
|
for x in range(lx0, min(lx1, w)):
|
|
if orange(px[x, y]):
|
|
run += 1
|
|
best = max(best, run)
|
|
else:
|
|
run = 0
|
|
if best >= (lx1 - lx0) * 0.55:
|
|
rules.append(y - caption)
|
|
|
|
# collapse adjacent rows into single rules
|
|
grouped = []
|
|
for y in rules:
|
|
if grouped and y - grouped[-1][-1] <= 2:
|
|
grouped[-1].append(y)
|
|
else:
|
|
grouped.append([y])
|
|
rule_tops = [g[0] for g in grouped]
|
|
print("\nlegend rules (client y): %s" % rule_tops)
|
|
if len(rule_tops) >= 2:
|
|
print("gaps: %s" % [rule_tops[i+1] - rule_tops[i]
|
|
for i in range(len(rule_tops) - 1)])
|
|
|
|
# --- the lamps: runs of lit pixels in the button strip -------------------
|
|
lit = []
|
|
for y in range(caption, h):
|
|
p = px[lamp_x, y]
|
|
lit.append(p[0] > 55 and p[1] > 40 and p[2] < 90)
|
|
runs = []
|
|
start = None
|
|
for i, on in enumerate(lit):
|
|
if on and start is None:
|
|
start = i
|
|
elif not on and start is not None:
|
|
if i - start >= 4:
|
|
runs.append((start, i - start))
|
|
start = None
|
|
if start is not None and len(lit) - start >= 4:
|
|
runs.append((start, len(lit) - start))
|
|
|
|
print("\nlamp bars (client y, height): %s" % runs)
|
|
if len(runs) >= 2:
|
|
print("lamp pitch: %s" % [runs[i+1][0] - runs[i][0]
|
|
for i in range(len(runs) - 1)])
|
|
|
|
# --- compare ------------------------------------------------------------
|
|
if rule_tops and runs:
|
|
print("\ncell top vs lamp top:")
|
|
for i, (top, height) in enumerate(runs[:len(rule_tops)]):
|
|
print(" lamp %d top=%4d nearest rule=%4d offset=%+d"
|
|
% (i, top, rule_tops[i], top - rule_tops[i]))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|