Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-10-09 21:42:02 -05:00
commit 48265c750e
4 changed files with 15 additions and 16 deletions

View File

@ -779,28 +779,28 @@ namespace DS4Windows
if (absX <= 0.4) if (absX <= 0.4)
{ {
outputX = 0.46 * absX; outputX = 0.47 * absX;
} }
else if (absX <= 0.75) else if (absX <= 0.75)
{ {
outputX = absX - 0.216; outputX = absX - 0.212;
} }
else if (absX > 0.75) else if (absX > 0.75)
{ {
outputX = (absX * 1.8634) - 0.8634; outputX = (absX * 1.848) - 0.848;
} }
if (absY <= 0.4) if (absY <= 0.4)
{ {
outputY = 0.46 * absY; outputY = 0.47 * absY;
} }
else if (absY <= 0.75) else if (absY <= 0.75)
{ {
outputY = absY - 0.216; outputY = absY - 0.212;
} }
else if (absY > 0.75) else if (absY > 0.75)
{ {
outputY = (absY * 1.8634) - 0.8634; outputY = (absY * 1.848) - 0.848;
} }
dState.LX = (byte)(outputX * signX * 127.5 + 127.5); dState.LX = (byte)(outputX * signX * 127.5 + 127.5);
@ -839,28 +839,28 @@ namespace DS4Windows
if (absX <= 0.4) if (absX <= 0.4)
{ {
outputX = 0.46 * absX; outputX = 0.47 * absX;
} }
else if (absX <= 0.75) else if (absX <= 0.75)
{ {
outputX = absX - 0.216; outputX = absX - 0.212;
} }
else if (absX > 0.75) else if (absX > 0.75)
{ {
outputX = (absX * 1.8634) - 0.8634; outputX = (absX * 1.848) - 0.848;
} }
if (absY <= 0.4) if (absY <= 0.4)
{ {
outputY = 0.46 * absY; outputY = 0.47 * absY;
} }
else if (absY <= 0.75) else if (absY <= 0.75)
{ {
outputY = absY - 0.216; outputY = absY - 0.212;
} }
else if (absY > 0.75) else if (absY > 0.75)
{ {
outputY = (absY * 1.8634) - 0.8634; outputY = (absY * 1.848) - 0.848;
} }
dState.RX = (byte)(outputX * signX * 127.5 + 127.5); dState.RX = (byte)(outputX * signX * 127.5 + 127.5);

View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.8")] [assembly: AssemblyVersion("1.5.9")]
[assembly: AssemblyFileVersion("1.5.8")] [assembly: AssemblyFileVersion("1.5.9")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]

View File

@ -12,8 +12,6 @@ website at [ds4windows.com](http://ds4windows.com).
## Downloads ## Downloads
- **[Main builds of DS4Windows](https://github.com/Ryochan7/DS4Windows/releases)** - **[Main builds of DS4Windows](https://github.com/Ryochan7/DS4Windows/releases)**
- Alternative builds:
- [UdpServer ViGEm build](http://ryochan7.xyz/ds4windows/test/DS4Windows_1.5.8_ViGEm_UdpServer_x64.zip)
## Requirements ## Requirements

View File

@ -1,6 +1,7 @@
Travis Nickles (Ryochan7) Travis Nickles (Ryochan7)
Korney Czukowski (czukowski) Korney Czukowski (czukowski)
jdfeng jdfeng
justalemon
Rajko Stojadinovic (rajkosto) Rajko Stojadinovic (rajkosto)
Yuki-nyan Yuki-nyan