mirror of
https://github.com/zoriya/ComSquare.git
synced 2025-12-18 21:25:11 +00:00
Cleaning up
This commit is contained in:
@@ -54,25 +54,30 @@ namespace ComSquare::Renderer
|
||||
{
|
||||
try {
|
||||
this->_snes.update();
|
||||
} catch (const DebuggableError &e) {
|
||||
}
|
||||
#ifdef DEBUGGER_ENABLED
|
||||
catch (const DebuggableError &e) {
|
||||
std::cout << "Invalid rom's instruction: " << e.what() << std::endl;
|
||||
this->_snes.enableCPUDebuggingWithError(e);
|
||||
} catch (std::exception &e) {
|
||||
}
|
||||
#endif
|
||||
catch (std::exception &e) {
|
||||
std::cerr << "An error occurred: " << e.what() << std::endl;
|
||||
QApplication::quit();
|
||||
}
|
||||
}
|
||||
|
||||
void QtFullSFML::reset()
|
||||
{
|
||||
this->_snes.cpu.RESB();
|
||||
}
|
||||
|
||||
#ifdef DEBUGGER_ENABLED
|
||||
void QtFullSFML::enableDebugCPU()
|
||||
{
|
||||
this->_snes.enableCPUDebugging();
|
||||
}
|
||||
|
||||
void QtFullSFML::reset()
|
||||
{
|
||||
this->_snes.cpu->RESB();
|
||||
}
|
||||
|
||||
void QtFullSFML::enableRamViewer()
|
||||
{
|
||||
this->_snes.enableRamViewer();
|
||||
@@ -107,8 +112,9 @@ namespace ComSquare::Renderer
|
||||
{
|
||||
this->_snes.enableTileViewerDebugging();
|
||||
}
|
||||
#endif
|
||||
|
||||
QtSFMLWindow::QtSFMLWindow(unsigned int height, unsigned int width)
|
||||
QtSFMLWindow::QtSFMLWindow(int height, int width)
|
||||
: QtSFML(&this->_window)
|
||||
{
|
||||
this->_window.resize(width, height);
|
||||
@@ -118,7 +124,7 @@ namespace ComSquare::Renderer
|
||||
void QtSFMLWindow::createWindow(SNES &snes, int maxFPS)
|
||||
{
|
||||
QtSFML::createWindow(snes, maxFPS);
|
||||
this->setWindowName(snes.cartridge->header.gameName);
|
||||
this->setWindowName(snes.cartridge.header.gameName);
|
||||
this->_window.setCentralWidget(this->_sfWidget);
|
||||
|
||||
QMenu *file = this->_window.menuBar()->addMenu("&File");
|
||||
@@ -126,52 +132,52 @@ namespace ComSquare::Renderer
|
||||
(void)file;
|
||||
|
||||
QMenu *game = this->_window.menuBar()->addMenu("&Game");
|
||||
QAction *reset = new QAction("Reset", &this->_window);
|
||||
auto *reset = new QAction("Reset", &this->_window);
|
||||
QMainWindow::connect(reset, &QAction::triggered, this->_sfWidget, &QtFullSFML::reset);
|
||||
game->addAction(reset);
|
||||
|
||||
|
||||
|
||||
#ifdef DEBUGGER_ENABLED
|
||||
QMenu *debugger = this->_window.menuBar()->addMenu("&Debugger");
|
||||
QAction *cpuDebugger = new QAction("CPU's Debugger", &this->_window);
|
||||
auto *cpuDebugger = new QAction("CPU's Debugger", &this->_window);
|
||||
cpuDebugger->setShortcut(Qt::Key_F1);
|
||||
QMainWindow::connect(cpuDebugger, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableDebugCPU);
|
||||
debugger->addAction(cpuDebugger);
|
||||
|
||||
QAction *ramViewer = new QAction("Memory viewer", &this->_window);
|
||||
auto *ramViewer = new QAction("Memory viewer", &this->_window);
|
||||
ramViewer->setShortcut(Qt::Key_F2);
|
||||
QMainWindow::connect(ramViewer, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableRamViewer);
|
||||
debugger->addAction(ramViewer);
|
||||
|
||||
QAction *headerViewer = new QAction("Header viewer", &this->_window);
|
||||
auto *headerViewer = new QAction("Header viewer", &this->_window);
|
||||
headerViewer->setShortcut(Qt::Key_F3);
|
||||
QMainWindow::connect(headerViewer, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableHeaderViewer);
|
||||
debugger->addAction(headerViewer);
|
||||
|
||||
QAction *apuDebugger = new QAction("APU's Debugger", &this->_window);
|
||||
auto *apuDebugger = new QAction("APU's Debugger", &this->_window);
|
||||
apuDebugger->setShortcut(Qt::Key_F4);
|
||||
QMainWindow::connect(apuDebugger, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableDebugAPU);
|
||||
debugger->addAction(apuDebugger);
|
||||
|
||||
QAction *busDebugger = new QAction("Memory bus Viewer", &this->_window);
|
||||
auto *busDebugger = new QAction("Memory bus Viewer", &this->_window);
|
||||
busDebugger->setShortcut(Qt::Key_F5);
|
||||
QMainWindow::connect(busDebugger, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableDebugBus);
|
||||
debugger->addAction(busDebugger);
|
||||
|
||||
QAction *cgramDebugger = new QAction("Palette Viewer", &this->_window);
|
||||
auto *cgramDebugger = new QAction("Palette Viewer", &this->_window);
|
||||
cgramDebugger->setShortcut(Qt::Key_F6);
|
||||
QMainWindow::connect(cgramDebugger, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableCgramViewer);
|
||||
debugger->addAction(cgramDebugger);
|
||||
|
||||
QAction *registerDebugger = new QAction("Registers Viewer", &this->_window);
|
||||
auto *registerDebugger = new QAction("Registers Viewer", &this->_window);
|
||||
registerDebugger->setShortcut(Qt::Key_F7);
|
||||
QMainWindow::connect(registerDebugger, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableRegisterViewer);
|
||||
debugger->addAction(registerDebugger);
|
||||
|
||||
QAction *tileDebugger = new QAction("Tile Viewer", &this->_window);
|
||||
auto *tileDebugger = new QAction("Tile Viewer", &this->_window);
|
||||
tileDebugger->setShortcut(Qt::Key_F8);
|
||||
QMainWindow::connect(tileDebugger, &QAction::triggered, this->_sfWidget, &QtFullSFML::enableTileViewer);
|
||||
debugger->addAction(tileDebugger);
|
||||
#endif
|
||||
|
||||
this->_window.show();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user