The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-01 21:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add const variables to skip type casting

Browse Source
This commit is contained in:
Travis Nickles 2019-02-09 11:30:06 -06:00
parent fc40e00846
commit 7631080d87
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DS4Windows/DS4Control/Mapping.cs
View File

@ -1517,10 +1517,11 @@ namespace DS4Windows
int tempOutControl = (int)tempMap.xoutput; int tempOutControl = (int)tempMap.xoutput;
if (tempMap.xoutput >= DS4Controls.LXNeg && tempMap.xoutput <= DS4Controls.RYPos) if (tempMap.xoutput >= DS4Controls.LXNeg && tempMap.xoutput <= DS4Controls.RYPos)
{ {
const byte axisDead = 128;
DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[tempOutControl]; DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[tempOutControl];
bool alt = controlType == DS4StateFieldMapping.ControlType.AxisDir && tempOutControl % 2 == 0 ? true : false; bool alt = controlType == DS4StateFieldMapping.ControlType.AxisDir && tempOutControl % 2 == 0 ? true : false;
byte axisMapping = getXYAxisMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping, alt); byte axisMapping = getXYAxisMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping, alt);
if (axisMapping != 128) if (axisMapping != axisDead)
{ {
int controlRelation = tempOutControl % 2 == 0 ? tempOutControl - 1 : tempOutControl + 1; int controlRelation = tempOutControl % 2 == 0 ? tempOutControl - 1 : tempOutControl + 1;
outputfieldMapping.axisdirs[tempOutControl] = axisMapping; outputfieldMapping.axisdirs[tempOutControl] = axisMapping;
@ -1531,8 +1532,9 @@ namespace DS4Windows
{ {
if (tempMap.xoutput == DS4Controls.L2 || tempMap.xoutput == DS4Controls.R2) if (tempMap.xoutput == DS4Controls.L2 || tempMap.xoutput == DS4Controls.R2)
{ {
const byte axisZero = 0;
byte axisMapping = getByteMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping); byte axisMapping = getByteMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping);
if (axisMapping != 0) if (axisMapping != axisZero)
outputfieldMapping.triggers[tempOutControl] = axisMapping; outputfieldMapping.triggers[tempOutControl] = axisMapping;
} }
else else