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

nJoy: Added radius option to advanced settings

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3716 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-07-09 00:48:07 +00:00
parent 1c52139d94
commit 8fa315879a
8 changed files with 86 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -451,6 +451,15 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
i_main_stick_x = main_xy.at(0);
i_main_stick_y = main_xy.at(1);
}
// 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);
}
// Convert axis values
u8 main_stick_x = InputCommon::Pad_Convert(i_main_stick_x);
@ -570,19 +579,24 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
// ----------------------
// Debugging
/*
/*
// Show the status of all connected pads
// if ((LastPad == 0 && _numPAD == 0) || _numPAD < LastPad) Console::ClearScreen();
ConsoleListener* Console = LogManager::GetInstance()->getConsoleListener();
if ((LastPad == 0 && _numPAD == 0) || _numPAD < LastPad) Console->ClearScreen();
LastPad = _numPAD;
// Console::ClearScreen();
INFO_LOG(CONSOLE,
// Console->ClearScreen();
int X = _pPADStatus->stickX - 128, Y = _pPADStatus->stickY - 128;
NOTICE_LOG(CONSOLE,
"Pad | Number:%i Enabled:%i Handle:%i\n"
"Stick | X:%03i Y:%03i R:%3.0f\n"
"Trigger | StatusL:%04x StatusR:%04x TriggerL:%04x TriggerR:%04x TriggerValue:%i\n"
"Buttons | Overall:%i A:%i X:%i\n"
"======================================================\n",
_numPAD, PadMapping[_numPAD].enabled, PadState[_numPAD].joy,
X, Y, sqrt((float)(X*X + Y*Y)),
_pPADStatus->triggerLeft, _pPADStatus->triggerRight, TriggerLeft, TriggerRight, TriggerValue,
_pPADStatus->button,