The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-11 15:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure analog to analog controls work as expected

Browse Source
This commit is contained in:
Travis Nickles 2017-04-15 11:16:13 -07:00
parent 269ca4782f
commit efeaf852ac
1 changed files with 91 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
DS4Windows/DS4Control/Mapping.cs
View File

@ -1167,7 +1167,7 @@ namespace DS4Windows
DS4Controls dc = tempControlDict[key]; DS4Controls dc = tempControlDict[key];
//DS4Controls key = entry.Key; //DS4Controls key = entry.Key;
//DS4Controls dc = entry.Value; //DS4Controls dc = entry.Value;
if (getBoolActionMapping(device, dc, cState, eState, tp)) if (getBoolActionMapping(device, dc, cState, eState, tp, true))
{ {
if (key >= DS4Controls.Square && key <= DS4Controls.Cross) if (key >= DS4Controls.Square && key <= DS4Controls.Cross)
{ {
@ -2506,7 +2506,8 @@ namespace DS4Windows
return result; return result;
} }
public static bool getBoolActionMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState, Mouse tp) public static bool getBoolActionMapping(int device, DS4Controls control,
DS4State cState, DS4StateExposed eState, Mouse tp, bool analog=false)
{ {
bool result = false; bool result = false;
@ -2551,58 +2552,122 @@ namespace DS4Windows
{ {
case DS4Controls.LXNeg: case DS4Controls.LXNeg:
{ {
double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.LX < 127 && (angle >= 210 && angle <= 330); double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.LX < 127 && (angle >= 210 && angle <= 330);
}
else
{
result = cState.LX < 127;
}
break; break;
} }
case DS4Controls.LYNeg: case DS4Controls.LYNeg:
{ {
double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.LY < 127 && (angle >= 300 || angle <= 60); double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.LY < 127 && (angle >= 300 || angle <= 60);
}
else
{
result = cState.LY < 127;
}
break; break;
} }
case DS4Controls.RXNeg: case DS4Controls.RXNeg:
{ {
double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.RX < 127 && (angle >= 210 && angle <= 330); double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.RX < 127 && (angle >= 210 && angle <= 330);
}
else
{
result = cState.RX < 127;
}
break; break;
} }
case DS4Controls.RYNeg: case DS4Controls.RYNeg:
{ {
double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.RY < 127 && (angle >= 300 || angle <= 60); double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.RY < 127 && (angle >= 300 || angle <= 60);
}
else
{
result = cState.RY < 127;
}
break; break;
} }
case DS4Controls.LXPos: case DS4Controls.LXPos:
{ {
double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.LX > 127 && (angle >= 30 && angle <= 150); double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.LX > 127 && (angle >= 30 && angle <= 150);
}
else
{
result = cState.LX > 127;
}
break; break;
} }
case DS4Controls.LYPos: case DS4Controls.LYPos:
{ {
double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.LY > 127 && (angle >= 120 && angle <= 240); double angle = Math.Atan2((cState.LX - 127), -(cState.LY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.LY > 127 && (angle >= 120 && angle <= 240);
}
else
{
result = cState.LY > 127;
}
break; break;
} }
case DS4Controls.RXPos: case DS4Controls.RXPos:
{ {
double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.RX > 127 && (angle >= 30 && angle <= 150); double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.RX > 127 && (angle >= 30 && angle <= 150);
}
else
{
result = cState.RX > 127;
}
break; break;
} }
case DS4Controls.RYPos: case DS4Controls.RYPos:
{ {
double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127)); if (!analog)
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI; {
result = cState.RY > 127 && (angle >= 120 && angle <= 240); double angle = Math.Atan2((cState.RX - 127), -(cState.RY - 127));
angle = (angle >= 0 ? angle : (2 * Math.PI + angle)) * 180 / Math.PI;
result = cState.RY > 127 && (angle >= 120 && angle <= 240);
}
else
{
result = cState.RY > 127;
}
break; break;
} }
default: break; default: break;