zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2025-12-20 14:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cgram colors fixed now got the right color, and the brightness is now effective

Browse Source
This commit is contained in:
Clément Le Bihan
2020-03-26 18:00:17 +01:00
parent 6cf44c8fa3
commit 71f1d8f12d
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/PPU/PPU.cpp
View File

@@ -227,27 +227,22 @@ namespace ComSquare::PPU
uint8_t red; uint8_t red;
uint8_t green; uint8_t green;
uint8_t blue; uint8_t blue;
uint32_t pixelTmp = 0x000000FF; uint32_t pixelTmp = 0x0;
//std::cout << "update" << std::endl;
if (!this->_registers._inidisp.fblank) { if (!this->_registers._inidisp.fblank) {
for (int y = 0; y <= 255; y++) { for (int y = 0; y <= 255; y++) {
tmp = this->_cgram.read(y); tmp = this->_cgram.read(y);
//std::cout << "tmp " << std::bitset<16>(tmp) << std::endl;
blue = (tmp & 0x7D00U) >> 10U; blue = (tmp & 0x7D00U) >> 10U;
green = (tmp & 0x03E0U) >> 5U; green = (tmp & 0x03E0U) >> 5U;
red = (tmp & 0x001FU); red = (tmp & 0x001FU);
//std::cout << "red " << std::bitset<8>(red) << std::endl; pixelTmp = this->_registers._inidisp.brightness * 255U / 15U;
//std::cout << "green " << std::bitset<8>(green) << std::endl; pixelTmp += (red * 255U / 31U) << 24U;
//std::cout << "blue " << std::bitset<8>(blue) << std::endl; pixelTmp += (green * 255U / 31U) << 16U;
pixelTmp += (red * 256U / 32U) << 24U; pixelTmp += (blue * 255U / 31U) << 8U;
pixelTmp += (green * 256U / 32U) << 16U;
pixelTmp += (blue * 256U / 32U) << 8U;
//std::cout << "value of pixel " << std::hex << pixelTmp << " pour inc " << std::dec << y << std::endl;
for (int x = 0; x < 100; x++) for (int x = 0; x < 100; x++)
this->_renderer.putPixel(x, y, pixelTmp); this->_renderer.putPixel(x, y, pixelTmp);
pixelTmp = 0xFF;
} }
} }
this->_renderer.drawScreen(); this->_renderer.drawScreen();
@@ -390,7 +385,7 @@ namespace ComSquare::PPU
case ppuRegisters::stat78: case ppuRegisters::stat78:
return "STAT78"; return "STAT78";
default: default:
return "PPU : Unknown register"; return "PPU : ???";
} }
} }