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

Change mouse actions for LS and RS to take poll time into account

Browse Source 
Make sure speed stays consistent no matter which connection
type is used
This commit is contained in:
Travis Nickles 2017-05-31 00:47:13 -07:00
parent 0086b953e3
commit 4a642db6e2
1 changed files with 72 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
DS4Windows/DS4Control/Mapping.cs
View File

@ -135,6 +135,7 @@ namespace DS4Windows
public static int mouseaccel = 0; public static int mouseaccel = 0;
public static int prevmouseaccel = 0; public static int prevmouseaccel = 0;
private static double horizontalRemainder = 0.0, verticalRemainder = 0.0; private static double horizontalRemainder = 0.0, verticalRemainder = 0.0;
private const int MOUSESPEEDFACTOR = 40;
public static void Commit(int device) public static void Commit(int device)
{ {
@ -1042,7 +1043,7 @@ namespace DS4Windows
{ {
if (tempMouseDeltaY == 0) if (tempMouseDeltaY == 0)
{ {
tempMouseDeltaY = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 0); tempMouseDeltaY = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 0, ctrl);
tempMouseDeltaY = -Math.Abs((tempMouseDeltaY == -2147483648 ? 0 : tempMouseDeltaY)); tempMouseDeltaY = -Math.Abs((tempMouseDeltaY == -2147483648 ? 0 : tempMouseDeltaY));
} }
@ -1052,7 +1053,7 @@ namespace DS4Windows
{ {
if (tempMouseDeltaY == 0) if (tempMouseDeltaY == 0)
{ {
tempMouseDeltaY = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 1); tempMouseDeltaY = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 1, ctrl);
tempMouseDeltaY = Math.Abs((tempMouseDeltaY == -2147483648 ? 0 : tempMouseDeltaY)); tempMouseDeltaY = Math.Abs((tempMouseDeltaY == -2147483648 ? 0 : tempMouseDeltaY));
} }
@ -1062,7 +1063,7 @@ namespace DS4Windows
{ {
if (tempMouseDeltaX == 0) if (tempMouseDeltaX == 0)
{ {
tempMouseDeltaX = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 2); tempMouseDeltaX = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 2, ctrl);
tempMouseDeltaX = -Math.Abs((tempMouseDeltaX == -2147483648 ? 0 : tempMouseDeltaX)); tempMouseDeltaX = -Math.Abs((tempMouseDeltaX == -2147483648 ? 0 : tempMouseDeltaX));
} }
@ -1072,7 +1073,7 @@ namespace DS4Windows
{ {
if (tempMouseDeltaX == 0) if (tempMouseDeltaX == 0)
{ {
tempMouseDeltaX = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 3); tempMouseDeltaX = getMouseMapping(device, dcs.control, cState, eState, fieldMapping, 3, ctrl);
tempMouseDeltaX = Math.Abs((tempMouseDeltaX == -2147483648 ? 0 : tempMouseDeltaX)); tempMouseDeltaX = Math.Abs((tempMouseDeltaX == -2147483648 ? 0 : tempMouseDeltaX));
} }
@ -2176,7 +2177,7 @@ namespace DS4Windows
} }
private static double getMouseMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState, private static double getMouseMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState,
DS4StateFieldMapping fieldMapping, int mnum) DS4StateFieldMapping fieldMapping, int mnum, ControlService ctrl)
{ {
int controlnum = DS4ControltoInt(control); int controlnum = DS4ControltoInt(control);
@ -2195,6 +2196,7 @@ namespace DS4Windows
int controlNum = (int)control; int controlNum = (int)control;
DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[controlNum]; DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[controlNum];
long timeElapsed = ctrl.DS4Controllers[device].getLastTimeElapsed();
if (controlType == DS4StateFieldMapping.ControlType.Button) if (controlType == DS4StateFieldMapping.ControlType.Button)
{ {
@ -2206,37 +2208,94 @@ namespace DS4Windows
switch (control) switch (control)
{ {
case DS4Controls.LXNeg: case DS4Controls.LXNeg:
{
if (cState.LX < 127 - deadzoneL) if (cState.LX < 127 - deadzoneL)
value = -(cState.LX - 127 - deadzoneL) / 2550d * speed; {
double diff = -(cState.LX - 127 - deadzoneL) / (double)(0 - 127 - deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.LX - 127 - deadzoneL) / 2550d * speed;
}
break; break;
}
case DS4Controls.LXPos: case DS4Controls.LXPos:
{
if (cState.LX > 127 + deadzoneL) if (cState.LX > 127 + deadzoneL)
value = (cState.LX - 127 + deadzoneL) / 2550d * speed; {
double diff = (cState.LX - 127 + deadzoneL) / (double)(255 - 127 + deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.LX - 127 + deadzoneL) / 2550d * speed;
}
break; break;
}
case DS4Controls.RXNeg: case DS4Controls.RXNeg:
{
if (cState.RX < 127 - deadzoneR) if (cState.RX < 127 - deadzoneR)
value = -(cState.RX - 127 - deadzoneR) / 2550d * speed; {
double diff = -(cState.RX - 127 - deadzoneR) / (double)(0 - 127 - deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.RX - 127 - deadzoneR) / 2550d * speed;
}
break; break;
}
case DS4Controls.RXPos: case DS4Controls.RXPos:
{
if (cState.RX > 127 + deadzoneR) if (cState.RX > 127 + deadzoneR)
value = (cState.RX - 127 + deadzoneR) / 2550d * speed; {
double diff = (cState.RX - 127 + deadzoneR) / (double)(255 - 127 + deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.RX - 127 + deadzoneR) / 2550d * speed;
}
break; break;
}
case DS4Controls.LYNeg: case DS4Controls.LYNeg:
{
if (cState.LY < 127 - deadzoneL) if (cState.LY < 127 - deadzoneL)
value = -(cState.LY - 127 - deadzoneL) / 2550d * speed; {
double diff = -(cState.LY - 127 - deadzoneL) / (double)(0 - 127 - deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.LY - 127 - deadzoneL) / 2550d * speed;
}
break; break;
}
case DS4Controls.LYPos: case DS4Controls.LYPos:
{
if (cState.LY > 127 + deadzoneL) if (cState.LY > 127 + deadzoneL)
value = (cState.LY - 127 + deadzoneL) / 2550d * speed; {
double diff = (cState.LY - 127 + deadzoneL) / (double)(255 - 127 + deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.LY - 127 + deadzoneL) / 2550d * speed;
}
break; break;
}
case DS4Controls.RYNeg: case DS4Controls.RYNeg:
{
if (cState.RY < 127 - deadzoneR) if (cState.RY < 127 - deadzoneR)
value = -(cState.RY - 127 - deadzoneR) / 2550d * speed; {
double diff = -(cState.RY - 127 - deadzoneR) / (double)(0 - 127 - deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.RY - 127 - deadzoneR) / 2550d * speed;
}
break; break;
}
case DS4Controls.RYPos: case DS4Controls.RYPos:
{
if (cState.RY > 127 + deadzoneR) if (cState.RY > 127 + deadzoneR)
value = (cState.RY - 127 + deadzoneR) / 2550d * speed; {
double diff = (cState.RY - 127 + deadzoneR) / (double)(255 - 127 + deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.RY - 127 + deadzoneR) / 2550d * speed;
}
break; break;
}
default: break; default: break;
} }
} }