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

Re-added extra default axis mapping pass

Browse Source 
Related to issue #579
This commit is contained in:
Travis Nickles 2019-02-15 18:04:09 -06:00
parent 688bc01916
commit 5b19dc76cd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DS4Windows/DS4Control/Mapping.cs
View File

@ -1506,6 +1506,15 @@ namespace DS4Windows
resetToDefaultValue2(dcs.control, MappedState, outputfieldMapping); resetToDefaultValue2(dcs.control, MappedState, outputfieldMapping);
} }
} }
else
{
DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[(int)dcs.control];
if (controlType == DS4StateFieldMapping.ControlType.AxisDir)
//if (dcs.control > DS4Controls.None && dcs.control < DS4Controls.L1)
{
customMapQueue[device].Enqueue(new ControlToXInput(dcs.control, dcs.control));
}
}
} }
Queue<ControlToXInput> tempControl = customMapQueue[device]; Queue<ControlToXInput> tempControl = customMapQueue[device];
@ -3371,9 +3380,9 @@ namespace DS4Windows
private static byte getXYAxisMapping2(int device, DS4Controls control, DS4State cState, private static byte getXYAxisMapping2(int device, DS4Controls control, DS4State cState,
DS4StateExposed eState, Mouse tp, DS4StateFieldMapping fieldMap, bool alt = false) DS4StateExposed eState, Mouse tp, DS4StateFieldMapping fieldMap, bool alt = false)
{ {
const byte falseVal = 128;
byte result = 0; byte result = 0;
byte trueVal = 0; byte trueVal = 0;
byte falseVal = 128;
if (alt) if (alt)
trueVal = 255; trueVal = 255;
@ -3391,11 +3400,11 @@ namespace DS4Windows
switch (control) switch (control)
{ {
case DS4Controls.LXNeg: if (!alt) result = cState.LX; else result = (byte)(255 - cState.LX); break; case DS4Controls.LXNeg: if (!alt) result = axisValue < falseVal ? axisValue : falseVal; else result = axisValue < falseVal ? (byte)(255 - axisValue) : falseVal; break;
case DS4Controls.LYNeg: if (!alt) result = cState.LY; else result = (byte)(255 - cState.LY); break; case DS4Controls.LYNeg: if (!alt) result = axisValue < falseVal ? axisValue : falseVal; else result = axisValue < falseVal ? (byte)(255 - axisValue) : falseVal; break;
case DS4Controls.RXNeg: if (!alt) result = cState.RX; else result = (byte)(255 - cState.RX); break; case DS4Controls.RXNeg: if (!alt) result = axisValue < falseVal ? axisValue : falseVal; else result = axisValue < falseVal ? (byte)(255 - axisValue) : falseVal; break;
case DS4Controls.RYNeg: if (!alt) result = cState.RY; else result = (byte)(255 - cState.RY); break; case DS4Controls.RYNeg: if (!alt) result = axisValue < falseVal ? axisValue : falseVal; else result = axisValue < falseVal ? (byte)(255 - axisValue) : falseVal; break;
default: if (!alt) result = (byte)(255 - axisValue); else result = axisValue; break; default: if (!alt) result = axisValue > falseVal ? (byte)(255 - axisValue) : falseVal; else result = axisValue > falseVal ? axisValue : falseVal; break;
} }
} }
else if (controlType == DS4StateFieldMapping.ControlType.Trigger) else if (controlType == DS4StateFieldMapping.ControlType.Trigger)