kraken: Address comments from review
Fix compiler bug
This commit is contained in:
parent
f4e5f89e6f
commit
42949738f2
17 changed files with 54 additions and 66 deletions
|
@ -69,7 +69,7 @@ private:
|
|||
libusb_device_handle* handle{};
|
||||
};
|
||||
|
||||
GCAdapter::GCAdapter(const std::string input_engine_) : InputEngine(input_engine_) {
|
||||
GCAdapter::GCAdapter(const std::string& input_engine_) : InputEngine(input_engine_) {
|
||||
if (usb_adapter_handle) {
|
||||
return;
|
||||
}
|
||||
|
@ -486,42 +486,30 @@ std::string GCAdapter::GetUIButtonName(const Common::ParamPackage& params) const
|
|||
switch (button) {
|
||||
case PadButton::ButtonLeft:
|
||||
return "left";
|
||||
break;
|
||||
case PadButton::ButtonRight:
|
||||
return "right";
|
||||
break;
|
||||
case PadButton::ButtonDown:
|
||||
return "down";
|
||||
break;
|
||||
case PadButton::ButtonUp:
|
||||
return "up";
|
||||
break;
|
||||
case PadButton::TriggerZ:
|
||||
return "Z";
|
||||
break;
|
||||
case PadButton::TriggerR:
|
||||
return "R";
|
||||
break;
|
||||
case PadButton::TriggerL:
|
||||
return "L";
|
||||
break;
|
||||
case PadButton::ButtonA:
|
||||
return "A";
|
||||
break;
|
||||
case PadButton::ButtonB:
|
||||
return "B";
|
||||
break;
|
||||
case PadButton::ButtonX:
|
||||
return "X";
|
||||
break;
|
||||
case PadButton::ButtonY:
|
||||
return "Y";
|
||||
break;
|
||||
case PadButton::ButtonStart:
|
||||
return "start";
|
||||
break;
|
||||
default:
|
||||
return "Unkown GC";
|
||||
return "Unknown GC";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ class LibUSBDeviceHandle;
|
|||
|
||||
class GCAdapter : public InputCommon::InputEngine {
|
||||
public:
|
||||
explicit GCAdapter(const std::string input_engine_);
|
||||
explicit GCAdapter(const std::string& input_engine_);
|
||||
~GCAdapter();
|
||||
|
||||
Common::Input::VibrationError SetRumble(
|
||||
|
|
|
@ -24,7 +24,7 @@ constexpr PadIdentifier identifier = {
|
|||
.pad = 0,
|
||||
};
|
||||
|
||||
Mouse::Mouse(const std::string input_engine_) : InputEngine(input_engine_) {
|
||||
Mouse::Mouse(const std::string& input_engine_) : InputEngine(input_engine_) {
|
||||
PreSetController(identifier);
|
||||
PreSetAxis(identifier, mouse_axis_x);
|
||||
PreSetAxis(identifier, mouse_axis_y);
|
||||
|
|
|
@ -29,7 +29,7 @@ enum class MouseButton {
|
|||
*/
|
||||
class Mouse final : public InputCommon::InputEngine {
|
||||
public:
|
||||
explicit Mouse(const std::string input_engine_);
|
||||
explicit Mouse(const std::string& input_engine_);
|
||||
|
||||
/**
|
||||
* Signals that mouse has moved.
|
||||
|
|
|
@ -929,7 +929,7 @@ std::string SDLDriver::GetHatButtonName(u8 direction_value) const {
|
|||
}
|
||||
}
|
||||
|
||||
u8 SDLDriver::GetHatButtonId(const std::string direction_name) const {
|
||||
u8 SDLDriver::GetHatButtonId(const std::string& direction_name) const {
|
||||
Uint8 direction;
|
||||
if (direction_name == "up") {
|
||||
direction = SDL_HAT_UP;
|
||||
|
|
|
@ -56,7 +56,7 @@ public:
|
|||
std::string GetUIName(const Common::ParamPackage& params) const override;
|
||||
|
||||
std::string GetHatButtonName(u8 direction_value) const override;
|
||||
u8 GetHatButtonId(const std::string direction_name) const override;
|
||||
u8 GetHatButtonId(const std::string& direction_name) const override;
|
||||
|
||||
Common::Input::VibrationError SetRumble(
|
||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus vibration) override;
|
||||
|
|
|
@ -47,7 +47,7 @@ constexpr std::array<std::pair<std::string_view, TasButton>, 20> text_to_tas_but
|
|||
{"KEY_ZR", TasButton::TRIGGER_ZR},
|
||||
};
|
||||
|
||||
Tas::Tas(const std::string input_engine_) : InputCommon::InputEngine(input_engine_) {
|
||||
Tas::Tas(const std::string& input_engine_) : InputCommon::InputEngine(input_engine_) {
|
||||
for (size_t player_index = 0; player_index < PLAYER_NUMBER; player_index++) {
|
||||
PadIdentifier identifier{
|
||||
.guid = Common::UUID{},
|
||||
|
|
|
@ -83,7 +83,7 @@ enum class TasState {
|
|||
|
||||
class Tas final : public InputCommon::InputEngine {
|
||||
public:
|
||||
explicit Tas(const std::string input_engine_);
|
||||
explicit Tas(const std::string& input_engine_);
|
||||
~Tas();
|
||||
|
||||
/**
|
||||
|
|
|
@ -13,7 +13,7 @@ constexpr PadIdentifier identifier = {
|
|||
.pad = 0,
|
||||
};
|
||||
|
||||
TouchScreen::TouchScreen(const std::string input_engine_) : InputEngine(input_engine_) {
|
||||
TouchScreen::TouchScreen(const std::string& input_engine_) : InputEngine(input_engine_) {
|
||||
PreSetController(identifier);
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ namespace InputCommon {
|
|||
*/
|
||||
class TouchScreen final : public InputCommon::InputEngine {
|
||||
public:
|
||||
explicit TouchScreen(const std::string input_engine_);
|
||||
explicit TouchScreen(const std::string& input_engine_);
|
||||
|
||||
/**
|
||||
* Signals that mouse has moved.
|
||||
|
|
|
@ -300,8 +300,8 @@ void InputEngine::TriggerOnMotionChange(const PadIdentifier& identifier, int mot
|
|||
if (!configuring || !mapping_callback.on_data) {
|
||||
return;
|
||||
}
|
||||
if (std::abs(value.gyro_x) < 1.0f && std::abs(value.gyro_y) < 1.0f &&
|
||||
std::abs(value.gyro_z) < 1.0f) {
|
||||
if (std::abs(value.gyro_x) < 0.6f && std::abs(value.gyro_y) < 0.6f &&
|
||||
std::abs(value.gyro_z) < 0.6f) {
|
||||
return;
|
||||
}
|
||||
mapping_callback.on_data(MappingData{
|
||||
|
|
|
@ -166,7 +166,7 @@ public:
|
|||
};
|
||||
|
||||
/// Retrieves the index number of the given hat button direction
|
||||
virtual u8 GetHatButtonId([[maybe_unused]] const std::string direction_name) const {
|
||||
virtual u8 GetHatButtonId([[maybe_unused]] const std::string& direction_name) const {
|
||||
return 0;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue