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

Add initial offset for mouse actions bound to analog sticks

Browse Source 
Use magic constant for now. Maybe this will be exposed as a setting
in the future
This commit is contained in:
Travis Nickles 2017-05-31 13:06:52 -07:00
parent 4a642db6e2
commit 5062e769ec
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DS4Windows/DS4Control/Mapping.cs
View File

@ -136,6 +136,7 @@ namespace DS4Windows
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; private const int MOUSESPEEDFACTOR = 40;
private const double MOUSESTICKOFFSET = 0.025;
public static void Commit(int device) public static void Commit(int device)
{ {
@ -2197,6 +2198,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(); long timeElapsed = ctrl.DS4Controllers[device].getLastTimeElapsed();
//double mouseOffset = 0.025;
if (controlType == DS4StateFieldMapping.ControlType.Button) if (controlType == DS4StateFieldMapping.ControlType.Button)
{ {
@ -2212,7 +2214,8 @@ namespace DS4Windows
if (cState.LX < 127 - deadzoneL) if (cState.LX < 127 - deadzoneL)
{ {
double diff = -(cState.LX - 127 - deadzoneL) / (double)(0 - 127 - deadzoneL); double diff = -(cState.LX - 127 - deadzoneL) / (double)(0 - 127 - deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.LX - 127 - deadzoneL) / 2550d * speed; //value = -(cState.LX - 127 - deadzoneL) / 2550d * speed;
} }
@ -2223,7 +2226,8 @@ namespace DS4Windows
if (cState.LX > 127 + deadzoneL) if (cState.LX > 127 + deadzoneL)
{ {
double diff = (cState.LX - 127 + deadzoneL) / (double)(255 - 127 + deadzoneL); double diff = (cState.LX - 127 + deadzoneL) / (double)(255 - 127 + deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.LX - 127 + deadzoneL) / 2550d * speed; //value = (cState.LX - 127 + deadzoneL) / 2550d * speed;
} }
@ -2234,7 +2238,8 @@ namespace DS4Windows
if (cState.RX < 127 - deadzoneR) if (cState.RX < 127 - deadzoneR)
{ {
double diff = -(cState.RX - 127 - deadzoneR) / (double)(0 - 127 - deadzoneR); double diff = -(cState.RX - 127 - deadzoneR) / (double)(0 - 127 - deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.RX - 127 - deadzoneR) / 2550d * speed; //value = -(cState.RX - 127 - deadzoneR) / 2550d * speed;
} }
@ -2245,7 +2250,8 @@ namespace DS4Windows
if (cState.RX > 127 + deadzoneR) if (cState.RX > 127 + deadzoneR)
{ {
double diff = (cState.RX - 127 + deadzoneR) / (double)(255 - 127 + deadzoneR); double diff = (cState.RX - 127 + deadzoneR) / (double)(255 - 127 + deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.RX - 127 + deadzoneR) / 2550d * speed; //value = (cState.RX - 127 + deadzoneR) / 2550d * speed;
} }
@ -2256,7 +2262,8 @@ namespace DS4Windows
if (cState.LY < 127 - deadzoneL) if (cState.LY < 127 - deadzoneL)
{ {
double diff = -(cState.LY - 127 - deadzoneL) / (double)(0 - 127 - deadzoneL); double diff = -(cState.LY - 127 - deadzoneL) / (double)(0 - 127 - deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.LY - 127 - deadzoneL) / 2550d * speed; //value = -(cState.LY - 127 - deadzoneL) / 2550d * speed;
} }
@ -2267,7 +2274,8 @@ namespace DS4Windows
if (cState.LY > 127 + deadzoneL) if (cState.LY > 127 + deadzoneL)
{ {
double diff = (cState.LY - 127 + deadzoneL) / (double)(255 - 127 + deadzoneL); double diff = (cState.LY - 127 + deadzoneL) / (double)(255 - 127 + deadzoneL);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.LY - 127 + deadzoneL) / 2550d * speed; //value = (cState.LY - 127 + deadzoneL) / 2550d * speed;
} }
@ -2278,7 +2286,8 @@ namespace DS4Windows
if (cState.RY < 127 - deadzoneR) if (cState.RY < 127 - deadzoneR)
{ {
double diff = -(cState.RY - 127 - deadzoneR) / (double)(0 - 127 - deadzoneR); double diff = -(cState.RY - 127 - deadzoneR) / (double)(0 - 127 - deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = -(cState.RY - 127 - deadzoneR) / 2550d * speed; //value = -(cState.RY - 127 - deadzoneR) / 2550d * speed;
} }
@ -2289,7 +2298,8 @@ namespace DS4Windows
if (cState.RY > 127 + deadzoneR) if (cState.RY > 127 + deadzoneR)
{ {
double diff = (cState.RY - 127 + deadzoneR) / (double)(255 - 127 + deadzoneR); double diff = (cState.RY - 127 + deadzoneR) / (double)(255 - 127 + deadzoneR);
value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed; value = ((speed * MOUSESPEEDFACTOR * (timeElapsed * 0.001)) - MOUSESTICKOFFSET) * diff + MOUSESTICKOFFSET;
//value = diff * MOUSESPEEDFACTOR * (timeElapsed * 0.001) * speed;
//value = (cState.RY - 127 + deadzoneR) / 2550d * speed; //value = (cState.RY - 127 + deadzoneR) / 2550d * speed;
} }