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

TASInputDlg: Use std::array where applicable

Browse Source
This commit is contained in:
Lioncash
2017-04-02 06:43:57 -04:00
parent ee0e6fa09c
commit b809db52d1
2 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -43,6 +43,28 @@ struct TASWiimoteReport
const wiimote_key key; const wiimote_key key;
}; };
constexpr std::array<int, 12> s_gc_pad_buttons_bitmask{{
PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT, PAD_BUTTON_A, PAD_BUTTON_B,
PAD_BUTTON_X, PAD_BUTTON_Y, PAD_TRIGGER_Z, PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_BUTTON_START,
}};
constexpr std::array<int, 11> s_wii_buttons_bitmask{{
WiimoteEmu::Wiimote::PAD_DOWN, WiimoteEmu::Wiimote::PAD_UP, WiimoteEmu::Wiimote::PAD_LEFT,
WiimoteEmu::Wiimote::PAD_RIGHT, WiimoteEmu::Wiimote::BUTTON_A, WiimoteEmu::Wiimote::BUTTON_B,
WiimoteEmu::Wiimote::BUTTON_ONE, WiimoteEmu::Wiimote::BUTTON_TWO,
WiimoteEmu::Wiimote::BUTTON_PLUS, WiimoteEmu::Wiimote::BUTTON_MINUS,
WiimoteEmu::Wiimote::BUTTON_HOME,
}};
constexpr std::array<int, 15> s_cc_buttons_bitmask{{
WiimoteEmu::Classic::PAD_DOWN, WiimoteEmu::Classic::PAD_UP, WiimoteEmu::Classic::PAD_LEFT,
WiimoteEmu::Classic::PAD_RIGHT, WiimoteEmu::Classic::BUTTON_A, WiimoteEmu::Classic::BUTTON_B,
WiimoteEmu::Classic::BUTTON_X, WiimoteEmu::Classic::BUTTON_Y, WiimoteEmu::Classic::BUTTON_PLUS,
WiimoteEmu::Classic::BUTTON_MINUS, WiimoteEmu::Classic::TRIGGER_L,
WiimoteEmu::Classic::TRIGGER_R, WiimoteEmu::Classic::BUTTON_ZR, WiimoteEmu::Classic::BUTTON_ZL,
WiimoteEmu::Classic::BUTTON_HOME,
}};
TASInputDlg::TASInputDlg(wxWindow* parent, wxWindowID id, const wxString& title, TASInputDlg::TASInputDlg(wxWindow* parent, wxWindowID id, const wxString& title,
const wxPoint& position, const wxSize& size, long style) const wxPoint& position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
@ -51,12 +73,9 @@ TASInputDlg::TASInputDlg(wxWindow* parent, wxWindowID id, const wxString& title,
void TASInputDlg::CreateBaseLayout() void TASInputDlg::CreateBaseLayout()
{ {
for (unsigned int i = 0; i < ArraySize(m_controls); ++i) m_controls = {};
m_controls[i] = nullptr; m_buttons = {};
for (unsigned int i = 0; i < ArraySize(m_buttons); ++i) m_cc_controls = {};
m_buttons[i] = nullptr;
for (unsigned int i = 0; i < ArraySize(m_cc_controls); ++i)
m_cc_controls[i] = nullptr;
m_buttons[0] = &m_dpad_down; m_buttons[0] = &m_dpad_down;
m_buttons[1] = &m_dpad_up; m_buttons[1] = &m_dpad_up;
@ -93,31 +112,6 @@ void TASInputDlg::CreateBaseLayout()
m_buttons_dpad->Add(space20, space20); m_buttons_dpad->Add(space20, space20);
} }
static constexpr int s_gc_pad_buttons_bitmask[12] = {
PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT,
PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_X, PAD_BUTTON_Y,
PAD_TRIGGER_Z, PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_BUTTON_START};
static constexpr int s_wii_buttons_bitmask[11] = {
WiimoteEmu::Wiimote::PAD_DOWN, WiimoteEmu::Wiimote::PAD_UP,
WiimoteEmu::Wiimote::PAD_LEFT, WiimoteEmu::Wiimote::PAD_RIGHT,
WiimoteEmu::Wiimote::BUTTON_A, WiimoteEmu::Wiimote::BUTTON_B,
WiimoteEmu::Wiimote::BUTTON_ONE, WiimoteEmu::Wiimote::BUTTON_TWO,
WiimoteEmu::Wiimote::BUTTON_PLUS, WiimoteEmu::Wiimote::BUTTON_MINUS,
WiimoteEmu::Wiimote::BUTTON_HOME,
};
static constexpr int s_cc_buttons_bitmask[15] = {
WiimoteEmu::Classic::PAD_DOWN, WiimoteEmu::Classic::PAD_UP,
WiimoteEmu::Classic::PAD_LEFT, WiimoteEmu::Classic::PAD_RIGHT,
WiimoteEmu::Classic::BUTTON_A, WiimoteEmu::Classic::BUTTON_B,
WiimoteEmu::Classic::BUTTON_X, WiimoteEmu::Classic::BUTTON_Y,
WiimoteEmu::Classic::BUTTON_PLUS, WiimoteEmu::Classic::BUTTON_MINUS,
WiimoteEmu::Classic::TRIGGER_L, WiimoteEmu::Classic::TRIGGER_R,
WiimoteEmu::Classic::BUTTON_ZR, WiimoteEmu::Classic::BUTTON_ZL,
WiimoteEmu::Classic::BUTTON_HOME,
};
void TASInputDlg::CreateWiiLayout(int num) void TASInputDlg::CreateWiiLayout(int num)
{ {
if (m_has_layout) if (m_has_layout)
@ -209,10 +203,13 @@ void TASInputDlg::CreateWiiLayout(int num)
m_ext_szr->AddSpacer(space5); m_ext_szr->AddSpacer(space5);
m_ext_szr->Add(nunchukaxisBox, 0, wxBOTTOM, space5); m_ext_szr->Add(nunchukaxisBox, 0, wxBOTTOM, space5);
// Add non-DPad related buttons first.
wxGridSizer* const buttons_grid = new wxGridSizer(4); wxGridSizer* const buttons_grid = new wxGridSizer(4);
for (unsigned int i = 4; i < ArraySize(m_buttons); ++i) for (size_t i = 4; i < m_buttons.size(); ++i)
{
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
buttons_grid->Add(m_buttons[i]->checkbox); buttons_grid->Add(m_buttons[i]->checkbox);
}
buttons_grid->Add(space5, space5); buttons_grid->Add(space5, space5);
wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons")); wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
@ -405,10 +402,13 @@ void TASInputDlg::CreateGCLayout()
const int space5 = FromDIP(5); const int space5 = FromDIP(5);
// Add non-DPad related buttons first.
wxGridSizer* const buttons_grid = new wxGridSizer(4); wxGridSizer* const buttons_grid = new wxGridSizer(4);
for (unsigned int i = 4; i < ArraySize(m_buttons); ++i) for (size_t i = 4; i < m_buttons.size(); ++i)
{
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
buttons_grid->Add(m_buttons[i]->checkbox, false); buttons_grid->Add(m_buttons[i]->checkbox, false);
}
buttons_grid->Add(space5, space5); buttons_grid->Add(space5, space5);
wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons")); wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
@ -636,7 +636,7 @@ void TASInputDlg::SetButtonValue(Button* button, bool CurrentState)
// NOTE: Host / CPU Thread // NOTE: Host / CPU Thread
void TASInputDlg::SetWiiButtons(u16* butt) void TASInputDlg::SetWiiButtons(u16* butt)
{ {
for (unsigned int i = 0; i < 11; ++i) for (size_t i = 0; i < s_wii_buttons_bitmask.size(); ++i)
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
*butt |= (m_buttons[i]->is_checked) ? s_wii_buttons_bitmask[i] : 0; *butt |= (m_buttons[i]->is_checked) ? s_wii_buttons_bitmask[i] : 0;
@ -655,7 +655,7 @@ void TASInputDlg::GetKeyBoardInput(GCPadStatus* PadStatus)
SetSliderValue(&m_l_cont, PadStatus->triggerLeft); SetSliderValue(&m_l_cont, PadStatus->triggerLeft);
SetSliderValue(&m_r_cont, PadStatus->triggerRight); SetSliderValue(&m_r_cont, PadStatus->triggerRight);
for (unsigned int i = 0; i < ArraySize(m_buttons); ++i) for (size_t i = 0; i < m_buttons.size(); ++i)
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
SetButtonValue(m_buttons[i], ((PadStatus->button & s_gc_pad_buttons_bitmask[i]) != 0)); SetButtonValue(m_buttons[i], ((PadStatus->button & s_gc_pad_buttons_bitmask[i]) != 0));
@ -677,7 +677,7 @@ void TASInputDlg::GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, in
if (coreData) if (coreData)
{ {
for (unsigned int i = 0; i < 11; ++i) for (size_t i = 0; i < s_wii_buttons_bitmask.size(); ++i)
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
SetButtonValue(m_buttons[i], SetButtonValue(m_buttons[i],
@ -719,7 +719,7 @@ void TASInputDlg::GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, in
wm_classic_extension& cc = *(wm_classic_extension*)extData; wm_classic_extension& cc = *(wm_classic_extension*)extData;
WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension)); WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension));
cc.bt.hex = cc.bt.hex ^ 0xFFFF; cc.bt.hex = cc.bt.hex ^ 0xFFFF;
for (unsigned int i = 0; i < 15; ++i) for (size_t i = 0; i < m_cc_buttons.size(); ++i)
{ {
SetButtonValue(&m_cc_buttons[i], ((cc.bt.hex & s_cc_buttons_bitmask[i]) != 0)); SetButtonValue(&m_cc_buttons[i], ((cc.bt.hex & s_cc_buttons_bitmask[i]) != 0));
} }
@ -776,11 +776,10 @@ void TASInputDlg::GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext,
} }
if (irData) if (irData)
{ {
u16 x[4]; std::array<u16, 4> x;
u16 y; u16 y = m_main_stick.y_cont.value;
x[0] = m_main_stick.x_cont.value; x[0] = m_main_stick.x_cont.value;
y = m_main_stick.y_cont.value;
x[1] = x[0] + 100; x[1] = x[0] + 100;
x[2] = x[0] - 10; x[2] = x[0] - 10;
x[3] = x[1] + 10; x[3] = x[1] + 10;
@ -820,7 +819,7 @@ void TASInputDlg::GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext,
{ {
memset(data, 0xFF, sizeof(wm_ir_extended) * 4); memset(data, 0xFF, sizeof(wm_ir_extended) * 4);
wm_ir_extended* const ir_data = (wm_ir_extended*)irData; wm_ir_extended* const ir_data = (wm_ir_extended*)irData;
for (unsigned int i = 0; i < 4; ++i) for (size_t i = 0; i < x.size(); ++i)
{ {
if (x[i] < 1024 && y < 768) if (x[i] < 1024 && y < 768)
{ {
@ -866,7 +865,7 @@ void TASInputDlg::GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext,
WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension)); WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension));
cc.bt.hex = 0; cc.bt.hex = 0;
for (unsigned int i = 0; i < ArraySize(m_cc_buttons); ++i) for (size_t i = 0; i < m_cc_buttons.size(); ++i)
{ {
cc.bt.hex |= (m_cc_buttons[i].is_checked) ? s_cc_buttons_bitmask[i] : 0; cc.bt.hex |= (m_cc_buttons[i].is_checked) ? s_cc_buttons_bitmask[i] : 0;
} }
@ -905,7 +904,7 @@ void TASInputDlg::GetValues(GCPadStatus* PadStatus)
PadStatus->triggerLeft = m_l.is_checked ? 255 : m_l_cont.value; PadStatus->triggerLeft = m_l.is_checked ? 255 : m_l_cont.value;
PadStatus->triggerRight = m_r.is_checked ? 255 : m_r_cont.value; PadStatus->triggerRight = m_r.is_checked ? 255 : m_r_cont.value;
for (unsigned int i = 0; i < ArraySize(m_buttons); ++i) for (size_t i = 0; i < m_buttons.size(); ++i)
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
{ {

10
Source/Core/DolphinWX/TASInputDlg.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <array>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/dcmemory.h> #include <wx/dcmemory.h>
#include <wx/dialog.h> #include <wx/dialog.h>
@ -124,10 +126,10 @@ private:
Stick m_cc_l_stick, m_cc_r_stick; Stick m_cc_l_stick, m_cc_r_stick;
Button* m_buttons[13]; std::array<Button*, 13> m_buttons;
Button m_cc_buttons[15]; std::array<Button, 15> m_cc_buttons;
Control* m_controls[10]; std::array<Control*, 10> m_controls;
Control* m_cc_controls[6]; std::array<Control*, 6> m_cc_controls;
u8 m_ext = 0; u8 m_ext = 0;
wxBoxSizer* m_main_szr; wxBoxSizer* m_main_szr;
wxBoxSizer* m_wiimote_szr; wxBoxSizer* m_wiimote_szr;