mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-02-24 15:12:23 +01:00
3d3ac8c1db
byuu says: Changelog: - WS: fixed lods, scas instructions - WS: implemented missing GRP4 instructions - WS: fixed transparency for screen one - WSC: added color-mode PPU rendering - WS+WSC: added packed pixel mode support - WS+WSC: added dummy sound register reads/writes - SFC: added threading to SuperDisc (it's hanging for right now; need to clear IRQ on $21e2 writes) SuperDisc Timer and Sound Check were failing before due to not turning off IRQs on $21e4 clear, so I'm happy that's fixed now. Riviera starts now, and displays the first intro screen before crashing. Huge, huge amounts of corrupted graphics, though. This game's really making me work for it :( No color games seem fully playable yet, but a lot of monochrome and color games are now at least showing more intro screen graphics before dying. This build defaults to horizontal orientation, but I left the inputs bound to vertical orientation. Whoops. I still need to implement a screen flip key binding.
106 lines
3.9 KiB
C++
106 lines
3.9 KiB
C++
auto PPU::renderMonoFetch(uint14 offset, uint3 y, uint3 x) -> uint2 {
|
|
uint2 color;
|
|
|
|
if(system.planar()) {
|
|
uint16 data = iram.read(offset + (y << 1), Word);
|
|
color |= data.bit( 7 - x) << 0;
|
|
color |= data.bit(15 - x) << 1;
|
|
}
|
|
|
|
if(system.packed()) {
|
|
uint8 data = iram.read(offset + (y << 1) + (x >> 2));
|
|
color = data >> (6 - (x.bits(0,1) << 1));
|
|
}
|
|
|
|
return color;
|
|
}
|
|
|
|
auto PPU::renderMonoBack() -> void {
|
|
uint4 poolColor = 15 - r.pool[r.backColor.bits(0,2)];
|
|
pixel = {Pixel::Source::Back, poolColor << 0 | poolColor << 4 | poolColor << 8};
|
|
}
|
|
|
|
auto PPU::renderMonoScreenOne() -> void {
|
|
if(!r.screenOneEnable) return;
|
|
|
|
uint8 scrollY = status.vclk + r.scrollOneY;
|
|
uint8 scrollX = status.hclk + r.scrollOneX;
|
|
|
|
uint14 tilemapOffset = r.screenOneMapBase << 11;
|
|
tilemapOffset += (scrollY >> 3) << 6;
|
|
tilemapOffset += (scrollX >> 3) << 1;
|
|
|
|
uint16 tile = iram.read(tilemapOffset, Word);
|
|
uint14 tileOffset = 0x2000 + (tile.bits(0,8) << 4);
|
|
uint3 tileY = (scrollY & 7) ^ (tile.bit(15) ? 7 : 0);
|
|
uint3 tileX = (scrollX & 7) ^ (tile.bit(14) ? 7 : 0);
|
|
uint2 tileColor = renderMonoFetch(tileOffset, tileY, tileX);
|
|
if(tile.bit(11) && tileColor == 0) return;
|
|
|
|
uint3 paletteColor = r.palette[tile.bits(9,12)].color[tileColor];
|
|
uint4 poolColor = 15 - r.pool[paletteColor];
|
|
pixel = {Pixel::Source::ScreenOne, poolColor << 0 | poolColor << 4 | poolColor << 8};
|
|
}
|
|
|
|
auto PPU::renderMonoScreenTwo() -> void {
|
|
if(!r.screenTwoEnable) return;
|
|
|
|
bool windowInside = status.vclk >= r.screenTwoWindowY0 && status.vclk <= r.screenTwoWindowY1
|
|
&& status.hclk >= r.screenTwoWindowX0 && status.hclk <= r.screenTwoWindowX1;
|
|
windowInside ^= r.screenTwoWindowInvert;
|
|
if(r.screenTwoWindowEnable && !windowInside) return;
|
|
|
|
uint8 scrollX = status.hclk + r.scrollTwoX;
|
|
uint8 scrollY = status.vclk + r.scrollTwoY;
|
|
|
|
uint14 tilemapOffset = r.screenTwoMapBase << 11;
|
|
tilemapOffset += (scrollY >> 3) << 6;
|
|
tilemapOffset += (scrollX >> 3) << 1;
|
|
|
|
uint16 tile = iram.read(tilemapOffset, Word);
|
|
uint14 tileOffset = 0x2000 + (tile.bits(0,8) << 4);
|
|
uint3 tileY = (scrollY & 7) ^ (tile.bit(15) ? 7 : 0);
|
|
uint3 tileX = (scrollX & 7) ^ (tile.bit(14) ? 7 : 0);
|
|
uint2 tileColor = renderMonoFetch(tileOffset, tileY, tileX);
|
|
if(tile.bit(11) && tileColor == 0) return;
|
|
|
|
uint3 paletteColor = r.palette[tile.bits(9,12)].color[tileColor];
|
|
uint4 poolColor = 15 - r.pool[paletteColor];
|
|
pixel = {Pixel::Source::ScreenTwo, poolColor << 0 | poolColor << 4 | poolColor << 8};
|
|
}
|
|
|
|
auto PPU::renderMonoSprite() -> void {
|
|
if(!r.spriteEnable) return;
|
|
|
|
bool windowInside = status.vclk >= r.spriteWindowY0 && status.vclk <= r.spriteWindowY1
|
|
&& status.hclk >= r.spriteWindowX0 && status.hclk <= r.spriteWindowX1;
|
|
uint14 spriteBase = r.spriteBase << 9;
|
|
|
|
uint7 spriteIndex = r.spriteFirst;
|
|
uint8 spriteCount = min(128, (uint)r.spriteCount);
|
|
while(spriteCount--) {
|
|
uint32 sprite = iram.read(spriteBase + (spriteIndex++ << 2), Long);
|
|
if(r.spriteWindowEnable && sprite.bit(12) && !windowInside) continue;
|
|
|
|
uint8 spriteY = sprite.bits(16,23);
|
|
uint8 spriteX = sprite.bits(24,31);
|
|
|
|
if(status.vclk < spriteY) continue;
|
|
if(status.vclk > (uint8)(spriteY + 7)) continue;
|
|
if(status.hclk < spriteX) continue;
|
|
if(status.hclk > (uint8)(spriteX + 7)) continue;
|
|
|
|
uint14 tileOffset = 0x2000 + (sprite.bits(0,8) << 4);
|
|
uint3 tileY = (uint8)(status.vclk - spriteY) ^ (sprite.bit(15) ? 7 : 0);
|
|
uint3 tileX = (uint8)(status.hclk - spriteX) ^ (sprite.bit(14) ? 7 : 0);
|
|
uint2 tileColor = renderMonoFetch(tileOffset, tileY, tileX);
|
|
if(sprite.bit(11) && tileColor == 0) continue;
|
|
if(!sprite.bit(13) && pixel.source == Pixel::Source::ScreenTwo) continue;
|
|
|
|
uint3 paletteColor = r.palette[8 + sprite.bits(9,11)].color[tileColor];
|
|
uint4 poolColor = 15 - r.pool[paletteColor];
|
|
pixel = {Pixel::Source::Sprite, poolColor << 0 | poolColor << 4 | poolColor << 8};
|
|
return;
|
|
}
|
|
}
|