zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-04 10:44:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanin upo

Browse Source
This commit is contained in:
Zoe Roux
2021-07-03 18:07:16 +02:00
parent 2068240685
commit e1a6c8b9a9
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Debugger/CPU/CPUDebug.cpp
+6 -6
View File
@@ -316,12 +316,12 @@ namespace ComSquare::Debugger
std::string symbolPath = romPath.replace_extension(".sym"); std::string symbolPath = romPath.replace_extension(".sym");
std::ifstream sym(symbolPath); std::ifstream sym(symbolPath);
if (sym) { // if (sym) {
std::vector<Label> symLabels = WlaDx::parse(sym); // std::vector<Label> symLabels = WlaDx::parse(sym);
labels.insert(labels.end(), // labels.insert(labels.end(),
std::make_move_iterator(symLabels.begin()), // std::make_move_iterator(symLabels.begin()),
std::make_move_iterator(symLabels.end())); // std::make_move_iterator(symLabels.end()));
} // }
return labels; return labels;
} }
} }
sources/PPU/PPU.cpp
+12 -17
View File
@@ -123,18 +123,12 @@ namespace ComSquare::PPU
case PpuRegisters::bg2sc: case PpuRegisters::bg2sc:
case PpuRegisters::bg3sc: case PpuRegisters::bg3sc:
case PpuRegisters::bg4sc: case PpuRegisters::bg4sc:
this->_registers._bgsc[addr - PpuRegisters::bg1sc].raw = data; this->_registers._bgsc[addr - 0x07].raw = data;
// update background tilemap address // update background tilemap address
this->_backgrounds[addr - PpuRegisters::bg1sc].setTileMapStartAddress( this->_backgrounds[addr - 0x07].setTileMapStartAddress(this->getTileMapStartAddress(addr - 0x07 + 1));
this->getTileMapStartAddress(addr - PpuRegisters::bg1sc + 1)); this->_backgrounds[addr - 0x07 + 1].setTileMapStartAddress(this->getTileMapStartAddress(addr - 0x07 + 1));
this->_backgrounds[addr - PpuRegisters::bg1sc + 1].setTileMapStartAddress( this->_backgrounds[addr - 0x07].setTilemaps({this->_registers._bgsc[addr - 0x07].tilemapHorizontalMirroring, this->_registers._bgsc[addr - 0x07].tilemapVerticalMirroring});
this->getTileMapStartAddress(addr - PpuRegisters::bg1sc + 1)); this->_backgrounds[addr - 0x07 + 1].setTilemaps({this->_registers._bgsc[addr - 0x07].tilemapHorizontalMirroring, this->_registers._bgsc[addr - 0x07].tilemapVerticalMirroring});
this->_backgrounds[addr - PpuRegisters::bg1sc].setTilemaps(
{static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapHorizontalMirroring),
static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapVerticalMirroring)});
this->_backgrounds[addr - PpuRegisters::bg1sc + 1].setTilemaps(
{static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapHorizontalMirroring),
static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapVerticalMirroring)});
break; break;
case PpuRegisters::bg12nba: case PpuRegisters::bg12nba:
case PpuRegisters::bg34nba: case PpuRegisters::bg34nba:
@@ -309,6 +303,7 @@ namespace ComSquare::PPU
{ {
(void)cycles; (void)cycles;
this->renderMainAndSubScreen(); this->renderMainAndSubScreen();
this->add_buffer(this->_screen, this->_subScreen); this->add_buffer(this->_screen, this->_subScreen);
this->add_buffer(this->_screen, this->_mainScreen); this->add_buffer(this->_screen, this->_mainScreen);
@@ -540,12 +535,12 @@ namespace ComSquare::PPU
return baseAddress; return baseAddress;
} }
Vector2<bool> PPU::getBackgroundMirroring(int bgNumber) const Vector2<int> PPU::getBackgroundSize(int bgNumber) const
{ {
Vector2<bool> backgroundSize(false, false); Vector2<int> backgroundSize(0,0);
backgroundSize.y = this->_registers._bgsc[bgNumber - 1].tilemapVerticalMirroring; backgroundSize.y = (this->_registers._bgsc[bgNumber - 1].tilemapVerticalMirroring) ? 2 : 1;
backgroundSize.x = this->_registers._bgsc[bgNumber - 1].tilemapHorizontalMirroring; backgroundSize.x = (this->_registers._bgsc[bgNumber - 1].tilemapHorizontalMirroring) ? 2 : 1;
return backgroundSize; return backgroundSize;
} }
@@ -553,9 +548,9 @@ namespace ComSquare::PPU
{ {
uint16_t colorPalette; uint16_t colorPalette;
// should only render backgrounds needed (depending of th bgMode) // should only render backgrounds needed (depending of th bgMode)
int i = 0; //int i = 0;
for (auto &_background : this->_backgrounds) { for (auto &_background : this->_backgrounds) {
i++; //i++;
_background.renderBackground(); _background.renderBackground();
} }
// TODO make a function getDefaultBgColor // TODO make a function getDefaultBgColor