izzy/libultraship
0
0
Fork 0
mirror of https://github.com/izzy2lost/libultraship.git synced 2026-06-19 01:16:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

replace hardcoded uint16_t with CONTROLLERBUTTONS_T (#504)

Browse Source 
* replace hardcoded `uint16_t` with `CONTROLLERBUTTONS_T`

* clang format

* update `OSContPad`
This commit is contained in:
briaguya
2024-04-22 20:48:07 -04:00
committed by GitHub
parent a496a6f82a
commit e6626f520c
23 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libultraship/libultra/controller.h
+5 -1
View File
@@ -81,6 +81,10 @@
#define CONT_ADDR_CRC_ER 0x04
#define CONT_EEPROM_BUSY 0x80
#ifndef CONTROLLERBUTTONS_T
#define CONTROLLERBUTTONS_T uint16_t
#endif
/* Buttons */
#define BTN_CRIGHT 0x00001
#define BTN_CLEFT 0x00002
@@ -117,7 +121,7 @@ typedef struct {
} OSContStatus; // size = 0x04
typedef struct {
/* 0x00 */ uint16_t button;
/* 0x00 */ CONTROLLERBUTTONS_T button;
/* 0x02 */ int8_t stick_x;
/* 0x03 */ int8_t stick_y;
/* 0x04 */ uint8_t err_no;
src/Context.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ void Context::InitResourceManager(const std::vector<std::string>& otrFiles,
#endif
}
void Context::InitControlDeck(std::vector<uint16_t> additionalBitmasks) {
void Context::InitControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks) {
if (GetControlDeck() != nullptr) {
return;
}
src/Context.h
+1 -1
View File
@@ -59,7 +59,7 @@ class Context {
void InitConsoleVariables();
void InitResourceManager(const std::vector<std::string>& otrFiles = {},
const std::unordered_set<uint32_t>& validHashes = {}, uint32_t reservedThreadCount = 1);
void InitControlDeck(std::vector<uint16_t> additionalBitmasks = {});
void InitControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks = {});
void InitCrashHandler();
void InitAudio();
void InitGfxDebugger();
src/controller/controldeck/ControlDeck.cpp
+3 -2
View File
@@ -12,7 +12,8 @@
namespace LUS {
ControlDeck::ControlDeck(std::vector<uint16_t> additionalBitmasks) : mPads(nullptr), mSinglePlayerMappingMode(false) {
ControlDeck::ControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks)
: mPads(nullptr), mSinglePlayerMappingMode(false) {
for (int32_t i = 0; i < MAXCONTROLLERS; i++) {
mPorts.push_back(std::make_shared<ControlPort>(i, std::make_shared<Controller>(i, additionalBitmasks)));
}
@@ -20,7 +21,7 @@ ControlDeck::ControlDeck(std::vector<uint16_t> additionalBitmasks) : mPads(nullp
mDeviceIndexMappingManager = std::make_shared<LUSDeviceIndexMappingManager>();
}
ControlDeck::ControlDeck() : ControlDeck(std::vector<uint16_t>()) {
ControlDeck::ControlDeck() : ControlDeck(std::vector<CONTROLLERBUTTONS_T>()) {
}
ControlDeck::~ControlDeck() {
src/controller/controldeck/ControlDeck.h
+1 -1
View File
@@ -11,7 +11,7 @@ namespace LUS {
class ControlDeck {
public:
ControlDeck();
ControlDeck(std::vector<uint16_t> additionalBitmasks);
ControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks);
~ControlDeck();
void Init(uint8_t* controllerBits);
src/controller/controldevice/controller/Controller.cpp
+5 -4
View File
@@ -15,7 +15,8 @@
namespace LUS {
Controller::Controller(uint8_t portIndex, std::vector<uint16_t> additionalBitmasks) : ControlDevice(portIndex) {
Controller::Controller(uint8_t portIndex, std::vector<CONTROLLERBUTTONS_T> additionalBitmasks)
: ControlDevice(portIndex) {
for (auto bitmask : { BUTTON_BITMASKS }) {
mButtons[bitmask] = std::make_shared<ControllerButton>(portIndex, bitmask);
}
@@ -36,11 +37,11 @@ Controller::~Controller() {
SPDLOG_TRACE("destruct controller");
}
std::unordered_map<uint16_t, std::shared_ptr<ControllerButton>> Controller::GetAllButtons() {
std::unordered_map<CONTROLLERBUTTONS_T, std::shared_ptr<ControllerButton>> Controller::GetAllButtons() {
return mButtons;
}
std::shared_ptr<ControllerButton> Controller::GetButton(uint16_t bitmask) {
std::shared_ptr<ControllerButton> Controller::GetButton(CONTROLLERBUTTONS_T bitmask) {
return mButtons[bitmask];
}
@@ -209,7 +210,7 @@ bool Controller::HasMappingsForLUSDeviceIndex(LUSDeviceIndex lusIndex) {
return false;
}
std::shared_ptr<ControllerButton> Controller::GetButtonByBitmask(uint16_t bitmask) {
std::shared_ptr<ControllerButton> Controller::GetButtonByBitmask(CONTROLLERBUTTONS_T bitmask) {
return mButtons[bitmask];
}
src/controller/controldevice/controller/Controller.h
+5 -5
View File
@@ -23,7 +23,7 @@ namespace LUS {
class Controller : public ControlDevice {
public:
Controller(uint8_t portIndex);
Controller(uint8_t portIndex, std::vector<uint16_t> additionalBitmasks);
Controller(uint8_t portIndex, std::vector<CONTROLLERBUTTONS_T> additionalBitmasks);
~Controller();
void ReloadAllMappingsFromConfig();
@@ -35,9 +35,9 @@ class Controller : public ControlDevice {
void ClearAllMappings();
void ClearAllMappingsForDevice(LUSDeviceIndex lusDeviceIndex);
void AddDefaultMappings(LUSDeviceIndex lusDeviceIndex);
std::unordered_map<uint16_t, std::shared_ptr<ControllerButton>> GetAllButtons();
std::shared_ptr<ControllerButton> GetButtonByBitmask(uint16_t bitmask);
std::shared_ptr<ControllerButton> GetButton(uint16_t bitmask);
std::unordered_map<CONTROLLERBUTTONS_T, std::shared_ptr<ControllerButton>> GetAllButtons();
std::shared_ptr<ControllerButton> GetButtonByBitmask(CONTROLLERBUTTONS_T bitmask);
std::shared_ptr<ControllerButton> GetButton(CONTROLLERBUTTONS_T bitmask);
std::shared_ptr<ControllerStick> GetLeftStick();
std::shared_ptr<ControllerStick> GetRightStick();
std::shared_ptr<ControllerGyro> GetGyro();
@@ -59,7 +59,7 @@ class Controller : public ControlDevice {
void LoadButtonMappingFromConfig(std::string id);
void SaveButtonMappingIdsToConfig();
std::unordered_map<uint16_t, std::shared_ptr<ControllerButton>> mButtons;
std::unordered_map<CONTROLLERBUTTONS_T, std::shared_ptr<ControllerButton>> mButtons;
std::shared_ptr<ControllerStick> mLeftStick, mRightStick;
std::shared_ptr<ControllerGyro> mGyro;
std::shared_ptr<ControllerRumble> mRumble;
src/controller/controldevice/controller/ControllerButton.cpp
+5 -5
View File
@@ -10,7 +10,7 @@
#include <algorithm>
namespace LUS {
ControllerButton::ControllerButton(uint8_t portIndex, uint16_t bitmask)
ControllerButton::ControllerButton(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask)
: mPortIndex(portIndex), mBitmask(bitmask), mUseKeydownEventToCreateNewMapping(false),
mKeyboardScancodeForNewMapping(LUS_KB_UNKNOWN) {
}
@@ -18,7 +18,7 @@ ControllerButton::ControllerButton(uint8_t portIndex, uint16_t bitmask)
ControllerButton::~ControllerButton() {
}
std::string ControllerButton::GetConfigNameFromBitmask(uint16_t bitmask) {
std::string ControllerButton::GetConfigNameFromBitmask(CONTROLLERBUTTONS_T bitmask) {
switch (bitmask) {
case BTN_A:
return "A";
@@ -159,7 +159,7 @@ void ControllerButton::ClearAllButtonMappingsForDevice(LUSDeviceIndex lusDeviceI
SaveButtonMappingIdsToConfig();
}
void ControllerButton::UpdatePad(uint16_t& padButtons) {
void ControllerButton::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {
for (const auto& [id, mapping] : mButtonMappings) {
mapping->UpdatePad(padButtons);
}
@@ -171,7 +171,7 @@ bool ControllerButton::HasMappingsForLUSDeviceIndex(LUSDeviceIndex lusIndex) {
}
#ifdef __WIIU__
bool ControllerButton::AddOrEditButtonMappingFromRawPress(uint16_t bitmask, std::string id) {
bool ControllerButton::AddOrEditButtonMappingFromRawPress(CONTROLLERBUTTONS_T bitmask, std::string id) {
std::shared_ptr<ControllerButtonMapping> mapping =
ButtonMappingFactory::CreateButtonMappingFromWiiUInput(mPortIndex, bitmask);
@@ -203,7 +203,7 @@ void ControllerButton::AddDefaultMappings(LUSDeviceIndex lusDeviceIndex) {
SaveButtonMappingIdsToConfig();
}
#else
bool ControllerButton::AddOrEditButtonMappingFromRawPress(uint16_t bitmask, std::string id) {
bool ControllerButton::AddOrEditButtonMappingFromRawPress(CONTROLLERBUTTONS_T bitmask, std::string id) {
std::shared_ptr<ControllerButtonMapping> mapping = nullptr;
mUseKeydownEventToCreateNewMapping = true;
src/controller/controldevice/controller/ControllerButton.h
+5 -5
View File
@@ -15,7 +15,7 @@ namespace LUS {
class ControllerButton {
public:
ControllerButton(uint8_t portIndex, uint16_t bitmask);
ControllerButton(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask);
~ControllerButton();
std::shared_ptr<ControllerButtonMapping> GetButtonMappingById(std::string id);
@@ -32,9 +32,9 @@ class ControllerButton {
void ClearAllButtonMappings();
void ClearAllButtonMappingsForDevice(LUSDeviceIndex lusDeviceIndex);
bool AddOrEditButtonMappingFromRawPress(uint16_t bitmask, std::string id);
bool AddOrEditButtonMappingFromRawPress(CONTROLLERBUTTONS_T bitmask, std::string id);
void UpdatePad(uint16_t& padButtons);
void UpdatePad(CONTROLLERBUTTONS_T& padButtons);
#ifndef __WIIU__
bool ProcessKeyboardEvent(LUS::KbEventType eventType, LUS::KbScancode scancode);
@@ -44,9 +44,9 @@ class ControllerButton {
private:
uint8_t mPortIndex;
uint16_t mBitmask;
CONTROLLERBUTTONS_T mBitmask;
std::unordered_map<std::string, std::shared_ptr<ControllerButtonMapping>> mButtonMappings;
std::string GetConfigNameFromBitmask(uint16_t bitmask);
std::string GetConfigNameFromBitmask(CONTROLLERBUTTONS_T bitmask);
bool mUseKeydownEventToCreateNewMapping;
KbScancode mKeyboardScancodeForNewMapping;
src/controller/controldevice/controller/mapping/ControllerButtonMapping.cpp
+3 -2
View File
@@ -6,14 +6,15 @@
#include "public/bridge/consolevariablebridge.h"
namespace LUS {
ControllerButtonMapping::ControllerButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask)
ControllerButtonMapping::ControllerButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex,
CONTROLLERBUTTONS_T bitmask)
: ControllerInputMapping(lusDeviceIndex), mPortIndex(portIndex), mBitmask(bitmask) {
}
ControllerButtonMapping::~ControllerButtonMapping() {
}
uint16_t ControllerButtonMapping::GetBitmask() {
CONTROLLERBUTTONS_T ControllerButtonMapping::GetBitmask() {
return mBitmask;
}
src/controller/controldevice/controller/mapping/ControllerButtonMapping.h
+8 -4
View File
@@ -7,15 +7,19 @@
namespace LUS {
#ifndef CONTROLLERBUTTONS_T
#define CONTROLLERBUTTONS_T uint16_t
#endif
class ControllerButtonMapping : virtual public ControllerInputMapping {
public:
ControllerButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask);
ControllerButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, CONTROLLERBUTTONS_T bitmask);
~ControllerButtonMapping();
virtual std::string GetButtonMappingId() = 0;
uint16_t GetBitmask();
virtual void UpdatePad(uint16_t& padButtons) = 0;
CONTROLLERBUTTONS_T GetBitmask();
virtual void UpdatePad(CONTROLLERBUTTONS_T& padButtons) = 0;
virtual uint8_t GetMappingType();
void SetPortIndex(uint8_t portIndex);
@@ -24,6 +28,6 @@ class ControllerButtonMapping : virtual public ControllerInputMapping {
protected:
uint8_t mPortIndex;
uint16_t mBitmask;
CONTROLLERBUTTONS_T mBitmask;
};
} // namespace LUS
src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.cpp
+9 -8
View File
@@ -19,7 +19,8 @@ std::shared_ptr<ControllerButtonMapping> ButtonMappingFactory::CreateButtonMappi
const std::string mappingCvarKey = "gControllers.ButtonMappings." + id;
const std::string mappingClass =
CVarGetString(StringHelper::Sprintf("%s.ButtonMappingClass", mappingCvarKey.c_str()).c_str(), "");
uint16_t bitmask = CVarGetInteger(StringHelper::Sprintf("%s.Bitmask", mappingCvarKey.c_str()).c_str(), 0);
CONTROLLERBUTTONS_T bitmask =
CVarGetInteger(StringHelper::Sprintf("%s.Bitmask", mappingCvarKey.c_str()).c_str(), 0);
if (!bitmask) {
// all button mappings need bitmasks
CVarClear(mappingCvarKey.c_str());
@@ -99,7 +100,7 @@ std::shared_ptr<ControllerButtonMapping> ButtonMappingFactory::CreateButtonMappi
#ifdef __WIIU__
std::vector<std::shared_ptr<ControllerButtonMapping>>
ButtonMappingFactory::CreateDefaultWiiUButtonMappings(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex,
uint16_t bitmask) {
CONTROLLERBUTTONS_T bitmask) {
std::vector<std::shared_ptr<ControllerButtonMapping>> mappings;
auto wiiuIndexMapping = std::dynamic_pointer_cast<LUSDeviceIndexToWiiUDeviceIndexMapping>(
@@ -383,8 +384,8 @@ ButtonMappingFactory::CreateDefaultWiiUButtonMappings(LUSDeviceIndex lusDeviceIn
}
}
std::shared_ptr<ControllerButtonMapping> ButtonMappingFactory::CreateButtonMappingFromWiiUInput(uint8_t portIndex,
uint16_t bitmask) {
std::shared_ptr<ControllerButtonMapping>
ButtonMappingFactory::CreateButtonMappingFromWiiUInput(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask) {
for (auto [lusDeviceIndex, indexMapping] :
Context::GetInstance()->GetControlDeck()->GetDeviceIndexMappingManager()->GetAllDeviceIndexMappings()) {
auto wiiuIndexMapping = std::dynamic_pointer_cast<LUSDeviceIndexToWiiUDeviceIndexMapping>(indexMapping);
@@ -474,7 +475,7 @@ std::shared_ptr<ControllerButtonMapping> ButtonMappingFactory::CreateButtonMappi
}
#else
std::vector<std::shared_ptr<ControllerButtonMapping>>
ButtonMappingFactory::CreateDefaultKeyboardButtonMappings(uint8_t portIndex, uint16_t bitmask) {
ButtonMappingFactory::CreateDefaultKeyboardButtonMappings(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask) {
std::vector<std::shared_ptr<ControllerButtonMapping>> mappings;
switch (bitmask) {
@@ -535,7 +536,7 @@ ButtonMappingFactory::CreateDefaultKeyboardButtonMappings(uint8_t portIndex, uin
std::vector<std::shared_ptr<ControllerButtonMapping>>
ButtonMappingFactory::CreateDefaultSDLButtonMappings(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex,
uint16_t bitmask) {
CONTROLLERBUTTONS_T bitmask) {
std::vector<std::shared_ptr<ControllerButtonMapping>> mappings;
auto sdlIndexMapping = std::dynamic_pointer_cast<LUSDeviceIndexToSDLDeviceIndexMapping>(
@@ -625,8 +626,8 @@ ButtonMappingFactory::CreateDefaultSDLButtonMappings(LUSDeviceIndex lusDeviceInd
return mappings;
}
std::shared_ptr<ControllerButtonMapping> ButtonMappingFactory::CreateButtonMappingFromSDLInput(uint8_t portIndex,
uint16_t bitmask) {
std::shared_ptr<ControllerButtonMapping>
ButtonMappingFactory::CreateButtonMappingFromSDLInput(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask) {
std::unordered_map<LUSDeviceIndex, SDL_GameController*> sdlControllers;
std::shared_ptr<ControllerButtonMapping> mapping = nullptr;
for (auto [lusIndex, indexMapping] :
src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.h
+6 -6
View File
@@ -11,19 +11,19 @@ class ButtonMappingFactory {
static std::shared_ptr<ControllerButtonMapping> CreateButtonMappingFromConfig(uint8_t portIndex, std::string id);
#ifdef __WIIU__
static std::vector<std::shared_ptr<ControllerButtonMapping>>
CreateDefaultWiiUButtonMappings(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask);
CreateDefaultWiiUButtonMappings(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, CONTROLLERBUTTONS_T bitmask);
static std::shared_ptr<ControllerButtonMapping> CreateButtonMappingFromWiiUInput(uint8_t portIndex,
uint16_t bitmask);
CONTROLLERBUTTONS_T bitmask);
#else
static std::vector<std::shared_ptr<ControllerButtonMapping>> CreateDefaultKeyboardButtonMappings(uint8_t portIndex,
uint16_t bitmask);
static std::vector<std::shared_ptr<ControllerButtonMapping>>
CreateDefaultKeyboardButtonMappings(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask);
static std::vector<std::shared_ptr<ControllerButtonMapping>>
CreateDefaultSDLButtonMappings(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask);
CreateDefaultSDLButtonMappings(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, CONTROLLERBUTTONS_T bitmask);
static std::shared_ptr<ControllerButtonMapping> CreateButtonMappingFromSDLInput(uint8_t portIndex,
uint16_t bitmask);
CONTROLLERBUTTONS_T bitmask);
#endif
};
} // namespace LUS
src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToButtonMapping.cpp
+3 -2
View File
@@ -5,12 +5,13 @@
#include "Context.h"
namespace LUS {
KeyboardKeyToButtonMapping::KeyboardKeyToButtonMapping(uint8_t portIndex, uint16_t bitmask, KbScancode scancode)
KeyboardKeyToButtonMapping::KeyboardKeyToButtonMapping(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask,
KbScancode scancode)
: ControllerInputMapping(LUSDeviceIndex::Keyboard),
ControllerButtonMapping(LUSDeviceIndex::Keyboard, portIndex, bitmask), KeyboardKeyToAnyMapping(scancode) {
}
void KeyboardKeyToButtonMapping::UpdatePad(uint16_t& padButtons) {
void KeyboardKeyToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {
if (Context::GetInstance()->GetControlDeck()->KeyboardGameInputBlocked()) {
return;
}
src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToButtonMapping.h
+2 -2
View File
@@ -4,8 +4,8 @@
namespace LUS {
class KeyboardKeyToButtonMapping final : public KeyboardKeyToAnyMapping, public ControllerButtonMapping {
public:
KeyboardKeyToButtonMapping(uint8_t portIndex, uint16_t bitmask, KbScancode scancode);
void UpdatePad(uint16_t& padButtons) override;
KeyboardKeyToButtonMapping(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask, KbScancode scancode);
void UpdatePad(CONTROLLERBUTTONS_T& padButtons) override;
uint8_t GetMappingType() override;
std::string GetButtonMappingId() override;
void SaveToConfig() override;
src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.cpp
+2 -2
View File
@@ -7,13 +7,13 @@
namespace LUS {
SDLAxisDirectionToButtonMapping::SDLAxisDirectionToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex,
uint16_t bitmask, int32_t sdlControllerAxis,
CONTROLLERBUTTONS_T bitmask, int32_t sdlControllerAxis,
int32_t axisDirection)
: ControllerInputMapping(lusDeviceIndex), ControllerButtonMapping(lusDeviceIndex, portIndex, bitmask),
SDLAxisDirectionToAnyMapping(lusDeviceIndex, sdlControllerAxis, axisDirection) {
}
void SDLAxisDirectionToButtonMapping::UpdatePad(uint16_t& padButtons) {
void SDLAxisDirectionToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {
if (!ControllerLoaded()) {
return;
}
src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h
+2 -2
View File
@@ -4,9 +4,9 @@
namespace LUS {
class SDLAxisDirectionToButtonMapping final : public ControllerButtonMapping, public SDLAxisDirectionToAnyMapping {
public:
SDLAxisDirectionToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask,
SDLAxisDirectionToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, CONTROLLERBUTTONS_T bitmask,
int32_t sdlControllerAxis, int32_t axisDirection);
void UpdatePad(uint16_t& padButtons) override;
void UpdatePad(CONTROLLERBUTTONS_T& padButtons) override;
uint8_t GetMappingType() override;
std::string GetButtonMappingId() override;
void SaveToConfig() override;
src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.cpp
+3 -3
View File
@@ -6,13 +6,13 @@
#include "Context.h"
namespace LUS {
SDLButtonToButtonMapping::SDLButtonToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask,
int32_t sdlControllerButton)
SDLButtonToButtonMapping::SDLButtonToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex,
CONTROLLERBUTTONS_T bitmask, int32_t sdlControllerButton)
: ControllerInputMapping(lusDeviceIndex), ControllerButtonMapping(lusDeviceIndex, portIndex, bitmask),
SDLButtonToAnyMapping(lusDeviceIndex, sdlControllerButton) {
}
void SDLButtonToButtonMapping::UpdatePad(uint16_t& padButtons) {
void SDLButtonToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {
if (!ControllerLoaded()) {
return;
}
src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.h
+2 -2
View File
@@ -4,9 +4,9 @@
namespace LUS {
class SDLButtonToButtonMapping final : public SDLButtonToAnyMapping, public ControllerButtonMapping {
public:
SDLButtonToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask,
SDLButtonToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, CONTROLLERBUTTONS_T bitmask,
int32_t sdlControllerButton);
void UpdatePad(uint16_t& padButtons) override;
void UpdatePad(CONTROLLERBUTTONS_T& padButtons) override;
uint8_t GetMappingType() override;
std::string GetButtonMappingId() override;
void SaveToConfig() override;
src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToButtonMapping.cpp
+4 -3
View File
@@ -7,13 +7,14 @@
#include "Context.h"
namespace LUS {
WiiUButtonToButtonMapping::WiiUButtonToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex, uint16_t bitmask,
bool isNunchuk, bool isClassic, uint32_t wiiuControllerButton)
WiiUButtonToButtonMapping::WiiUButtonToButtonMapping(LUSDeviceIndex lusDeviceIndex, uint8_t portIndex,
CONTROLLERBUTTONS_T bitmask, bool isNunchuk, bool isClassic,
uint32_t wiiuControllerButton)
: ControllerInputMapping(lusDeviceIndex), ControllerButtonMapping(lusDeviceIndex, portIndex, bitmask),
WiiUButtonToAnyMapping(lusDeviceIndex, isNunchuk, isClassic, wiiuControllerButton) {
}
void WiiUButtonToButtonMapping::UpdatePad(uint16_t& padButtons) {
void WiiUButtonToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {
if (Context::GetInstance()->GetControlDeck()->GamepadGameInputBlocked()) {
return;
}

Some files were not shown because too many files have changed in this diff Show More