@tmustier/pi-nes 0.2.11 → 0.2.13

package/README.md

@@ -83,8 +83,8 @@ Config is stored at `~/.pi/nes/config.json`. Use `/nes config` for quick setup.
 | `romDir` | `/roms/nes` | Where to look for ROM files |
 | `saveDir` | `/roms/nes/saves` | Where to store battery saves (defaults to `<romDir>/saves`) |
 | `renderer` | `"image"` | `"image"` (Kitty graphics) or `"text"` (ANSI) |
-| `imageQuality` | `"balanced"` | `"balanced"` (30 fps, max pixel scale 1.0) or `"high"` (60 fps, max pixel scale 1.5) |
-| `pixelScale` | `1.0` | Display scale (0.5–1.0 balanced, 0.5–1.5 high) |
+| `imageQuality` | `"balanced"` | `"balanced"` (30 fps) or `"high"` (60 fps) |
+| `pixelScale` | `1.0` | Display scale (0.5–4.0) |
 
 ## Terminal Support
 

package/extensions/nes/config.ts

@@ -59,11 +59,7 @@ export function normalizeConfig(raw: unknown): NesConfig {
 			? normalizePath(parsed.saveDir, saveDirFallback)
 			: saveDirFallback;
 	const imageQuality = normalizeImageQuality(parsed.imageQuality);
-	const maxPixelScale = imageQuality === "high" ? 1.5 : 1.0;
-	const pixelScale =
-		typeof parsed.pixelScale === "number" && !Number.isNaN(parsed.pixelScale)
-			? normalizePixelScale(parsed.pixelScale, maxPixelScale)
-			: maxPixelScale;
+	const pixelScale = normalizePixelScale(parsed.pixelScale);
 	return {
 		romDir,
 		saveDir,
@@ -115,8 +111,11 @@ async function ensureDirectory(dirPath: string): Promise<void> {
 	}
 }
 
-function normalizePixelScale(raw: number, maxPixelScale: number): number {
-	return Math.min(maxPixelScale, Math.max(0.5, raw));
+function normalizePixelScale(raw: unknown): number {
+	if (typeof raw !== "number" || Number.isNaN(raw)) {
+		return DEFAULT_CONFIG.pixelScale;
+	}
+	return Math.min(4, Math.max(0.5, raw));
 }
 
 function normalizeImageQuality(raw: unknown): ImageQuality {

package/extensions/nes/index.ts

@@ -176,8 +176,8 @@ async function configureWithWizard(
 	}
 
 	const qualityChoice = await ctx.ui.select("Quality", [
-		"Balanced (recommended) — 30 fps, max pixel scale 1.0",
-		"High — 60 fps, max pixel scale 1.5",
+		"Balanced (recommended) — 30 fps",
+		"High — 60 fps",
 	]);
 	if (!qualityChoice) {
 		return false;
@@ -185,7 +185,7 @@ async function configureWithWizard(
 
 	const isHighQuality = qualityChoice.startsWith("High");
 	const imageQuality = isHighQuality ? "high" : "balanced";
-	const pixelScale = isHighQuality ? 1.5 : 1.0;
+	const pixelScale = config.pixelScale;
 
 	const defaultSaveDir = getDefaultSaveDir(config.romDir);
 	const shouldSyncSaveDir = config.saveDir === defaultSaveDir;
@@ -289,18 +289,16 @@ async function attachSession(
 ): Promise<boolean> {
 	let shouldStop = false;
 	try {
-		const useOverlay = config.renderer !== "image";
-		const overlayOptions = useOverlay
-			? {
-					overlay: true,
-					overlayOptions: {
-						width: "85%",
-						maxHeight: "90%",
-						anchor: "center",
-						margin: { top: 1 },
-					},
-				}
-			: undefined;
+		const isImageRenderer = config.renderer === "image";
+		const overlayOptions = {
+			overlay: true,
+			overlayOptions: {
+				width: isImageRenderer ? "90%" : "85%",
+				maxHeight: "90%",
+				anchor: "center",
+				margin: { top: 1 },
+			},
+		};
 
 		const renderIntervalMs = config.renderer === "image"
 			? config.imageQuality === "high"
@@ -323,6 +321,7 @@ async function attachSession(
 					config.keybindings,
 					config.renderer,
 					config.pixelScale,
+					isImageRenderer,
 					debug,
 					() => session.getStats(),
 					"native",

package/extensions/nes/nes-component.ts

@@ -84,6 +84,7 @@ export class NesOverlayComponent implements Component {
 	private readonly imageRenderer = new NesImageRenderer();
 	private readonly rendererMode: RendererMode;
 	private readonly pixelScale: number;
+	private readonly windowed: boolean;
 	private readonly debug: boolean;
 	private readonly statsProvider?: () => NesSessionStats;
 	private readonly debugLabel?: string;
@@ -97,6 +98,7 @@ export class NesOverlayComponent implements Component {
 		inputMapping: InputMapping = DEFAULT_INPUT_MAPPING,
 		rendererMode: RendererMode = "image",
 		pixelScale = 1,
+		windowed = false,
 		debug = false,
 		statsProvider?: () => NesSessionStats,
 		debugLabel?: string,
@@ -104,6 +106,7 @@ export class NesOverlayComponent implements Component {
 		this.inputMapping = inputMapping;
 		this.rendererMode = rendererMode;
 		this.pixelScale = pixelScale;
+		this.windowed = windowed;
 		this.debug = debug;
 		this.statsProvider = statsProvider;
 		this.debugLabel = debugLabel;
@@ -154,6 +157,7 @@ export class NesOverlayComponent implements Component {
 				width,
 				footerRows,
 				this.pixelScale,
+				!this.windowed,
 			);
 			if (debugLine) {
 				lines.push(truncateToWidth(debugLine, width));

package/extensions/nes/renderer.ts

@@ -68,17 +68,18 @@ export class NesImageRenderer {
 		widthCells: number,
 		footerRows = 1,
 		pixelScale = 1,
+		padToHeight = true,
 	): string[] {
 		const caps = getCapabilities();
 		if (caps.images === "kitty") {
-			const shared = this.renderKittySharedMemory(frameBuffer, tui, widthCells, footerRows, pixelScale);
+			const shared = this.renderKittySharedMemory(frameBuffer, tui, widthCells, footerRows, pixelScale, padToHeight);
 			if (shared) {
 				return shared;
 			}
-			return this.renderKittyRaw(frameBuffer, tui, widthCells, footerRows, pixelScale);
+			return this.renderKittyRaw(frameBuffer, tui, widthCells, footerRows, pixelScale, padToHeight);
 		}
 
-		return this.renderPng(frameBuffer, tui, widthCells, footerRows, pixelScale);
+		return this.renderPng(frameBuffer, tui, widthCells, footerRows, pixelScale, padToHeight);
 	}
 
 	dispose(tui: TUI): void {
@@ -121,6 +122,7 @@ export class NesImageRenderer {
 		widthCells: number,
 		footerRows: number,
 		pixelScale: number,
+		padToHeight: boolean,
 	): string[] | null {
 		const module = this.getSharedMemoryModule();
 		if (!module) {
@@ -155,7 +157,8 @@ export class NesImageRenderer {
 		const marker = `\x1b_pi:nes:${this.rawVersion}\x07`;
 		lines.push(`${moveUp}${sequence}${marker}`);
 
-		return centerLines(applyHorizontalPadding(lines, padLeft), availableRows);
+		const padded = applyHorizontalPadding(lines, padLeft);
+		return padToHeight ? centerLines(padded, availableRows) : padded;
 	}
 
 	private renderKittyRaw(
@@ -164,6 +167,7 @@ export class NesImageRenderer {
 		widthCells: number,
 		footerRows: number,
 		pixelScale: number,
+		padToHeight: boolean,
 	): string[] {
 		const layout = computeKittyLayout(tui, widthCells, footerRows, pixelScale);
 		const { availableRows, columns, rows, padLeft } = layout;
@@ -199,7 +203,8 @@ export class NesImageRenderer {
 		const marker = `\x1b_pi:nes:${this.rawVersion}\x07`;
 		lines.push(`${moveUp}${cached.sequence}${marker}`);
 
-		return centerLines(applyHorizontalPadding(lines, padLeft), availableRows);
+		const padded = applyHorizontalPadding(lines, padLeft);
+		return padToHeight ? centerLines(padded, availableRows) : padded;
 	}
 
 	private renderPng(
@@ -208,6 +213,7 @@ export class NesImageRenderer {
 		widthCells: number,
 		footerRows: number,
 		pixelScale: number,
+		padToHeight: boolean,
 	): string[] {
 		const layout = computePngLayout(tui, widthCells, footerRows, pixelScale);
 		const { availableRows, maxWidthCells, padLeft, targetHeight, targetWidth } = layout;
@@ -244,7 +250,8 @@ export class NesImageRenderer {
 			{ widthPx: this.cachedImage.width, heightPx: this.cachedImage.height },
 		);
 
-		return centerLines(applyHorizontalPadding(image.render(widthCells), padLeft), availableRows);
+		const padded = applyHorizontalPadding(image.render(widthCells), padLeft);
+		return padToHeight ? centerLines(padded, availableRows) : padded;
 	}
 
 	private fillRawBuffer(frameBuffer: FrameBuffer): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-nes",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "NES emulator extension for pi",
   "keywords": [
     "pi-package",

package/spec.md

@@ -70,7 +70,7 @@ pi-nes/
   - `saveDir`
   - `enableAudio`
   - `renderer` ("image" or "text")
-  - `imageQuality` ("balanced" or "high")
+  - `imageQuality` ("balanced" or "high", controls render fps)
   - `pixelScale` (float, e.g. 1.0)
   - `keybindings` (button-to-keys map, e.g. `{ "a": ["z"] }`)
 
@@ -89,6 +89,6 @@ Note: audio output is currently disabled; setting `enableAudio` will show a warn
 - Audio: disabled (no safe dependency selected).
 - Default ROM dir: `/roms/nes` (configurable).
 - Default core: `native`.
-- Default image quality: `balanced`.
+- Default image quality: `balanced` (30 fps).
 - Default pixel scale: `1.0`.
 - Default save dir: `/roms/nes/saves` (configurable).