AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-14 07:51:20 +00:00
Code Issues Projects Releases Wiki Activity

ControlMapper: Use std::array where applicable

Browse Source
This commit is contained in:
Lioncash 2019-10-01 02:02:57 -04:00
parent dc565969e6
commit f0186e7ceb
1 changed files with 194 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Runtime/Input/ControlMapper.cpp
View File

@ -1,12 +1,16 @@
#include "../RetroTypes.hpp" #include "Runtime/Input/ControlMapper.hpp"
#include "ControlMapper.hpp"
#include "CFinalInput.hpp" #include <array>
#include "DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp" #include "DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp"
#include "../GameGlobalObjects.hpp"
#include "Runtime/GameGlobalObjects.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Input/CFinalInput.hpp"
namespace urde { namespace urde {
namespace {
static const char* skCommandDescs[] = { constexpr std::array skCommandDescs{
"Forward", "Backward", "Turn Left", "Forward", "Backward", "Turn Left",
"Turn Right", "Strafe Left", "Strafe Right", "Turn Right", "Strafe Left", "Strafe Right",
"Look Left", "Look Right", "Look Up", "Look Left", "Look Right", "Look Up",
@ -32,7 +36,8 @@ static const char* skCommandDescs[] = {
"Next Pause Screen", "UNKNOWN", "None", "Next Pause Screen", "UNKNOWN", "None",
}; };
static const char* skFunctionDescs[] = {"None", constexpr std::array skFunctionDescs{
"None",
"Left Stick Up", "Left Stick Up",
"Left Stick Down", "Left Stick Down",
"Left Stick Left", "Left Stick Left",
@ -54,12 +59,14 @@ static const char* skFunctionDescs[] = {"None",
"Z Button", "Z Button",
"Left Trigger Press", "Left Trigger Press",
"Right Trigger Press", "Right Trigger Press",
"Start"}; "Start",
};
typedef bool (CFinalInput::*BoolReturnFn)() const; using BoolReturnFn = bool (CFinalInput::*)() const;
typedef float (CFinalInput::*FloatReturnFn)() const; using FloatReturnFn = float (CFinalInput::*)() const;
static BoolReturnFn skPressFuncs[] = {nullptr, constexpr std::array<BoolReturnFn, 24> skPressFuncs{
nullptr,
&CFinalInput::PLAUp, &CFinalInput::PLAUp,
&CFinalInput::PLADown, &CFinalInput::PLADown,
&CFinalInput::PLALeft, &CFinalInput::PLALeft,
@ -82,9 +89,11 @@ static BoolReturnFn skPressFuncs[] = {nullptr,
&CFinalInput::PL, &CFinalInput::PL,
&CFinalInput::PR, &CFinalInput::PR,
&CFinalInput::PStart, &CFinalInput::PStart,
nullptr}; nullptr,
};
static BoolReturnFn skDigitalFuncs[] = {nullptr, constexpr std::array<BoolReturnFn, 24> skDigitalFuncs{
nullptr,
&CFinalInput::DLAUp, &CFinalInput::DLAUp,
&CFinalInput::DLADown, &CFinalInput::DLADown,
&CFinalInput::DLALeft, &CFinalInput::DLALeft,
@ -107,9 +116,11 @@ static BoolReturnFn skDigitalFuncs[] = {nullptr,
&CFinalInput::DL, &CFinalInput::DL,
&CFinalInput::DR, &CFinalInput::DR,
&CFinalInput::DStart, &CFinalInput::DStart,
nullptr}; nullptr,
};
static FloatReturnFn skAnalogFuncs[] = {nullptr, constexpr std::array<FloatReturnFn, 24> skAnalogFuncs{
nullptr,
&CFinalInput::ALAUp, &CFinalInput::ALAUp,
&CFinalInput::ALADown, &CFinalInput::ALADown,
&CFinalInput::ALALeft, &CFinalInput::ALALeft,
@ -132,9 +143,10 @@ static FloatReturnFn skAnalogFuncs[] = {nullptr,
&CFinalInput::AL, &CFinalInput::AL,
&CFinalInput::AR, &CFinalInput::AR,
&CFinalInput::AStart, &CFinalInput::AStart,
nullptr}; nullptr,
};
static const ControlMapper::EKBMFunctionList skKBMMapping[] = { constexpr std::array<ControlMapper::EKBMFunctionList, 70> skKBMMapping{
ControlMapper::EKBMFunctionList::KeyPress + 'w', // Forward, ControlMapper::EKBMFunctionList::KeyPress + 'w', // Forward,
ControlMapper::EKBMFunctionList::KeyPress + 's', // Backward, ControlMapper::EKBMFunctionList::KeyPress + 's', // Backward,
ControlMapper::EKBMFunctionList::KeyPress + 'a', // TurnLeft, ControlMapper::EKBMFunctionList::KeyPress + 'a', // TurnLeft,
@ -204,17 +216,16 @@ static const ControlMapper::EKBMFunctionList skKBMMapping[] = {
ControlMapper::EKBMFunctionList::KeyPress + 'e', // NextPauseScreen = 0x42, ControlMapper::EKBMFunctionList::KeyPress + 'e', // NextPauseScreen = 0x42,
ControlMapper::EKBMFunctionList::None, // UNKNOWN, ControlMapper::EKBMFunctionList::None, // UNKNOWN,
ControlMapper::EKBMFunctionList::None, // None, ControlMapper::EKBMFunctionList::None, // None,
ControlMapper::EKBMFunctionList::None ControlMapper::EKBMFunctionList::None,
}; };
#define kCommandFilterCount 67 std::array<bool, 67> skCommandFilterFlag{true};
static bool skCommandFilterFlag[kCommandFilterCount] = {true}; } // Anonymous namespace
void ControlMapper::SetCommandFiltered(ECommands cmd, bool filtered) { skCommandFilterFlag[size_t(cmd)] = filtered; } void ControlMapper::SetCommandFiltered(ECommands cmd, bool filtered) { skCommandFilterFlag[size_t(cmd)] = filtered; }
void ControlMapper::ResetCommandFilters() { void ControlMapper::ResetCommandFilters() {
for (int i = 0; i < kCommandFilterCount; ++i) skCommandFilterFlag.fill(true);
skCommandFilterFlag[i] = true;
} }
bool ControlMapper::GetPressInput(ECommands cmd, const CFinalInput& input) { bool ControlMapper::GetPressInput(ECommands cmd, const CFinalInput& input) {