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

SDL: Deduplicate Motor logic with templates.

Browse Source
This commit is contained in:
Jordan Woyak
2024-03-14 21:10:21 -05:00
parent 0fff8374d0
commit 0538366326
1 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -115,38 +115,30 @@ private:
}; };
// Rumble // Rumble
class Motor : public Output template <int LowEnable, int HighEnable, int SuffixIndex>
class GenericMotor : public Output
{ {
public: public:
explicit Motor(SDL_GameController* gc) : m_gc(gc) {} explicit GenericMotor(SDL_GameController* gc) : m_gc(gc) {}
std::string GetName() const override; std::string GetName() const override
void SetState(ControlState state) override; {
return std::string("Motor") + motor_suffixes[SuffixIndex];
}
void SetState(ControlState state) override
{
Uint16 rumble = state * std::numeric_limits<Uint16>::max();
SDL_GameControllerRumble(m_gc, rumble * LowEnable, rumble * HighEnable, RUMBLE_LENGTH_MS);
}
private: private:
SDL_GameController* const m_gc; SDL_GameController* const m_gc;
}; };
class MotorL : public Output static constexpr const char* motor_suffixes[] = {"", " L", " R"};
{
public:
explicit MotorL(SDL_GameController* gc) : m_gc(gc) {}
std::string GetName() const override;
void SetState(ControlState state) override;
private: using Motor = GenericMotor<1, 1, 0>;
SDL_GameController* const m_gc; using MotorL = GenericMotor<1, 0, 1>;
}; using MotorR = GenericMotor<0, 1, 2>;
class MotorR : public Output
{
public:
explicit MotorR(SDL_GameController* gc) : m_gc(gc) {}
std::string GetName() const override;
void SetState(ControlState state) override;
private:
SDL_GameController* const m_gc;
};
class HapticEffect : public Output class HapticEffect : public Output
{ {
@ -764,39 +756,6 @@ GameController::~GameController()
SDL_JoystickClose(m_joystick); SDL_JoystickClose(m_joystick);
} }
std::string GameController::Motor::GetName() const
{
return "Motor";
}
void GameController::Motor::SetState(ControlState state)
{
Uint16 rumble = state * std::numeric_limits<Uint16>::max();
SDL_GameControllerRumble(m_gc, rumble, rumble, std::numeric_limits<Uint32>::max());
}
std::string GameController::MotorL::GetName() const
{
return "Motor L";
}
void GameController::MotorL::SetState(ControlState state)
{
Uint16 rumble = state * std::numeric_limits<Uint16>::max();
SDL_GameControllerRumble(m_gc, rumble, 0, std::numeric_limits<Uint32>::max());
}
std::string GameController::MotorR::GetName() const
{
return "Motor R";
}
void GameController::MotorR::SetState(ControlState state)
{
Uint16 rumble = state * std::numeric_limits<Uint16>::max();
SDL_GameControllerRumble(m_gc, 0, rumble, std::numeric_limits<Uint32>::max());
}
void InputBackend::UpdateInput(std::vector<std::weak_ptr<ciface::Core::Device>>& devices_to_remove) void InputBackend::UpdateInput(std::vector<std::weak_ptr<ciface::Core::Device>>& devices_to_remove)
{ {
SDL_GameControllerUpdate(); SDL_GameControllerUpdate();