mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-07 00:28:56 +00:00
nJoy: Fixed the radius adjustment
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3717 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
8fa315879a
commit
a718ff266e
6 changed files with 39 additions and 38 deletions
|
@ -447,18 +447,12 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
|
|||
// Check if we should make adjustments
|
||||
if (PadMapping[_numPAD].bSquareToCircle)
|
||||
{
|
||||
std::vector<int> main_xy = InputCommon::Square2Circle(i_main_stick_x, i_main_stick_y, _numPAD, PadMapping[_numPAD].SDiagonal);
|
||||
i_main_stick_x = main_xy.at(0);
|
||||
i_main_stick_y = main_xy.at(1);
|
||||
InputCommon::Square2Circle(i_main_stick_x, i_main_stick_y, _numPAD, PadMapping[_numPAD].SDiagonal);
|
||||
}
|
||||
// Radius adjustment
|
||||
if (PadMapping[_numPAD].bRadiusOnOff)
|
||||
{
|
||||
// Get the manually configured diagonal distance
|
||||
int Tmp = atoi (PadMapping[_numPAD].SRadius.substr(0, PadMapping[_numPAD].SRadius.length() - 1).c_str());
|
||||
float Radius = Tmp / 100.0f;
|
||||
i_main_stick_x = (int)((float)i_main_stick_x * Radius);
|
||||
i_main_stick_y = (int)((float)i_main_stick_y * Radius);
|
||||
InputCommon::RadiusAdjustment(i_main_stick_x, i_main_stick_y, _numPAD, PadMapping[_numPAD].SRadius);
|
||||
}
|
||||
|
||||
// Convert axis values
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue