zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-25 23:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

flipping horizontal and/or vertical bg tiles are now handled and rm a useless ternary

Browse Source
This commit is contained in:
Clément Le Bihan
2020-10-15 22:24:11 +02:00
parent 44ec270c56
commit 484d332b05
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/PPU/Background.cpp
+7 -4
View File
@@ -61,12 +61,17 @@ namespace ComSquare::PPU
// Y vertical
graphicAddress = this->_tilesetAddress + (tileData.posY * 16 * this->_bpp * 8) + (tileData.posX * this->_bpp * 8);
for (int i = 0; i < this->_characterSize.y; i++) {
index = i * this->_characterSize.x;
if (tileData.verticalFlip)
index = (this->_characterSize.y - 1 - i) * this->_characterSize.x;
if (tileData.horizontalFlip)
index += this->_characterSize.x - 1;
for (int j = 0; j < this->_characterSize.x; j++) {
reference = getPixelReferenceFromTile(graphicAddress, index);
color = getRealColor(palette[reference]);
if (tileData.tilePriority == this->priority) // reference 0 is considered as transparency
this->buffer[pos.x][pos.y] = (reference) ? color : 0;
index++;
index += (tileData.horizontalFlip) ? -1 : 1;
pos.x++;
}
pos.x -= this->_characterSize.x;
@@ -115,7 +120,6 @@ namespace ComSquare::PPU
uint8_t secondLowByte;
uint16_t result = 0;
uint8_t shift = (TILE_PIXEL_WIDTH - 1U - pixelIndex);
uint16_t tmp;
switch (this->_bpp) {
case 8:
@@ -126,8 +130,7 @@ namespace ComSquare::PPU
result = ((secondHighByte & (1U << shift)) | ((secondLowByte & (1U << shift)) << 1U));
result = (shift - 2 >= 0) ? result >> (shift - 2) : result << ((shift - 2) * -1);
case 2:
tmp = ((highByte & (1U << shift)) | ((lowByte & (1U << shift)) << 1U));
result += (shift >= 0) ? tmp >> shift : tmp << shift;
result += ((highByte & (1U << shift)) | ((lowByte & (1U << shift)) << 1U)) >> shift;
default:
break;
}