zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-02 18:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

flipped tile seems to work now but need to check on it later

Browse Source
This commit is contained in:
Clément Le Bihan
2021-06-09 10:36:53 +02:00
parent 17607d6fcb
commit 3b072dea56
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/PPU/Background.cpp
+3 -23
View File
@@ -55,10 +55,6 @@ namespace ComSquare::PPU
{
uint16_t graphicAddress;
union TileMapData tileData;
std::vector<uint16_t> palette;
int index = 0;
uint8_t reference = 0;
uint32_t color = 0;
tileData.raw = data;
@@ -76,10 +72,11 @@ namespace ComSquare::PPU
}
}
// todo check why i need to invert vertical and horizontal flips
if (tileData.verticalFlip)
VFlipArray(this->tileBuffer);
HFlipArray(this->tileBuffer, {this->_characterNbPixels.x, this->_characterNbPixels.y});
if (tileData.horizontalFlip)
HFlipArray(this->tileBuffer);
VFlipArray(this->tileBuffer, {this->_characterNbPixels.x, this->_characterNbPixels.y});
for (int i = 0; i < this->_characterNbPixels.y; i++) {
for (int j = 0; j < this->_characterNbPixels.x; j++) {
this->buffer[pos.x][pos.y] = this->tileBuffer[i][j];
@@ -88,23 +85,6 @@ namespace ComSquare::PPU
pos.x -= this->_characterNbPixels.x;
pos.y++;
}
/*for (int i = 0; i < this->_characterNbPixels.y; i++) {
index = i * this->_characterNbPixels.x;
if (tileData.verticalFlip)
index = (this->_characterNbPixels.y - 1 - i) * this->_characterNbPixels.x;
if (tileData.horizontalFlip)
index += this->_characterNbPixels.x - 1;
for (int j = 0; j < this->_characterNbPixels.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 += (tileData.horizontalFlip) ? -1 : 1;
pos.x++;
}
pos.x -= this->_characterNbPixels.x;
pos.y++;
}*/
}
std::vector<uint16_t> Background::getPalette(int nbPalette)
sources/PPU/PPUUtils.hpp
+9 -5
View File
@@ -55,17 +55,21 @@ namespace ComSquare::PPU
}
template <std::size_t SRC_SIZE_Y, std::size_t SRC_SIZE_X>
void VFlipArray(std::array<std::array<uint32_t, SRC_SIZE_X>, SRC_SIZE_Y> &array)
void VFlipArray(std::array<std::array<uint32_t, SRC_SIZE_X>, SRC_SIZE_Y> &array,
const Vector2<int> &size,
const Vector2<int> &offset = {0, 0})
{
for (auto &row : array) {
std::reverse(row.begin(), row.end());
for (int i = offset.y; i < offset.y + size.y; i++) {
std::reverse(array[i].begin() + offset.x, array[i].begin() + offset.x + size.x);
}
}
template <std::size_t SRC_SIZE_Y, std::size_t SRC_SIZE_X>
void HFlipArray(std::array<std::array<uint32_t, SRC_SIZE_X>, SRC_SIZE_Y> &array)
void HFlipArray(std::array<std::array<uint32_t, SRC_SIZE_X>, SRC_SIZE_Y> &array,
const Vector2<int> &size,
const Vector2<int> &offset = {0, 0})
{
std::reverse(array.begin(), array.end());
std::reverse(array.begin() + offset.x, array.begin() + offset.x + size.x);
}
}