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

Merge pull request #810 from lioncash/controller-interface

Browse Source 
InputCommon: Don't base default radius of analog sticks off of their name
This commit is contained in:
Pierre Bourdon
2014-08-24 19:58:25 +02:00
parent ebf1b98106 7fd5e4300a
commit 9ff7125786
11 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/InputCommon/ControllerEmu.cpp
View File

@ -137,18 +137,14 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
ctrlGroup->SaveConfig(sec, defdev, base);
}
ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(_name, GROUP_TYPE_STICK)
ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
: ControlGroup(_name, GROUP_TYPE_STICK)
{
for (auto& named_direction : named_directions)
controls.emplace_back(new Input(named_direction));
controls.emplace_back(new Input(_trans("Modifier")));
// Default to 100 radius for everything but gcpad.
if (name == "Stick" || name == "Left Stick" || name == "Right Stick")
settings.emplace_back(new Setting(_trans("Radius"), 1.0f, 0, 100));
else
settings.emplace_back(new Setting(_trans("Radius"), 0.7f, 0, 100));
settings.emplace_back(new Setting(_trans("Radius"), default_radius, 0, 100));
settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
}

3
Source/Core/InputCommon/ControllerEmu.h
View File

@ -148,7 +148,8 @@ public:
class AnalogStick : public ControlGroup
{
public:
AnalogStick(const char* const _name);
// The GameCube controller and Wiimote attachments have a different default radius
AnalogStick(const char* const _name, ControlState default_radius);
void GetState(double* const x, double* const y)
{