@tmustier/pi-nes 0.2.12 → 0.2.14

package/extensions/nes/index.ts

@@ -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/native/nes-core/vendor/nes_rust/src/mapper.rs

@@ -118,14 +118,14 @@ impl Mapper for MMC1Mapper {
 	fn map(&self, address: u32) -> u32 {
 		let bank: u32;
 		let mut offset = address & 0x3FFF;
-		let bank_num = self.prg_bank_register.load() as u32 & 0x0F;
+		let bank_num = self.prg_bank_register.load() as u32 & 0x1F;
 
 		match self.control_register.load_bits(2, 2) {
 			0 | 1 => {
 				// switch 32KB at 0x8000, ignoring low bit of bank number
 				// TODO: Fix me
 				offset = offset | (address & 0x4000);
-				bank = bank_num & 0x0E;
+				bank = bank_num & 0x1E;
 			},
 			2 => {
 				// fix first bank at 0x8000 and switch 16KB bank at 0xC000

package/extensions/nes/native/nes-core/vendor/nes_rust/src/ppu.rs

@@ -1365,14 +1365,18 @@ impl Sprite {
 	}
 
 	fn on(&self, y: u8, height: u8) -> bool {
-		(y >= self.get_y()) && (y < self.get_y() + height)
+		let sprite_y = self.get_y() as u16 + 1;
+		let y = y as u16;
+		y >= sprite_y && y < sprite_y + height as u16
 	}
 
 	fn get_y_in_sprite(&self, y: u8, height: u8) -> u8 {
 		// Assumes self.on(y, height) is true
+		let sprite_y = self.get_y() as u16 + 1;
+		let delta = (y as u16 - sprite_y) as u8;
 		match self.vertical_flip() {
-			true => height - 1 - (y - self.get_y()),
-			false => y - self.get_y()
+			true => height - 1 - delta,
+			false => delta
 		}
 	}
 }

package/extensions/nes/native/nes-core/vendor/nes_rust/src/rom.rs

@@ -20,9 +20,15 @@ impl Rom {
 	pub fn new(data: Vec<u8>) -> Self {
 		let header = RomHeader::new(data[0..HEADER_SIZE].to_vec());
 		let mapper = MapperFactory::create(&header);
+		let data_start = HEADER_SIZE + if header.has_trainer() { 512 } else { 0 };
+		let rom_data = if data.len() > data_start {
+			data[data_start..].to_vec()
+		} else {
+			Vec::new()
+		};
 		Rom {
 			header: header,
-			memory: Memory::new(data[HEADER_SIZE..].to_vec()),
+			memory: Memory::new(rom_data),
 			mapper: mapper
 		}
 	}
@@ -180,8 +186,8 @@ impl RomHeader {
 		self.extract_bits(self.control_byte1(), 1, 1) == 1
 	}
 
-	fn _trainer_512_bytes(&self) -> u8 {
-		self.extract_bits(self.control_byte1(), 2, 1)
+	pub fn has_trainer(&self) -> bool {
+		self.extract_bits(self.control_byte1(), 2, 1) == 1
 	}
 
 	fn four_screen_mirroring(&self) -> bool {

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.12",
+  "version": "0.2.14",
   "description": "NES emulator extension for pi",
   "keywords": [
     "pi-package",