iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remappable inputs in progress

Browse Source
This commit is contained in:
iris
2026-06-10 15:26:59 +02:00
parent ac4af8106c
commit d26417b83f
9 changed files with 213 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2
View File
@@ -168,6 +168,8 @@ qt_add_executable(kaizen
src/frontend/Settings/CPUSettings.cpp
src/frontend/Settings/AudioSettings.hpp
src/frontend/Settings/AudioSettings.cpp
src/frontend/Settings/InputSettings.hpp
src/frontend/Settings/InputSettings.cpp
src/utils/Options.cpp
src/utils/File.cpp)
src/frontend/KaizenGui.cpp
+22 -4
View File
@@ -15,6 +15,8 @@ KaizenGui::KaizenGui() noexcept : QMainWindow(nullptr), settings(QSettings::User
hide();
installEventFilter(this);
restoreGeometry(settings.value("geometry").toByteArray());
restoreState(settings.value("windowState").toByteArray());
@@ -238,15 +240,31 @@ void KaizenGui::dragEnterEvent(QDragEnterEvent *event) {
}
void KaizenGui::keyPressEvent(QKeyEvent *event) {
for (int i = 0; i < mapping.size(); i++) {
if (mapping[i] == event->key())
for (int i = 0; i < settingsWindow->input->mapping.size(); i++) {
if (settingsWindow->input->mapping[i] == event->key())
pressedKeys.set(i);
}
}
void KaizenGui::keyReleaseEvent(QKeyEvent *event) {
for (int i = 0; i < mapping.size(); i++) {
if (mapping[i] == event->key())
for (int i = 0; i < settingsWindow->input->mapping.size(); i++) {
if (settingsWindow->input->mapping[i] == event->key())
pressedKeys.reset(i);
}
}
bool KaizenGui::eventFilter(QObject *obj, QEvent *event) {
if (event->type() == QEvent::KeyPress) {
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
if (!settingsWindow->hasFocus())
return keyPressEvent(keyEvent), true;
}
if (event->type() == QEvent::KeyRelease) {
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
if (!settingsWindow->hasFocus())
return keyReleaseEvent(keyEvent), true;
}
return QMainWindow::eventFilter(obj, event);
}
src/frontend/KaizenGui.hpp
+1 -6
View File
@@ -8,7 +8,6 @@
#include <QDragEnterEvent>
#include <Core.hpp>
#include <bitset>
#include <tuple>
class EmuThread;
@@ -16,6 +15,7 @@ class KaizenGui final : QMainWindow {
Q_OBJECT
void updateKeys();
void updateAxis();
bool eventFilter(QObject *, QEvent *) override;
public:
explicit KaizenGui() noexcept;
@@ -53,9 +53,4 @@ class KaizenGui final : QMainWindow {
float elapsed = 0.f;
n64::Core &core = n64::Core::GetInstance();
std::bitset<18> pressedKeys{};
std::array<Qt::Key, 18> mapping = {
Qt::Key_Z, Qt::Key_X, Qt::Key_C, Qt::Key_A, Qt::Key_S, Qt::Key_Return,
Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_T, Qt::Key_G,
Qt::Key_F, Qt::Key_H, Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right,
};
};
src/frontend/Settings/GeneralSettings.cpp
+2 -2
View File
@@ -9,9 +9,9 @@ GeneralSettings::GeneralSettings() : settings(QSettings::UserScope) {
description->setToolTip("Path where game saves are stored.");
selectedFolderLabel = new QLabel(Options::GetSavesPath().c_str());
selectedFolderLabel->setDisabled(true);
folderSelectButton = new QPushButton("Choose...");
folderSelectButton = new QToolButton();
connect(folderSelectButton, &QPushButton::clicked, this, [&] {
connect(folderSelectButton, &QToolButton::clicked, this, [&] {
auto dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"), QCoreApplication::applicationDirPath(),
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
selectedFolderLabel->setText(dir);
src/frontend/Settings/GeneralSettings.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QPushButton>
#include <QToolButton>
#include <QVBoxLayout>
#include <QLabel>
#include <QSettings>
@@ -8,7 +8,7 @@
class GeneralSettings final : public QWidget {
Q_OBJECT
QLabel *description;
QPushButton *folderSelectButton;
QToolButton *folderSelectButton;
QLabel *selectedFolderLabel;
QVBoxLayout *v;
QHBoxLayout *h;
src/frontend/Settings/InputSettings.cpp
+138
View File
@@ -0,0 +1,138 @@
#include <InputSettings.hpp>
InputSettings::InputSettings() : settings(QSettings::UserScope) {
mapping[0] = settings.value("input/mapping/Z", Qt::Key_Z).value<QKeySequence>();
mapping[1] = settings.value("input/mapping/A", Qt::Key_X).value<QKeySequence>();
mapping[2] = settings.value("input/mapping/B", Qt::Key_C).value<QKeySequence>();
mapping[3] = settings.value("input/mapping/L", Qt::Key_A).value<QKeySequence>();
mapping[4] = settings.value("input/mapping/R", Qt::Key_S).value<QKeySequence>();
mapping[5] = settings.value("input/mapping/S", Qt::Key_Return).value<QKeySequence>();
mapping[6] = settings.value("input/mapping/DU", Qt::Key_I).value<QKeySequence>();
mapping[7] = settings.value("input/mapping/DD", Qt::Key_K).value<QKeySequence>();
mapping[8] = settings.value("input/mapping/DL", Qt::Key_J).value<QKeySequence>();
mapping[9] = settings.value("input/mapping/DR", Qt::Key_L).value<QKeySequence>();
mapping[10] = settings.value("input/mapping/CU", Qt::Key_T).value<QKeySequence>();
mapping[11] = settings.value("input/mapping/CD", Qt::Key_G).value<QKeySequence>();
mapping[12] = settings.value("input/mapping/CL", Qt::Key_F).value<QKeySequence>();
mapping[13] = settings.value("input/mapping/CR", Qt::Key_H).value<QKeySequence>();
mapping[14] = settings.value("input/mapping/AU", Qt::Key_Up).value<QKeySequence>();
mapping[15] = settings.value("input/mapping/AD", Qt::Key_Down).value<QKeySequence>();
mapping[16] = settings.value("input/mapping/AL", Qt::Key_Left).value<QKeySequence>();
mapping[17] = settings.value("input/mapping/AR", Qt::Key_Right).value<QKeySequence>();
form = new QFormLayout();
form->addRow("Z:", btnZ);
form->addRow("A:", btnA);
form->addRow("B:", btnB);
form->addRow("L:", btnL);
form->addRow("R:", btnR);
form->addRow("Start:", btnS);
form->addRow("D-pad Up:", btnDU);
form->addRow("D-pad Down:", btnDD);
form->addRow("D-pad Left:", btnDL);
form->addRow("D-pad Right:", btnDR);
form->addRow("C-up:", btnCU);
form->addRow("C-down:", btnCD);
form->addRow("C-left:", btnCL);
form->addRow("C-right:", btnCR);
form->addRow("Up:", btnAU);
form->addRow("Down:", btnAD);
form->addRow("Left:", btnAL);
form->addRow("Right:", btnAR);
connect(btnZ, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[0] = btnZ->keySequence();
settings.setValue("input/mapping/Z", mapping[0]);
settings.sync();
});
connect(btnA, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[1] = btnA->keySequence();
settings.setValue("input/mapping/A", mapping[1]);
settings.sync();
});
connect(btnB, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[2] = btnB->keySequence();
settings.setValue("input/mapping/B", mapping[2]);
settings.sync();
});
connect(btnL, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[3] = btnL->keySequence();
settings.setValue("input/mapping/L", mapping[3]);
settings.sync();
});
connect(btnR, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[4] = btnR->keySequence();
settings.setValue("input/mapping/R", mapping[4]);
settings.sync();
});
connect(btnS, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[5] = btnS->keySequence();
settings.setValue("input/mapping/S", mapping[5]);
settings.sync();
});
connect(btnDU, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[6] = btnDU->keySequence();
settings.setValue("input/mapping/DU", mapping[6]);
settings.sync();
});
connect(btnDD, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[7] = btnDD->keySequence();
settings.setValue("input/mapping/DD", mapping[7]);
settings.sync();
});
connect(btnDL, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[8] = btnDL->keySequence();
settings.setValue("input/mapping/DL", mapping[8]);
settings.sync();
});
connect(btnDR, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[9] = btnDR->keySequence();
settings.setValue("input/mapping/DR", mapping[9]);
settings.sync();
});
connect(btnCU, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[10] = btnCU->keySequence();
settings.setValue("input/mapping/CU", mapping[10]);
settings.sync();
});
connect(btnCD, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[11] = btnCD->keySequence();
settings.setValue("input/mapping/CD", mapping[11]);
settings.sync();
});
connect(btnCL, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[12] = btnCL->keySequence();
settings.setValue("input/mapping/CL", mapping[12]);
settings.sync();
});
connect(btnCR, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[13] = btnCR->keySequence();
settings.setValue("input/mapping/CR", mapping[13]);
settings.sync();
});
connect(btnAU, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[14] = btnAU->keySequence();
settings.setValue("input/mapping/AU", mapping[14]);
settings.sync();
});
connect(btnAD, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[15] = btnAD->keySequence();
settings.setValue("input/mapping/AD", mapping[15]);
settings.sync();
});
connect(btnAL, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[16] = btnAL->keySequence();
settings.setValue("input/mapping/AL", mapping[16]);
settings.sync();
});
connect(btnAR, &QKeySequenceEdit::keySequenceChanged, this, [&] {
mapping[17] = btnAR->keySequence();
settings.setValue("input/mapping/AR", mapping[17]);
settings.sync();
});
v = new QVBoxLayout(this);
v->addLayout(form);
setLayout(v);
}
src/frontend/Settings/InputSettings.hpp
+42
View File
@@ -0,0 +1,42 @@
#pragma once
#include <QWidget>
#include <QPushButton>
#include <QVBoxLayout>
#include <QFormLayout>
#include <QKeySequenceEdit>
#include <QLabel>
#include <QSettings>
#include <QList>
class InputSettings final : public QWidget {
Q_OBJECT
QSettings settings;
QVBoxLayout *v;
QFormLayout *form;
QKeySequenceEdit *btnZ = new QKeySequenceEdit(Qt::Key_Z);
QKeySequenceEdit *btnA = new QKeySequenceEdit(Qt::Key_X);
QKeySequenceEdit *btnB = new QKeySequenceEdit(Qt::Key_C);
QKeySequenceEdit *btnL = new QKeySequenceEdit(Qt::Key_A);
QKeySequenceEdit *btnR = new QKeySequenceEdit(Qt::Key_S);
QKeySequenceEdit *btnS = new QKeySequenceEdit(Qt::Key_Return);
QKeySequenceEdit *btnDU = new QKeySequenceEdit(Qt::Key_T);
QKeySequenceEdit *btnDD = new QKeySequenceEdit(Qt::Key_G);
QKeySequenceEdit *btnDL = new QKeySequenceEdit(Qt::Key_F);
QKeySequenceEdit *btnDR = new QKeySequenceEdit(Qt::Key_H);
QKeySequenceEdit *btnCU = new QKeySequenceEdit(Qt::Key_I);
QKeySequenceEdit *btnCD = new QKeySequenceEdit(Qt::Key_K);
QKeySequenceEdit *btnCL = new QKeySequenceEdit(Qt::Key_J);
QKeySequenceEdit *btnCR = new QKeySequenceEdit(Qt::Key_L);
QKeySequenceEdit *btnAU = new QKeySequenceEdit(Qt::Key_Up);
QKeySequenceEdit *btnAD = new QKeySequenceEdit(Qt::Key_Down);
QKeySequenceEdit *btnAL = new QKeySequenceEdit(Qt::Key_Left);
QKeySequenceEdit *btnAR = new QKeySequenceEdit(Qt::Key_Right);
public:
QList<QKeySequence> mapping = {
Qt::Key_Z, Qt::Key_X, Qt::Key_C, Qt::Key_A, Qt::Key_S, Qt::Key_Return,
Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_T, Qt::Key_G,
Qt::Key_F, Qt::Key_H, Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right,
};
explicit InputSettings();
};
src/frontend/SettingsWindow.cpp
+2
View File
@@ -8,10 +8,12 @@ SettingsWindow::SettingsWindow() {
general = new GeneralSettings();
cpu = new CPUSettings();
audio = new AudioSettings();
input = new InputSettings();
categories = new QTabWidget(this);
categories->addTab(general, "General");
categories->addTab(cpu, "MIPS VR4300i");
categories->addTab(audio, "Audio");
categories->addTab(input, "Input");
v = new QVBoxLayout(this);
v->addWidget(categories);
src/frontend/SettingsWindow.hpp
+2
View File
@@ -6,6 +6,7 @@
#include <GeneralSettings.hpp>
#include <AudioSettings.hpp>
#include <CPUSettings.hpp>
#include <InputSettings.hpp>
class SettingsWindow final : public QWidget {
Q_OBJECT
@@ -13,6 +14,7 @@ class SettingsWindow final : public QWidget {
GeneralSettings *general;
AudioSettings *audio;
CPUSettings *cpu;
InputSettings *input;
QVBoxLayout *v;
public: