Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-20 12:39:13 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
wheremyfoodat 2024-03-20 18:25:12 +02:00
parent e576e64736
commit 0d2dac7f08
7 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -201,7 +201,7 @@ set(AUDIO_SOURCE_FILES src/core/audio/dsp_core.cpp src/core/audio/null_core.cpp
) )
set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp) set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/mappings.hpp set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/input_mappings.hpp
include/cpu.hpp include/cpu_dynarmic.hpp include/memory.hpp include/renderer.hpp include/kernel/kernel.hpp include/cpu.hpp include/cpu_dynarmic.hpp include/memory.hpp include/renderer.hpp include/kernel/kernel.hpp
include/dynarmic_cp15.hpp include/kernel/resource_limits.hpp include/kernel/kernel_types.hpp include/dynarmic_cp15.hpp include/kernel/resource_limits.hpp include/kernel/kernel_types.hpp
include/kernel/config_mem.hpp include/services/service_manager.hpp include/services/apt.hpp include/kernel/config_mem.hpp include/services/service_manager.hpp include/services/apt.hpp

0
include/mappings.hpp → include/input_mappings.hpp
View file

6
include/panda_qt/main_window.hpp
View file

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include "emulator.hpp" #include "emulator.hpp"
#include "mappings.hpp" #include "input_mappings.hpp"
#include "panda_qt/about_window.hpp" #include "panda_qt/about_window.hpp"
#include "panda_qt/config_window.hpp" #include "panda_qt/config_window.hpp"
#include "panda_qt/cheats_window.hpp" #include "panda_qt/cheats_window.hpp"
@ -81,7 +81,6 @@ class MainWindow : public QMainWindow {
// This would normally be an std::unique_ptr but it's shared between threads so definitely not // This would normally be an std::unique_ptr but it's shared between threads so definitely not
Emulator* emu = nullptr; Emulator* emu = nullptr;
InputMappings keyboardMappings;
std::thread emuThread; std::thread emuThread;
std::atomic<bool> appRunning = true; // Is the application itself running? std::atomic<bool> appRunning = true; // Is the application itself running?
@ -89,7 +88,8 @@ class MainWindow : public QMainWindow {
std::mutex messageQueueMutex; std::mutex messageQueueMutex;
std::vector<EmulatorMessage> messageQueue; std::vector<EmulatorMessage> messageQueue;
ScreenWidget screen; InputMappings keyboardMappings;
ScreenWidget screen;
AboutWindow* aboutWindow; AboutWindow* aboutWindow;
ConfigWindow* configWindow; ConfigWindow* configWindow;
CheatsWindow* cheatsEditor; CheatsWindow* cheatsEditor;

2
include/panda_sdl/frontend_sdl.hpp
View file

@ -5,7 +5,7 @@
#include <filesystem> #include <filesystem>
#include "emulator.hpp" #include "emulator.hpp"
#include "mappings.hpp" #include "input_mappings.hpp"
class FrontendSDL { class FrontendSDL {
Emulator emu; Emulator emu;

2
src/panda_qt/main_window.cpp
View file

@ -8,7 +8,7 @@
#include <fstream> #include <fstream>
#include "cheats.hpp" #include "cheats.hpp"
#include "mappings.hpp" #include "input_mappings.hpp"
MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), keyboardMappings(InputMappings::DefaultKeyboardMappings()), screen(this) { MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), keyboardMappings(InputMappings::DefaultKeyboardMappings()), screen(this) {
setWindowTitle("Alber"); setWindowTitle("Alber");

3
src/panda_qt/mappings.cpp
View file

@ -1,4 +1,4 @@
#include "mappings.hpp" #include "input_mappings.hpp"
#include <QKeyEvent> #include <QKeyEvent>
@ -20,5 +20,6 @@ InputMappings InputMappings::DefaultKeyboardMappings() {
mappings.setMapping(Qt::Key_S, HID::Keys::CirclePadDown); mappings.setMapping(Qt::Key_S, HID::Keys::CirclePadDown);
mappings.setMapping(Qt::Key_D, HID::Keys::CirclePadRight); mappings.setMapping(Qt::Key_D, HID::Keys::CirclePadRight);
mappings.setMapping(Qt::Key_A, HID::Keys::CirclePadLeft); mappings.setMapping(Qt::Key_A, HID::Keys::CirclePadLeft);
return mappings; return mappings;
} }

3
src/panda_sdl/mappings.cpp
View file

@ -1,4 +1,4 @@
#include "mappings.hpp" #include "input_mappings.hpp"
#include <SDL.h> #include <SDL.h>
@ -20,5 +20,6 @@ InputMappings InputMappings::DefaultKeyboardMappings() {
mappings.setMapping(SDLK_s, HID::Keys::CirclePadDown); mappings.setMapping(SDLK_s, HID::Keys::CirclePadDown);
mappings.setMapping(SDLK_d, HID::Keys::CirclePadRight); mappings.setMapping(SDLK_d, HID::Keys::CirclePadRight);
mappings.setMapping(SDLK_a, HID::Keys::CirclePadLeft); mappings.setMapping(SDLK_a, HID::Keys::CirclePadLeft);
return mappings; return mappings;
} }