piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 18:19:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11291 from JosJuice/gba-tas-input

Browse Source 
DolphinQt: Add GBA TAS input window
This commit is contained in:
Admiral H. Curtiss
2022-11-22 23:49:43 +01:00
committed by GitHub
parent 132bf6550f 40571cf13c
commit 19b6251a3c
8 changed files with 164 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Core/HW/GBAPadEmu.cpp
View File

@ -15,24 +15,21 @@ static const u16 dpad_bitmasks[] = {PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_L
static const u16 button_bitmasks[] = {PAD_BUTTON_B, PAD_BUTTON_A, PAD_TRIGGER_L,
PAD_TRIGGER_R, PAD_TRIGGER_Z, PAD_BUTTON_START};
static const char* const named_buttons[] = {"B", "A", "L", "R", _trans("SELECT"), _trans("START")};
GBAPad::GBAPad(const unsigned int index) : m_reset_pending(false), m_index(index)
{
// Buttons
groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons")));
for (const char* named_button : named_buttons)
groups.emplace_back(m_buttons = new ControllerEmu::Buttons(BUTTONS_GROUP));
for (const char* named_button : {B_BUTTON, A_BUTTON, L_BUTTON, R_BUTTON})
{
const ControllerEmu::Translatability translate =
(named_button == std::string(_trans("SELECT")) ||
named_button == std::string(_trans("START"))) ?
ControllerEmu::Translate :
ControllerEmu::DoNotTranslate;
m_buttons->AddInput(translate, named_button);
m_buttons->AddInput(ControllerEmu::DoNotTranslate, named_button);
}
for (const char* named_button : {SELECT_BUTTON, START_BUTTON})
{
m_buttons->AddInput(ControllerEmu::Translate, named_button);
}
// DPad
groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad")));
groups.emplace_back(m_dpad = new ControllerEmu::Buttons(DPAD_GROUP));
for (const char* named_direction : named_directions)
{
m_dpad->AddInput(ControllerEmu::Translate, named_direction);
@ -63,10 +60,10 @@ GCPadStatus GBAPad::GetInput()
GCPadStatus pad = {};
// Buttons
m_buttons->GetState(&pad.button, button_bitmasks);
m_buttons->GetState(&pad.button, button_bitmasks, m_input_override_function);
// DPad
m_dpad->GetState(&pad.button, dpad_bitmasks);
m_dpad->GetState(&pad.button, dpad_bitmasks, m_input_override_function);
// Use X button as a reset signal
if (m_reset_pending)

12
Source/Core/Core/HW/GBAPadEmu.h
View File

@ -3,6 +3,8 @@
#pragma once
#include "Common/Common.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
struct GCPadStatus;
@ -31,6 +33,16 @@ public:
void LoadDefaults(const ControllerInterface& ciface) override;
static constexpr const char* BUTTONS_GROUP = _trans("Buttons");
static constexpr const char* DPAD_GROUP = _trans("D-Pad");
static constexpr const char* B_BUTTON = "B";
static constexpr const char* A_BUTTON = "A";
static constexpr const char* L_BUTTON = "L";
static constexpr const char* R_BUTTON = "R";
static constexpr const char* SELECT_BUTTON = _trans("SELECT");
static constexpr const char* START_BUTTON = _trans("START");
private:
ControllerEmu::Buttons* m_buttons;
ControllerEmu::Buttons* m_dpad;