zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-07 05:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding fixes to getPalette and creating a setter for backgrounds bpp (when bgmode is changed)

Browse Source
This commit is contained in:
Clément Le Bihan
2020-10-11 02:07:05 +02:00
parent 10cead862f
commit 1708e73619
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sources/PPU/Background.cpp
View File

@@ -54,9 +54,8 @@ namespace ComSquare::PPU
uint8_t reference = 0;
uint32_t color = 0;
//union isn't working as intended
tileData.raw = data;
palette = getPalettes(tileData.palette);
palette = getPalette(tileData.palette);
// X horizontal
// Y vertical
graphicAddress = this->_tilesetAddress + (tileData.posY * 16 * this->_bpp * 8) + (tileData.posX * this->_bpp * 8);
@@ -74,12 +73,12 @@ namespace ComSquare::PPU
}
}
std::vector<uint16_t> Background::getPalettes(int nbPalette)
std::vector<uint16_t> Background::getPalette(int nbPalette)
{
std::vector<uint16_t> palette(0xF);
uint16_t addr = nbPalette * 0x10;
std::vector<uint16_t> palette(0x10);
uint16_t addr = nbPalette * 0x20;
for (int i = 0; i < 0xF; i++) {
for (int i = 0; i < 0x10; i++) {
palette[i] = this->_cgram->read_internal(addr);
palette[i] += this->_cgram->read_internal(addr + 1) << 8U;
addr += 2;
@@ -119,8 +118,8 @@ namespace ComSquare::PPU
case 8:
return highByte;
case 4:
secondHighByte = this->_vram->read_internal((tileAddress + 32) % VRAMSIZE);
secondLowByte = this->_vram->read_internal((tileAddress + 33) % VRAMSIZE);
secondHighByte = this->_vram->read_internal((tileAddress + 16) % VRAMSIZE);
secondLowByte = this->_vram->read_internal((tileAddress + 17) % VRAMSIZE);
result = ((secondHighByte & (1U << shift)) | ((secondLowByte & (1U << shift)) << 1U)) >> (shift - 2U);
case 2:
result += ((highByte & (1U << shift)) | ((lowByte & (1U << shift)) << 1U)) >> shift;
@@ -165,4 +164,12 @@ namespace ComSquare::PPU
{
this->_characterSize = size;
}
void Background::setBpp(int bpp)
{
if (bpp == 2 || bpp == 4 || bpp == 8 || bpp == 7)
this->_bpp = bpp;
else
this->_bpp = 2;
}
}