ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Add background and window toggling to frame viewer

This commit is contained in:
Vicki Pfau 2020-10-21 22:03:29 -07:00
parent 9dfa8f753f
commit 9064cb107b
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/platform/qt/FrameView.cpp
View File

@ -24,6 +24,7 @@
#endif #endif
#ifdef M_CORE_GB #ifdef M_CORE_GB
#include <mgba/internal/gb/gb.h> #include <mgba/internal/gb/gb.h>
#include <mgba/internal/gb/io.h>
#include <mgba/internal/gb/memory.h> #include <mgba/internal/gb/memory.h>
#endif #endif
@ -286,6 +287,9 @@ void FrameView::updateTilesGB(bool) {
m_queue.clear(); m_queue.clear();
{ {
CoreController::Interrupter interrupter(m_controller); CoreController::Interrupter interrupter(m_controller);
uint8_t* io = static_cast<GB*>(m_controller->thread()->core->board)->memory.io;
GBRegisterLCDC lcdc = io[GB_REG_LCDC];
for (int sprite = 0; sprite < 40; ++sprite) { for (int sprite = 0; sprite < 40; ++sprite) {
ObjInfo info; ObjInfo info;
lookupObj(sprite, &info); lookupObj(sprite, &info);
@ -312,6 +316,22 @@ void FrameView::updateTilesGB(bool) {
} }
} }
if (GBRegisterLCDCIsWindow(lcdc)) {
m_queue.append({
{ LayerId::WINDOW },
!m_disabled.contains({ LayerId::WINDOW }),
{},
{}, {0, 0}, false, false
});
}
m_queue.append({
{ LayerId::BACKGROUND },
!m_disabled.contains({ LayerId::BACKGROUND }),
{},
{}, {0, 0}, false, false
});
updateRendered(); updateRendered();
} }
invalidateQueue(m_controller->screenDimensions()); invalidateQueue(m_controller->screenDimensions());
@ -328,6 +348,12 @@ void FrameView::injectGB() {
mVideoLoggerInjectOAM(logger, layer.id.index << 2, 0); mVideoLoggerInjectOAM(logger, layer.id.index << 2, 0);
} }
break; break;
case LayerId::BACKGROUND:
m_vl->enableVideoLayer(m_vl, GB_LAYER_BACKGROUND, layer.enabled);
break;
case LayerId::WINDOW:
m_vl->enableVideoLayer(m_vl, GB_LAYER_WINDOW, layer.enabled);
break;
} }
} }
} }

2
src/platform/qt/FrameView.h
View File

@ -72,7 +72,7 @@ private:
int index = -1; int index = -1;
bool operator!=(const LayerId& other) const { return other.type != type || other.index != index; } bool operator!=(const LayerId& other) const { return other.type != type || other.index != index; }
operator uint() const { return (type << 8) | index; } operator uint() const { return (type << 12) | (index & 0xFFF); }
QString readable() const; QString readable() const;
}; };