The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-25 10:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reuse Touch instances for DS4Touchpad rather than creating new instances

Browse Source
This commit is contained in:
Travis Nickles 2017-12-22 02:31:14 -06:00
parent 9e9349ed1c
commit 09e5d20bb0
2 changed files with 88 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
DS4Windows/DS4Library/DS4Touchpad.cs
View File

@ -28,10 +28,15 @@ namespace DS4Windows
public class Touch public class Touch
{ {
public readonly int hwX, hwY, deltaX, deltaY; public int hwX, hwY, deltaX, deltaY;
public readonly byte touchID; public byte touchID;
public readonly Touch previousTouch; public Touch previousTouch;
public Touch(int X, int Y, byte tID, Touch prevTouch = null) internal Touch(int X, int Y, byte tID, Touch prevTouch = null)
{
populate(X, Y, tID, prevTouch);
}
internal void populate(int X, int Y, byte tID, Touch prevTouch = null)
{ {
hwX = X; hwX = X;
hwY = Y; hwY = Y;
@ -62,6 +67,15 @@ namespace DS4Windows
internal bool lastIsActive1, lastIsActive2; internal bool lastIsActive1, lastIsActive2;
internal byte lastTouchID1, lastTouchID2; internal byte lastTouchID1, lastTouchID2;
internal byte[] previousPacket = new byte[8]; internal byte[] previousPacket = new byte[8];
private Touch tPrev0, tPrev1, t0, t1;
public DS4Touchpad()
{
tPrev0 = new Touch(0, 0, 0);
tPrev1 = new Touch(0, 0, 0);
t0 = new Touch(0, 0, 0);
t1 = new Touch(0, 0, 0);
}
// We check everything other than the not bothering with not-very-useful TouchPacketCounter. // We check everything other than the not bothering with not-very-useful TouchPacketCounter.
private bool PacketChanged(byte[] data, int touchPacketOffset) private bool PacketChanged(byte[] data, int touchPacketOffset)
@ -105,40 +119,54 @@ namespace DS4Windows
if (TouchesBegan != null) if (TouchesBegan != null)
{ {
if (sensors.Touch1 && sensors.Touch2) if (sensors.Touch1 && sensors.Touch2)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX1, currentY1, touchID1), new Touch(currentX2, currentY2, touchID2)); {
t0.populate(currentX1, currentY1, touchID1); t1.populate(currentX2, currentY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0, t1);
}
else if (sensors.Touch1) else if (sensors.Touch1)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX1, currentY1, touchID1)); {
t0.populate(currentX1, currentY1, touchID1);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
else else
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX2, currentY2, touchID2)); {
t0.populate(currentX2, currentY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
TouchesBegan(this, args); TouchesBegan(this, args);
} }
} }
else if (sensors.Touch1 == lastIsActive1 && sensors.Touch2 == lastIsActive2 && TouchesMoved != null) else if (sensors.Touch1 == lastIsActive1 && sensors.Touch2 == lastIsActive2 && TouchesMoved != null)
{ {
Touch tPrev, t0, t1; Touch currentT0, currentT1;
if (sensors.Touch1 && sensors.Touch2) if (sensors.Touch1 && sensors.Touch2)
{ {
tPrev = new Touch(lastTouchPadX1, lastTouchPadY1, lastTouchID1); tPrev0.populate(lastTouchPadX1, lastTouchPadY1, lastTouchID1);
t0 = new Touch(currentX1, currentY1, touchID1, tPrev); t0.populate(currentX1, currentY1, touchID1, tPrev0);
tPrev = new Touch(lastTouchPadX2, lastTouchPadY2, lastTouchID2); currentT0 = t0;
t1 = new Touch(currentX2, currentY2, touchID2, tPrev);
tPrev1.populate(lastTouchPadX2, lastTouchPadY2, lastTouchID2);
t1.populate(currentX2, currentY2, touchID2, tPrev1);
currentT1 = t1;
} }
else if (sensors.Touch1) else if (sensors.Touch1)
{ {
tPrev = new Touch(lastTouchPadX1, lastTouchPadY1, lastTouchID1); tPrev0.populate(lastTouchPadX1, lastTouchPadY1, lastTouchID1);
t0 = new Touch(currentX1, currentY1, touchID1, tPrev); t0.populate(currentX1, currentY1, touchID1, tPrev0);
t1 = null; currentT0 = t0;
currentT1 = null;
} }
else else
{ {
tPrev = new Touch(lastTouchPadX2, lastTouchPadY2, lastTouchID2); tPrev0.populate(lastTouchPadX2, lastTouchPadY2, lastTouchID2);
t0 = new Touch(currentX2, currentY2, touchID2, tPrev); t0.populate(currentX2, currentY2, touchID2, tPrev0);
t1 = null; currentT0 = t0;
currentT1 = null;
} }
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0, t1); args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, currentT0, currentT1);
TouchesMoved(this, args); TouchesMoved(this, args);
} }
@ -146,22 +174,42 @@ namespace DS4Windows
if (!lastTouchPadIsDown && touchPadIsDown && TouchButtonDown != null) if (!lastTouchPadIsDown && touchPadIsDown && TouchButtonDown != null)
{ {
if (sensors.Touch1 && sensors.Touch2) if (sensors.Touch1 && sensors.Touch2)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX1, currentY1, touchID1), new Touch(currentX2, currentY2, touchID2)); {
t0.populate(currentX1, currentY1, touchID1);
t1.populate(currentX2, currentY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0, t1);
}
else if (sensors.Touch1) else if (sensors.Touch1)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX1, currentY1, touchID1)); {
t0.populate(currentX1, currentY1, touchID1);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
else else
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX2, currentY2, touchID2)); {
t0.populate(currentX2, currentY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
TouchButtonDown(this, args); TouchButtonDown(this, args);
} }
else if (lastTouchPadIsDown && !touchPadIsDown && TouchButtonUp != null) else if (lastTouchPadIsDown && !touchPadIsDown && TouchButtonUp != null)
{ {
if (sensors.Touch1 && sensors.Touch2) if (sensors.Touch1 && sensors.Touch2)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX1, currentY1, touchID1), new Touch(currentX2, currentY2, touchID2)); {
t0.populate(currentX1, currentY1, touchID1);
t1.populate(currentX2, currentY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0, t1);
}
else if (sensors.Touch1) else if (sensors.Touch1)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX1, currentY1, touchID1)); {
t0.populate(currentX1, currentY1, touchID1);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
else else
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(currentX2, currentY2, touchID2)); {
t0.populate(currentX2, currentY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
TouchButtonUp(this, args); TouchButtonUp(this, args);
} }
@ -195,11 +243,21 @@ namespace DS4Windows
if ((lastIsActive1 || lastIsActive2) && TouchesEnded != null) if ((lastIsActive1 || lastIsActive2) && TouchesEnded != null)
{ {
if (lastIsActive1 && lastIsActive2) if (lastIsActive1 && lastIsActive2)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(lastTouchPadX1, lastTouchPadY1, touchID1), new Touch(lastTouchPadX2, lastTouchPadY2, touchID2)); {
t0.populate(lastTouchPadX1, lastTouchPadY1, touchID1);
t1.populate(lastTouchPadX2, lastTouchPadY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0, t1);
}
else if (lastIsActive1) else if (lastIsActive1)
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(lastTouchPadX1, lastTouchPadY1, touchID1)); {
t0.populate(lastTouchPadX1, lastTouchPadY1, touchID1);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
else else
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, new Touch(lastTouchPadX2, lastTouchPadY2, touchID2)); {
t0.populate(lastTouchPadX2, lastTouchPadY2, touchID2);
args = new TouchpadEventArgs(sensors.ReportTimeStamp, sensors.TouchButton, t0);
}
TouchesEnded(this, args); TouchesEnded(this, args);
} }

4
TODO.md
View File

@ -12,8 +12,8 @@ Currently used to delay hotplug routine
* Attempt to remove more unused components * Attempt to remove more unused components
* ~~Tweak layout of some forms~~ * ~~Tweak layout of some forms~~
* Look into updating HidLibrary * Look into updating HidLibrary
* Trim code execution for touchpad data. Remove unneeded new calls for Touch * ~~Trim code execution for touchpad data. Remove unneeded new calls for Touch
instances. Make permanent instances and reuse those instances. instances. Make permanent instances and reuse those instances.~~
* Tweak SixAxis code to attempt to improve steering wheel performance * Tweak SixAxis code to attempt to improve steering wheel performance
for racing games. It is already a better experience than what the Steam for racing games. It is already a better experience than what the Steam
Controller offers though. Controller offers though.