Candy/SwiftNES
1
0
Fork 0
mirror of https://github.com/Candygoblen123/SwiftNES.git synced 2024-11-21 17:46:23 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

PPU: Impl color palettes

Browse Source
This commit is contained in:
Andrew Glaze 2024-08-21 10:13:15 -04:00
parent f9efe23b0b
commit ddd8fd6ee6
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/CPU/CPU.swift
View File

@ -151,7 +151,7 @@ class CPU {
//} //}
func run() { func run() {
run(onCycle: { print(dumpCpuState(self)) }, onComplete: {}) run(onCycle: {}, onComplete: {})
} }
func run(onCycle: @escaping () -> (), onComplete: @escaping () -> ()) { func run(onCycle: @escaping () -> (), onComplete: @escaping () -> ()) {

39
Sources/Render/Render.swift
View File

@ -2,36 +2,57 @@ class Render {
static func render(_ ppu: NesPPU, frame: Frame) { static func render(_ ppu: NesPPU, frame: Frame) {
let bank = ppu.ctrl.backgroundPatternAddr() let bank = ppu.ctrl.backgroundPatternAddr()
for i in 0..<0x03c0 { // For now, just use first nametable for i in 0..<0x03c0 { // FIXME: For now, just use first nametable
let tileAddr = UInt16(ppu.vram[i]) let tileAddr = UInt16(ppu.vram[i])
//print(ppu.vram) //print(ppu.vram)
let tileX = i % 32 let tileLoc = (col: i % 32, row: i / 32)
let tileY = i / 32
let tile = ppu.chrRom[(bank + Int(tileAddr) * 16)...(bank + Int(tileAddr) * 16 + 15)] let tile = ppu.chrRom[(bank + Int(tileAddr) * 16)...(bank + Int(tileAddr) * 16 + 15)]
let palette = getBgPallete(ppu, tileLoc: tileLoc)
for y in 0...7 { for y in 0...7 {
var upper = tile[tile.startIndex + y] var upper = tile[tile.startIndex + y]
var lower = tile[tile.startIndex + y + 8] var lower = tile[tile.startIndex + y + 8]
for x in (0...7).reversed() { for x in (0...7).reversed() {
let value = (1 & upper) << 1 | (1 & lower) let value = (1 & lower) << 1 | (1 & upper)
upper = upper >> 1 upper = upper >> 1
lower = lower >> 1 lower = lower >> 1
let rgb = switch value { let rgb = switch value {
case 0: case 0:
NESColor.SYSTEM_PALLETE[0x01] NESColor.SYSTEM_PALLETE[Int(ppu.paletteTable[0])]
case 1: case 1:
NESColor.SYSTEM_PALLETE[0x23] NESColor.SYSTEM_PALLETE[Int(palette[1])]
case 2: case 2:
NESColor.SYSTEM_PALLETE[0x28] NESColor.SYSTEM_PALLETE[Int(palette[2])]
case 3: case 3:
NESColor.SYSTEM_PALLETE[0x31] NESColor.SYSTEM_PALLETE[Int(palette[3])]
default: default:
fatalError("Invalid Pallete Color type") fatalError("Invalid Pallete Color type")
} }
frame.setPixel((tileX * 8 + x, tileY * 8 + y), rgb) frame.setPixel((tileLoc.col * 8 + x, tileLoc.row * 8 + y), rgb)
} }
} }
} }
} }
static func getBgPallete(_ ppu: NesPPU, tileLoc: (col: Int, row: Int)) -> [UInt8] {
let attrTableIndex = tileLoc.row / 4 * 8 + tileLoc.col / 4
let attrByte = ppu.vram[0x3c0 + attrTableIndex] // FIXME: still using hardcoded first nametable
let palleteIndex = switch (tileLoc.col % 4 / 2, tileLoc.row % 4 / 2) {
case (0,0):
attrByte & 0b11
case (1,0):
(attrByte >> 2) & 0b11
case (0,1):
(attrByte >> 4) & 0b11
case (1,1):
(attrByte >> 6) & 0b11
default:
fatalError("Invalid titleLoc. This should never happen!")
}
let palleteStartIndex = 1 + Int(palleteIndex) * 4
return [ppu.paletteTable[0], ppu.paletteTable[palleteStartIndex], ppu.paletteTable[palleteStartIndex + 1], ppu.paletteTable[palleteStartIndex + 2]]
}
} }