ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2021-02-24 21:26:24 +10:30
parent 9262e37c47 0a2756c163
commit 051532ce92
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Project64-input/DirectInput.cpp
View File

@ -423,20 +423,11 @@ void CDirectInput::GetAxis(N64CONTROLLER & Controller, BUTTONS * Keys)
if (Button.AxisID == AI_AXE_NEGATIVE)
{
fNegInput = !fNegInput;
b_Value = (l_Value <= -lDeadZoneValue);
if (b_Value)
{
l_Value = (long)((float)(l_Value + lDeadZoneValue) * fDeadZoneRelation);
}
b_Value = (l_Value < 0);
}
else
{
b_Value = (l_Value >= lDeadZoneValue);
if (b_Value)
{
l_Value = (long)((float)(l_Value - lDeadZoneValue) * fDeadZoneRelation);
}
b_Value = (l_Value > 0);
}
break;
case BTNTYPE_KEYBUTTON:
@ -478,11 +469,24 @@ void CDirectInput::GetAxis(N64CONTROLLER & Controller, BUTTONS * Keys)
}
}
long lAbsoluteX = (lAxisValueX > 0) ? lAxisValueX : -lAxisValueX;
long lAbsoluteY = (lAxisValueY > 0) ? lAxisValueY : -lAxisValueY;
if (lAbsoluteX * lAbsoluteX + lAbsoluteY * lAbsoluteY > lDeadZoneValue * lDeadZoneValue)
{
double dMagnitudeDiagonal = sqrt((double)lAbsoluteX * lAbsoluteX + (double)lAbsoluteY * lAbsoluteY);
double dRel = ((dMagnitudeDiagonal - lDeadZoneValue) / dMagnitudeDiagonal * fDeadZoneRelation);
lAxisValueX = (long)(lAxisValueX * dRel);
lAxisValueY = (long)(lAxisValueY * dRel);
}
else
{
lAxisValueX = lAxisValueY = 0;
}
if (Controller.RealN64Range && (lAxisValueX || lAxisValueY))
{
long lAbsoluteX = (lAxisValueX > 0) ? lAxisValueX : -lAxisValueX;
long lAbsoluteY = (lAxisValueY > 0) ? lAxisValueY : -lAxisValueY;
long lRangeX = lAbsoluteX > lAbsoluteY ? MAX_AXIS_VALUE : MAX_AXIS_VALUE * lAbsoluteX / lAbsoluteY;
long lRangeY = lAbsoluteX > lAbsoluteY ? MAX_AXIS_VALUE * lAbsoluteY / lAbsoluteX : MAX_AXIS_VALUE;