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

refactoring started but rendering isn't working

Browse Source
This commit is contained in:
Clément Le Bihan
2020-10-02 23:27:59 +02:00
parent 1f852ba6fa
commit 85fe6cf0aa
2 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/PPU/Background.cpp
+43 -14
View File
@@ -62,10 +62,10 @@ namespace ComSquare::PPU
graphicAddress = this->_tileSetAddress + (tileData.posY * 16 * this->_bpp * 8) + (tileData.posX * this->_bpp * 8);
for (int i = 0; i < this->_characterSize.y; i++) {
for (int j = 0; j < this->_characterSize.x; j++) {
if (index == 14) {
/*if (index == 14) {
printf("cc");
}
reference = getPixelReferenceFromTileAddress(graphicAddress, index);
}*/
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;
@@ -103,34 +103,40 @@ namespace ComSquare::PPU
return palette;
}
uint8_t Background::getPixelReferenceFromTileAddress(uint16_t addr, uint8_t index)
uint8_t Background::getPixelReferenceFromTile(uint16_t tileAddress, uint8_t pixelIndex)
{
this->getCorrespondingBasicTileRowAndPixelIndex(&tileAddress, &pixelIndex);
return this->getPixelReferenceFromTileRow(tileAddress, pixelIndex);
}
uint8_t Background::getPixelReferenceFromTileRow(uint16_t tileAddress, uint8_t pixelIndex)
{
//line by line for each pixel of the line
uint8_t highByte;
uint8_t lowByte;
uint8_t secondHightByte;
uint8_t secondHighByte;
uint8_t secondLowByte;
uint8_t result = 0;
uint8_t shift;
uint8_t rowNumber = index / TILE_PIXEL_WIDTH;
uint8_t rowNumber = pixelIndex / TILE_PIXEL_WIDTH;
// C000
//gérer le character size mauvais pour le retour de ligne
index -= rowNumber * TILE_PIXEL_WIDTH; //get the index relative to the row
addr += rowNumber * TILE_PIXEL_WIDTH * this->_bpp; // get row address
//pixelIndex -= rowNumber * TILE_PIXEL_WIDTH; //get the index relative to the row
//tileAddress += rowNumber * TILE_PIXEL_WIDTH * this->_bpp; // get row address
highByte = this->_vram->read_internal(addr % VRAMSIZE);
lowByte = this->_vram->read_internal((addr + 1) % VRAMSIZE);
highByte = this->_vram->read_internal(tileAddress % VRAMSIZE);
lowByte = this->_vram->read_internal((tileAddress + 1) % VRAMSIZE);
shift = (TILE_PIXEL_WIDTH - 1U - index);
shift = (TILE_PIXEL_WIDTH - 1U - pixelIndex);
switch (this->_bpp) {
case 8:
return highByte;
case 4:
secondHightByte = this->_vram->read_internal((addr + 32) % VRAMSIZE);
secondLowByte = this->_vram->read_internal((addr + 33) % VRAMSIZE);
result = ((secondHightByte & (1U << shift)) | ((secondLowByte & (1U << shift)) << 1U)) >> (shift - 2U);
secondHighByte = this->_vram->read_internal((tileAddress + 32) % VRAMSIZE);
secondLowByte = this->_vram->read_internal((tileAddress + 33) % VRAMSIZE);
result = ((secondHighByte & (1U << shift)) | ((secondLowByte & (1U << shift)) << 1U)) >> (shift - 2U);
case 2:
result += ((highByte & (1U << shift)) | ((lowByte & (1U << shift)) << 1U)) >> shift;
default:
@@ -169,4 +175,27 @@ namespace ComSquare::PPU
{
this->_characterSize = size;
}
void Background::getCorrespondingBasicTileRowAndPixelIndex(uint16_t *tileAddress, uint8_t *pixelIndex)
{
uint16_t tmpTileAddress = *tileAddress;
uint16_t tmpPixelIndex = *pixelIndex;
uint8_t row = tmpPixelIndex / this->_characterSize.x;
uint8_t column = tmpPixelIndex / this->_characterSize.y;
if (row >= TILE_PIXEL_HEIGHT) {
tmpTileAddress += 0x80 * this->_bpp;
row -= TILE_PIXEL_HEIGHT;
}
if (column >= TILE_PIXEL_WIDTH) {
tmpTileAddress += 0x8 * this->_bpp;
column -= TILE_PIXEL_WIDTH;
}
// might not work with 8 bpp must check
tmpTileAddress += this->_bpp * row;
*tileAddress = tmpTileAddress;
*pixelIndex = tmpPixelIndex;
}
}
sources/PPU/Background.hpp
+4 -2
View File
@@ -39,9 +39,11 @@ namespace ComSquare::PPU
//! @brief Get a palette from the number of the palette (0 - 7)
std::vector<uint16_t> getPalette(int nbPalette);
//! @brief Get the color reference of a index pixel tile
//! @param addr The address of the line of pixel
//! @param tileAddress The address of the line of pixel
//TODO support addr as the address of the start of the tile and index goes from 0 to 63 regardless of the bpp
uint8_t getPixelReferenceFromTileAddress(uint16_t addr, uint8_t index);
uint8_t getPixelReferenceFromTileRow(uint16_t tileAddress, uint8_t pixelIndex);
uint8_t getPixelReferenceFromTile(uint16_t tileAddress, uint8_t pixelIndex);
void getCorrespondingBasicTileRowAndPixelIndex(uint16_t *tileAddress, uint8_t *pixelIndex);
//! @brief draw a tilemap 32x32 starting at baseAddress
void drawBasicTileMap(uint16_t baseAddress, Vector2<int> offset);
public: