6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-02-10 01:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Partial fix of a GB background optimisation problem.

Browse Source
This commit is contained in:
Adrian Conlon 2024-10-14 21:38:51 +01:00
parent e1a2eba8f9
commit 6e06ed95f0
3 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LR35902/inc/Display.h
View File

@ -53,7 +53,14 @@ namespace EightBit {
void renderBackground() noexcept;
void renderBackground(
int bgArea, int bgCharacters,
tile_offset_t offsetType,
tile_offset_t offsetType,
int offsetX, int offsetY,
const std::array<int, 4>& palette) noexcept;
void renderBackgroundTile(
int definitionOffset,
int row, int column,
int bgCharacters, tile_offset_t offsetType,
int offsetX, int offsetY,
const std::array<int, 4>& palette) noexcept;

2
LR35902/src/CharacterDefinition.cpp
View File

@ -10,7 +10,7 @@ EightBit::GameBoy::CharacterDefinition::CharacterDefinition(Ram& vram, const uin
std::array<int, 8> EightBit::GameBoy::CharacterDefinition::get(int row) const noexcept {
std::array<int, 8> returned;
std::array<int, 8> returned {};
const auto planeAddress = m_address + row * 2;

52
LR35902/src/Display.cpp
View File

@ -14,6 +14,7 @@ EightBit::GameBoy::Display::Display(const AbstractColourPalette* colours, Bus& b
m_colours(colours) {
}
#pragma optimize ("t", off)
void EightBit::GameBoy::Display::renderCurrentScanline() noexcept {
m_scanLine = m_bus.IO().peek(IoRegisters::LY);
if (m_scanLine < RasterHeight) {
@ -25,6 +26,7 @@ void EightBit::GameBoy::Display::renderCurrentScanline() noexcept {
renderObjects();
}
}
#pragma optimize ("t", on)
std::array<int, 4> EightBit::GameBoy::Display::createPalette(const int address) noexcept {
const auto raw = m_bus.IO().peek(address);
@ -81,6 +83,7 @@ void EightBit::GameBoy::Display::renderObjects() noexcept {
}
}
#pragma optimize ("t", off)
void EightBit::GameBoy::Display::renderBackground() noexcept {
const auto palette = createPalette(IoRegisters::BGP);
@ -101,34 +104,34 @@ void EightBit::GameBoy::Display::renderBackground() noexcept {
const auto offsetType = bgCharacters == 0 ? tile_offset_t::Unsigned : tile_offset_t::Signed;
renderBackground(bgArea, bgCharacters, offsetType, offsetX - scrollX, offsetY - scrollY, palette);
}
#pragma optimize ("t", on)
void EightBit::GameBoy::Display::renderBackground(
int bgArea, int bgCharacters, tile_offset_t offsetType,
int offsetX, int offsetY,
const std::array<int, 4>& palette) noexcept {
int bgArea, int bgCharacters, tile_offset_t offsetType,
int offsetX, int offsetY,
const std::array<int, 4>& palette) noexcept {
const int row = (m_scanLine - offsetY) / 8;
auto address = bgArea + row * BufferCharacterWidth;
const auto address = bgArea + (row * BufferCharacterWidth);
for (int column = 0; column < BufferCharacterWidth; ++column) {
const auto character = m_vram.peek(address++);
const auto character = m_vram.peek(address + column);
const auto definitionOffset = offsetType == tile_offset_t::Signed ? 16 * (int8_t)character : 16 * character;
const auto definition = CharacterDefinition(m_vram, bgCharacters + definitionOffset);
renderBackgroundTile(
column * 8 + offsetX, row * 8 + offsetY,
palette,
definition);
definitionOffset,
row, column,
bgCharacters, offsetType,
offsetX, offsetY,
palette);
}
}
void EightBit::GameBoy::Display::renderSpriteTile(
const int height,
const int drawX, const int drawY,
const bool flipX, const bool flipY,
const std::array<int, 4>& palette,
const CharacterDefinition& definition) noexcept {
const int height,
const int drawX, const int drawY,
const bool flipX, const bool flipY,
const std::array<int, 4>& palette,
const CharacterDefinition& definition) noexcept {
renderTile(
height,
drawX, drawY,
@ -137,6 +140,23 @@ void EightBit::GameBoy::Display::renderSpriteTile(
definition);
}
void EightBit::GameBoy::Display::renderBackgroundTile(
int definitionOffset,
int row, int column,
int bgCharacters, tile_offset_t offsetType,
int offsetX, int offsetY,
const std::array<int, 4>& palette) noexcept {
const auto definition = CharacterDefinition(m_vram, bgCharacters + definitionOffset);
const auto drawX = (column * 8) + offsetX;
const auto drawY = (row * 8) + offsetY;
renderBackgroundTile(
drawX, drawY,
palette,
definition);
}
void EightBit::GameBoy::Display::renderBackgroundTile(
const int drawX, const int drawY,
const std::array<int, 4>& palette,