romdevtools 0.23.0 → 0.24.0

package/src/playtest/playtest.js

@@ -231,6 +231,32 @@ const KEY_TO_LIBRETRO_BIT = {
   w: 11,                       // R shoulder
 };
 
+// C64-only keyboard fallback: PC key → the virtual C64 button name the host's
+// C64 layer maps to the key matrix (Space/Run-Stop/Return/F1-F7). Lets a human
+// with NO controller still reach the C64 keyboard keys games need to start.
+// (Arrows + Z give the joystick + Fire via KEY_TO_LIBRETRO_BIT above.)
+const C64_KEYBOARD_FALLBACK = {
+  f1: "c64_f1", f2: "c64_f3", f3: "c64_f5", f4: "c64_f7",  // F1-F4 → C64 F1/F3/F5/F7
+  space: "west",          // Space
+  return: "r2",           // Return (also START via the standard map — harmless)
+  escape: "l2",           // Run/Stop (note: ESC also closes — see handler order)
+};
+
+// Human-readable C64 controls (controller + keyboard), relayed to the user when
+// a C64 game is in the playtest window so they're not guessing.
+export const C64_BINDINGS_HELP = `C64 — a CONTROLLER alone is enough (no keyboard needed):
+  D-pad / Left stick   Joystick (port 2 by default)
+  Z / bottom face      Fire
+  X face / Space key   Space
+  L2                   Run/Stop
+  R2 / Enter           Return
+  Right stick  ↑/←/→/↓  F1 / F3 / F5 / F7   (the 1-player / start keys)
+  Top face             F1 (also)
+
+No controller? Keyboard fallback: Arrows = joystick, Z = Fire, F1-F4 = C64
+F1/F3/F5/F7, Space = Space, Enter = Return, ESC = Run/Stop (hold; ESC tapped
+also closes the window). Switch joystick port with input({op:'joyport'}).`;
+
 // Human-readable summary printed by --help and at playtest startup.
 export const KEYBOARD_BINDINGS_HELP = `Keyboard:
   Arrow keys           D-pad
@@ -578,6 +604,7 @@ export async function playtest(args) {
     // into its own port object; the agent's setInput is overwritten each
     // tick (matching prior behavior). Select+Start on any controller quits.
     let quit = false;
+    const isC64 = h.status?.platform === "c64";
     function readControllerInto(port, inst) {
       if (!inst) return;
       const btn = inst.buttons || {};
@@ -595,6 +622,18 @@ export async function playtest(args) {
       else if (lx < -STICK_DEADZONE) port.left = true;
       if (ly > STICK_DEADZONE) port.down = true;
       else if (ly < -STICK_DEADZONE) port.up = true;
+      // C64: the RIGHT stick selects the function keys (F1/F3/F5/F7) — the
+      // Batocera/RetroDeck convention so a controller alone reaches the keyboard
+      // keys C64 setup screens need. Emitted as virtual buttons the host's C64
+      // layer maps to the key matrix; harmless on other platforms (no mapping).
+      if (isC64) {
+        const rx = axes.rightStickX ?? 0;
+        const ry = axes.rightStickY ?? 0;
+        if (ry < -STICK_DEADZONE) port.c64_f1 = true;        // up    → F1
+        else if (ry > STICK_DEADZONE) port.c64_f7 = true;    // down  → F7
+        if (rx < -STICK_DEADZONE) port.c64_f3 = true;        // left  → F3
+        else if (rx > STICK_DEADZONE) port.c64_f5 = true;    // right → F5
+      }
     }
 
     const port0 = {};
@@ -619,6 +658,15 @@ export async function playtest(args) {
       for (const [keyName, bit] of Object.entries(KEY_TO_LIBRETRO_BIT)) {
         if (heldKeys.has(keyName)) port0[bitToName(bit)] = true;
       }
+      // C64 keyboard fallback (no controller / mixing): map PC keys to the C64
+      // KEYBOARD keys games need — the host's C64 layer routes these virtual
+      // button names to the key matrix. (Arrows + Z=Fire already give the
+      // joystick above.) The agent relays these to the human.
+      if (isC64) {
+        for (const [keyName, vbtn] of Object.entries(C64_KEYBOARD_FALLBACK)) {
+          if (heldKeys.has(keyName)) port0[vbtn] = true;
+        }
+      }
       const isRewinding = heldKeys.has("r") && rewindBuffer.length > 0;
       if (isRewinding) {
         // Restore the previous snapshot and run one frame to produce its visual.

package/examples/msx/catch_game/_verify.mjs

@@ -1,93 +0,0 @@
-import { readFileSync, writeFileSync } from "node:fs";
-import { buildForPlatform } from "/home/monteslu/code/cliemu/romdev/packages/romdev/src/toolchains/index.js";
-import { resolveCore } from "/home/monteslu/code/cliemu/romdev/packages/romdev/src/cores/registry.js";
-import { LibretroHost } from "/home/monteslu/code/cliemu/romdev/packages/romdev/src/host/LibretroHost.js";
-
-const LIBDIR = "/home/monteslu/code/cliemu/romdev/packages/romdev/src/platforms/msx/lib/c";
-const DIR = "/home/monteslu/code/cliemu/romdev/packages/romdev/examples/msx/catch_game";
-
-const SRC  = readFileSync(`${DIR}/main.c`, "utf8");
-const LIB  = readFileSync(`${LIBDIR}/msx_vdp.c`, "utf8");
-const CRT0 = readFileSync(`${LIBDIR}/msx_crt0.s`, "utf8");
-const HDR  = readFileSync(`${LIBDIR}/msx_hw.h`, "utf8");
-
-const PLATFORM = "msx";
-
-console.log("== building ==");
-const build = await buildForPlatform({
-  platform: PLATFORM,
-  sources: { "main.c": SRC, "msx_vdp.c": LIB, "msx_crt0.s": CRT0 },
-  includes: { "msx_hw.h": HDR },
-  crt0: ".module empty\n",
-  sourceName: "main.c",
-});
-
-if (!build.binary) {
-  console.log(build.log || build.stderr || JSON.stringify(build));
-  console.log("BUILD FAILED stage=", build.stage, "exit=", build.exitCode);
-  process.exit(1);
-}
-console.log("build OK, bytes=", build.binary.length);
-
-const c = resolveCore(PLATFORM);
-const h = new LibretroHost();
-await h.loadCore(c.jsPath, c.wasmPath);
-await h.loadMedia({ platform: PLATFORM, bytes: build.binary });
-
-// ---- honest pixel helpers over raw RGBA ----
-function nonBlackFraction(rgba) {
-  let nb = 0;
-  for (let i = 0; i < rgba.length; i += 4) {
-    if (rgba[i] > 16 || rgba[i + 1] > 16 || rgba[i + 2] > 16) nb++;
-  }
-  return nb / (rgba.length / 4);
-}
-// Find the brightest-pixel X centroid in a horizontal band of rows (the basket
-// rides near the bottom; the basket sprite is white). Returns -1 if no bright px.
-function brightCentroidX(frame, y0, y1) {
-  const { width, height, rgba } = frame;
-  let sx = 0, n = 0;
-  for (let y = y0; y < Math.min(y1, height); y++) {
-    for (let x = 0; x < width; x++) {
-      const i = (y * width + x) * 4;
-      // white basket: all channels high
-      if (rgba[i] > 180 && rgba[i + 1] > 180 && rgba[i + 2] > 180) { sx += x; n++; }
-    }
-  }
-  return n ? sx / n : -1;
-}
-
-// boot past the C-BIOS logo + a few game frames
-for (let i = 0; i < 320; i++) h.stepFrames(1);
-
-const sa = h.screenshotRgba();
-writeFileSync(`${DIR}/shot_before.png`, Buffer.from(h.screenshot().pngBase64, "base64"));
-// basket band: BASKET_Y=160 in a 192-tall internal buffer; band 150..180
-const fracA = nonBlackFraction(sa.rgba);
-const basketA = brightCentroidX(sa, Math.floor(sa.height * 0.78), Math.floor(sa.height * 0.95));
-console.log(`before: ${sa.width}x${sa.height} nonBlack=${(fracA*100).toFixed(2)}% basketX=${basketA.toFixed(1)}`);
-
-// Drive RIGHT for many frames
-for (let i = 0; i < 120; i++) { h.setInput({ ports: [{ right: true }] }); h.stepFrames(1); }
-const sb = h.screenshotRgba();
-writeFileSync(`${DIR}/shot_after_right.png`, Buffer.from(h.screenshot().pngBase64, "base64"));
-const basketB = brightCentroidX(sb, Math.floor(sb.height * 0.78), Math.floor(sb.height * 0.95));
-console.log(`after RIGHT: basketX=${basketB.toFixed(1)}`);
-
-// Drive LEFT for many frames
-for (let i = 0; i < 200; i++) { h.setInput({ ports: [{ left: true }] }); h.stepFrames(1); }
-const sc = h.screenshotRgba();
-writeFileSync(`${DIR}/shot_after_left.png`, Buffer.from(h.screenshot().pngBase64, "base64"));
-const basketC = brightCentroidX(sc, Math.floor(sc.height * 0.78), Math.floor(sc.height * 0.95));
-console.log(`after LEFT: basketX=${basketC.toFixed(1)}`);
-
-// ---- verdict ----
-const visible = fracA > 0.005;            // playfield is not black
-const movedRight = basketB > basketA + 5; // basket moved right with input
-const movedLeft  = basketC < basketB - 5; // basket moved back left
-console.log("VISIBLE:", visible, "MOVED_RIGHT:", movedRight, "MOVED_LEFT:", movedLeft);
-if (visible && movedRight && movedLeft) {
-  console.log("VERIFIED_OK");
-} else {
-  console.log("VERIFY_INCOMPLETE");
-}

package/examples/pce/catch_game/_verify.mjs

@@ -1,75 +0,0 @@
-import fs from "node:fs";
-import { buildForPlatform } from "/home/monteslu/code/cliemu/romdev/packages/romdev/src/toolchains/index.js";
-import { resolveCore } from "/home/monteslu/code/cliemu/romdev/packages/romdev/src/cores/registry.js";
-import { LibretroHost } from "/home/monteslu/code/cliemu/romdev/packages/romdev/src/host/LibretroHost.js";
-
-const LIB = "/home/monteslu/code/cliemu/romdev/packages/romdev/src/platforms/pce/lib/c";
-const DIR = "/home/monteslu/code/cliemu/romdev/packages/romdev/examples/pce/catch_game";
-
-const read = (p) => fs.readFileSync(p, "utf8");
-
-const sources = {
-  "main.c": read(DIR + "/main.c"),
-  "pce_video.c": read(LIB + "/pce_video.c"),
-  "pce_input.c": read(LIB + "/pce_input.c"),
-  "pce_sound.c": read(LIB + "/pce_sound.c"),
-};
-const headers = { "pce_hw.h": read(LIB + "/pce_hw.h") };
-
-console.log("Building catch_game...");
-const build = await buildForPlatform({
-  platform: "pce",
-  sources,
-  headers,
-  includes: headers,
-  sourceName: "main.c",
-});
-
-if (!build || !build.binary) {
-  console.log("BUILD FAILED");
-  console.log(JSON.stringify(build, null, 2));
-  process.exit(1);
-}
-console.log("BUILD OK, binary bytes =", build.binary.length);
-if (build.log) console.log("log tail:", String(build.log).slice(-400));
-
-const PLATFORM = "pce";
-const h = new LibretroHost();
-const c = resolveCore(PLATFORM);
-await h.loadCore(c.jsPath, c.wasmPath);
-await h.loadMedia({ platform: PLATFORM, bytes: build.binary });
-
-// boot
-for (let i = 0; i < 120; i++) h.stepFrames(1);
-
-function nonBlack(shot) {
-  const buf = Buffer.from(shot.pngBase64, "base64");
-  // crude: count distinct-ish bytes; rely on file size + later pixel scan
-  return buf.length;
-}
-
-// screenshot BEFORE input
-let shotA = h.screenshot();
-fs.writeFileSync(DIR + "/shot_before.png", Buffer.from(shotA.pngBase64, "base64"));
-console.log("before:", shotA.width, "x", shotA.height, "png bytes", nonBlack(shotA));
-
-// drive RIGHT for ~60 frames to move catcher and let fruit fall/catch
-for (let i = 0; i < 90; i++) {
-  h.setInput({ ports: [{ right: true }] });
-  h.stepFrames(1);
-}
-// then LEFT for a bit
-for (let i = 0; i < 60; i++) {
-  h.setInput({ ports: [{ left: true }] });
-  h.stepFrames(1);
-}
-
-let shotB = h.screenshot();
-fs.writeFileSync(DIR + "/shot_after.png", Buffer.from(shotB.pngBase64, "base64"));
-console.log("after:", shotB.width, "x", shotB.height, "png bytes", nonBlack(shotB));
-
-// pixel diff: decode both PNGs to raw via the host's framebuffer if available
-const same = shotA.pngBase64 === shotB.pngBase64;
-console.log("identical PNG?", same);
-
-console.log("done — see shot_before.png / shot_after.png");