Permalink
Browse files

Version 1.4.3

Complete rehaul of the profile settings, bigger workspace to edit
controls, and all the settings are on the side now
Added option to change the lightbar color, regardless of the profile's
lightbar setting (useful for using one profile on the same controller).
to change click the colored button beside edit in the main tab
Can now set the Gyro as an 1:1 absolute mouse, in this mode the mouse
now moves as the controller is moved
Removed the experimental exclusive connection button if on the newest
Windows 10 build (1511/TH2)
Finally updated all the translations and added some new ones (such as
Chinese and Polish, the translations sheets have been merged to one so
it's easier for me to update
  • Loading branch information...
1 parent 3680b6b commit 8d9f69db44c4f9a73c451637358e4365a1f2e63c @Jays2Kings committed Nov 28, 2015
Showing with 82,096 additions and 49,352 deletions.
  1. +1,030 −0 .vs/config/applicationhost.config
  2. +61 −60 DS4Windows/DS4Control/ControlSerivce.cs
  3. +29 −25 DS4Windows/DS4Control/DS4LightBar.cs
  4. +1 −0 DS4Windows/DS4Control/ITouchpadBehaviour.cs
  5. +113 −110 DS4Windows/DS4Control/Mapping.cs
  6. +43 −0 DS4Windows/DS4Control/Mouse.cs
  7. +47 −0 DS4Windows/DS4Control/MouseCursor.cs
  8. +56 −1 DS4Windows/DS4Control/ScpUtil.cs
  9. 0 DS4Windows/{DS4Windows → DS4Forms}/AdvancedColorDialog.cs
  10. 0 DS4Windows/{DS4Windows → DS4Forms}/AdvancedComboBox.cs
  11. 0 DS4Windows/{DS4Windows → DS4Forms}/Alreadyrunning.Designer.cs
  12. 0 DS4Windows/{DS4Windows → DS4Forms}/Alreadyrunning.cs
  13. 0 DS4Windows/{DS4Windows → DS4Forms}/Alreadyrunning.resx
  14. +214 −53 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.Designer.cs
  15. +65 −6 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.cs
  16. +191 −161 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.de-DE.resx
  17. +7,062 −0 DS4Windows/DS4Forms/DS4Form.es.resx
  18. +7,086 −0 DS4Windows/DS4Forms/DS4Form.fr-FR.resx
  19. +173 −92 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.it-IT.resx
  20. +6,978 −0 DS4Windows/DS4Forms/DS4Form.pl.resx
  21. +170 −107 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.pt-BR.resx
  22. +8,891 −8,187 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.resx
  23. +181 −145 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.ro-RO.resx
  24. +164 −92 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.ru-RU.resx
  25. +195 −150 DS4Windows/{DS4Windows → DS4Forms}/DS4Form.tr.resx
  26. +7,026 −0 DS4Windows/DS4Forms/DS4Form.zh-Hans.resx
  27. +342 −0 DS4Windows/DS4Forms/DS4Form.zh-Hant.resx
  28. +2 −2 DS4Windows/{DS4Windows → DS4Forms}/DS4Keyboard.Designer.cs
  29. +1 −1 DS4Windows/{DS4Windows → DS4Forms}/DS4Keyboard.cs
  30. 0 DS4Windows/{DS4Windows → DS4Forms}/DS4Keyboard.resx
  31. BIN DS4Windows/{DS4Windows → DS4Forms}/DS4W.ico
  32. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.Designer.cs
  33. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.cs
  34. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.de-DE.resx
  35. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.es.resx
  36. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.fr-FR.resx
  37. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.it-IT.resx
  38. +129 −0 DS4Windows/DS4Forms/DupBox.pl.resx
  39. +1 −1 DS4Windows/{DS4Windows → DS4Forms}/DupBox.pt-BR.resx
  40. +1 −1 DS4Windows/{DS4Windows → DS4Forms}/DupBox.resx
  41. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.ro-RO.resx
  42. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.ru-RU.resx
  43. 0 DS4Windows/{DS4Windows → DS4Forms}/DupBox.tr.resx
  44. +129 −0 DS4Windows/DS4Forms/DupBox.zh-Hans.resx
  45. +129 −0 DS4Windows/DS4Forms/DupBox.zh-Hant.resx
  46. 0 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.Designer.cs
  47. 0 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.cs
  48. +4 −1 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.de-DE.resx
  49. +7 −17 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.es.resx
  50. +5 −2 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.fr-FR.resx
  51. +6 −16 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.it-IT.resx
  52. +138 −0 DS4Windows/DS4Forms/Hotkeys.pl.resx
  53. +9 −16 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.pt-BR.resx
  54. +18 −18 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.resx
  55. +3 −0 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.ro-RO.resx
  56. +2 −18 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.ru-RU.resx
  57. +9 −35 DS4Windows/{DS4Windows → DS4Forms}/Hotkeys.tr.resx
  58. +157 −0 DS4Windows/DS4Forms/Hotkeys.zh-Hans.resx
  59. +157 −0 DS4Windows/DS4Forms/Hotkeys.zh-Hant.resx
  60. +2 −3 DS4Windows/{DS4Windows → DS4Forms}/KBM360.Designer.cs
  61. 0 DS4Windows/{DS4Windows → DS4Forms}/KBM360.cs
  62. +43 −26 DS4Windows/{DS4Windows → DS4Forms}/KBM360.de-DE.resx
  63. +3,752 −0 DS4Windows/DS4Forms/KBM360.es.resx
  64. +40 −45 DS4Windows/{DS4Windows/KBM360.ro-RO.resx → DS4Forms/KBM360.fr-FR.resx}
  65. +36 −18 DS4Windows/{DS4Windows → DS4Forms}/KBM360.it-IT.resx
  66. +49 −37 DS4Windows/{DS4Windows/KBM360.fr-FR.resx → DS4Forms/KBM360.pl.resx}
  67. +35 −20 DS4Windows/{DS4Windows → DS4Forms}/KBM360.pt-BR.resx
  68. +1,310 −768 DS4Windows/{DS4Windows → DS4Forms}/KBM360.resx
  69. +3,764 −0 DS4Windows/DS4Forms/KBM360.ro-RO.resx
  70. +61 −40 DS4Windows/{DS4Windows → DS4Forms}/KBM360.ru-RU.resx
  71. +45 −22 DS4Windows/{DS4Windows → DS4Forms}/KBM360.tr.resx
  72. +3,768 −0 DS4Windows/DS4Forms/KBM360.zh-Hans.resx
  73. +3,759 −0 DS4Windows/DS4Forms/KBM360.zh-Hant.resx
  74. +3,310 −1,786 DS4Windows/{DS4Windows → DS4Forms}/Options.Designer.cs
  75. +688 −313 DS4Windows/{DS4Windows → DS4Forms}/Options.cs
  76. +230 −326 DS4Windows/{DS4Windows → DS4Forms}/Options.de-DE.resx
  77. +557 −0 DS4Windows/DS4Forms/Options.es.resx
  78. +545 −0 DS4Windows/DS4Forms/Options.fr-FR.resx
  79. +512 −0 DS4Windows/DS4Forms/Options.it-IT.resx
  80. +322 −0 DS4Windows/DS4Forms/Options.pl.resx
  81. +542 −0 DS4Windows/DS4Forms/Options.pt-BR.resx
  82. +9,150 −4,914 DS4Windows/{DS4Windows → DS4Forms}/Options.resx
  83. +555 −0 DS4Windows/DS4Forms/Options.ro-RO.resx
  84. +580 −0 DS4Windows/DS4Forms/Options.ru-RU.resx
  85. +196 −246 DS4Windows/{DS4Windows → DS4Forms}/Options.tr.resx
  86. +565 −0 DS4Windows/DS4Forms/Options.zh-Hans.resx
  87. +590 −0 DS4Windows/DS4Forms/Options.zh-Hant.resx
  88. 0 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.Designer.cs
  89. +4 −2 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.cs
  90. +6 −7 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.de-DE.resx
  91. 0 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.es.resx
  92. +3 −0 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.fr-FR.resx
  93. 0 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.it-IT.resx
  94. +176 −0 DS4Windows/DS4Forms/RecordBox.pl.resx
  95. +8 −2 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.pt-BR.resx
  96. +4 −4 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.resx
  97. +6 −0 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.ro-RO.resx
  98. +3 −4 DS4Windows/{DS4Windows → DS4Forms}/RecordBox.ru-RU.resx
  99. +168 −0 DS4Windows/DS4Forms/RecordBox.tr.resx
  100. +168 −0 DS4Windows/DS4Forms/RecordBox.zh-Hans.resx
  101. +168 −0 DS4Windows/DS4Forms/RecordBox.zh-Hant.resx
  102. 0 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.Designer.cs
  103. 0 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.cs
  104. +5 −2 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.de-DE.resx
  105. +135 −0 DS4Windows/DS4Forms/SaveWhere.es.resx
  106. 0 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.fr-FR.resx
  107. +3 −0 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.it-IT.resx
  108. +145 −0 DS4Windows/DS4Forms/SaveWhere.pl.resx
  109. +1 −2 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.pt-BR.resx
  110. +57 −30 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.resx
  111. +4 −2 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.ro-RO.resx
  112. 0 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.ru-RU.resx
  113. +12 −23 DS4Windows/{DS4Windows → DS4Forms}/SaveWhere.tr.resx
  114. +151 −0 DS4Windows/DS4Forms/SaveWhere.zh-Hans.resx
  115. +141 −0 DS4Windows/DS4Forms/SaveWhere.zh-Hant.resx
  116. 0 DS4Windows/{DS4Windows → DS4Forms}/Settings.cs
  117. 0 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.Designer.cs
  118. +7 −0 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.cs
  119. +9 −6 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.de-DE.resx
  120. +1 −4 DS4Windows/{DS4Windows/SaveWhere.es.resx → DS4Forms/SpecActions.es.resx}
  121. +15 −0 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.fr-FR.resx
  122. +14 −5 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.it-IT.resx
  123. +180 −0 DS4Windows/DS4Forms/SpecActions.pl.resx
  124. +29 −5 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.pt-BR.resx
  125. +23 −23 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.resx
  126. +3 −0 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.ro-RO.resx
  127. +2 −2 DS4Windows/{DS4Windows → DS4Forms}/SpecActions.ru-RU.resx
  128. +201 −0 DS4Windows/DS4Forms/SpecActions.tr.resx
  129. +198 −0 DS4Windows/DS4Forms/SpecActions.zh-Hans.resx
  130. +198 −0 DS4Windows/DS4Forms/SpecActions.zh-Hant.resx
  131. 0 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.Designer.cs
  132. 0 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.cs
  133. +5 −5 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.de-DE.resx
  134. +6 −0 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.es.resx
  135. +6 −3 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.fr-FR.resx
  136. 0 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.it-IT.resx
  137. +165 −0 DS4Windows/DS4Forms/WelcomeDialog.pl.resx
  138. +3 −3 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.pt-BR.resx
  139. 0 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.resx
  140. 0 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.ro-RO.resx
  141. +1 −1 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.ru-RU.resx
  142. +14 −47 DS4Windows/{DS4Windows → DS4Forms}/WelcomeDialog.tr.resx
  143. +157 −0 DS4Windows/DS4Forms/WelcomeDialog.zh-Hans.resx
  144. +157 −0 DS4Windows/DS4Forms/WelcomeDialog.zh-Hant.resx
  145. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.Designer.cs
  146. +1 −2 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.cs
  147. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.de-DE.resx
  148. +5 −5 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.es.resx
  149. +3 −3 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.fr-FR.resx
  150. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.it-IT.resx
  151. +165 −0 DS4Windows/DS4Forms/WinProgs.pl.resx
  152. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.pt-BR.resx
  153. +2 −2 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.resx
  154. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.ro-RO.resx
  155. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.ru-RU.resx
  156. 0 DS4Windows/{DS4Windows → DS4Forms}/WinProgs.tr.resx
  157. +165 −0 DS4Windows/DS4Forms/WinProgs.zh-Hans.resx
  158. +165 −0 DS4Windows/DS4Forms/WinProgs.zh-Hant.resx
  159. 0 DS4Windows/{DS4Windows → DS4Forms}/app.config
  160. +48 −4 DS4Windows/DS4Library/DS4Device.cs
  161. +108 −0 DS4Windows/DS4Library/DS4Sixaxis.cs
  162. +8 −8 DS4Windows/DS4Library/DS4StateExposed.cs
  163. +245 −121 DS4Windows/DS4Windows.csproj
  164. +0 −6,978 DS4Windows/DS4Windows/DS4Form.es.resx
  165. +0 −6,965 DS4Windows/DS4Windows/DS4Form.fr-FR.resx
  166. +0 −6,762 DS4Windows/DS4Windows/DS4Form.quz-PE.resx
  167. +0 −3,681 DS4Windows/DS4Windows/KBM360.es.resx
  168. +0 −561 DS4Windows/DS4Windows/Options.es.resx
  169. +0 −777 DS4Windows/DS4Windows/Options.fr-FR.resx
  170. +0 −689 DS4Windows/DS4Windows/Options.it-IT.resx
  171. +0 −712 DS4Windows/DS4Windows/Options.pt-BR.resx
  172. +0 −903 DS4Windows/DS4Windows/Options.ro-RO.resx
  173. +0 −977 DS4Windows/DS4Windows/Options.ru-RU.resx
  174. +0 −250 DS4Windows/DS4Windows/RecordBox.tr.resx
  175. +0 −1,543 DS4Windows/DS4Windows/SpecActions.tr.resx
  176. +2 −1 DS4Windows/Program.cs
  177. +2 −2 DS4Windows/Properties/AssemblyInfo.cs
  178. +248 −9 DS4Windows/Properties/Resources.Designer.cs
  179. +78 −73 DS4Windows/Properties/Resources.de-DE.resx
  180. +193 −55 DS4Windows/Properties/Resources.es.resx
  181. +48 −42 DS4Windows/Properties/Resources.fr-FR.resx
  182. +40 −34 DS4Windows/Properties/Resources.it-IT.resx
  183. +420 −0 DS4Windows/Properties/Resources.pl.resx
  184. +110 −29 DS4Windows/Properties/Resources.pt-BR.resx
  185. +75 −3 DS4Windows/Properties/Resources.resx
  186. +37 −31 DS4Windows/Properties/Resources.ro-RO.resx
  187. +40 −34 DS4Windows/Properties/Resources.ru-RU.resx
  188. +38 −32 DS4Windows/Properties/Resources.tr.resx
  189. +528 −0 DS4Windows/Properties/Resources.zh-Hant.resx
  190. +528 −0 DS4Windows/Properties/Resources.zh-hans.resx
  191. BIN DS4Windows/Resources/DS4 Config.png
  192. BIN DS4Windows/Resources/DS4 Controller.png
  193. BIN DS4Windows/Resources/DS4 lightbar.png
  194. BIN DS4Windows/Resources/DS4-Config_Circle.png
  195. BIN DS4Windows/Resources/DS4-Config_Cross.png
  196. BIN DS4Windows/Resources/DS4-Config_Down.png
  197. BIN DS4Windows/Resources/DS4-Config_L1.png
  198. BIN DS4Windows/Resources/DS4-Config_L2.png
  199. BIN DS4Windows/Resources/DS4-Config_LS.png
  200. BIN DS4Windows/Resources/DS4-Config_Left.png
  201. BIN DS4Windows/Resources/DS4-Config_PS.png
  202. BIN DS4Windows/Resources/DS4-Config_R1.png
  203. BIN DS4Windows/Resources/DS4-Config_R2.png
  204. BIN DS4Windows/Resources/DS4-Config_RS.png
  205. BIN DS4Windows/Resources/DS4-Config_Right.png
  206. BIN DS4Windows/Resources/DS4-Config_Share.png
  207. BIN DS4Windows/Resources/DS4-Config_Square.png
  208. BIN DS4Windows/Resources/DS4-Config_TouchLeft.png
  209. BIN DS4Windows/Resources/DS4-Config_TouchMulti.png
  210. BIN DS4Windows/Resources/DS4-Config_TouchRight.png
  211. BIN DS4Windows/Resources/DS4-Config_TouchUpper.png
  212. BIN DS4Windows/Resources/DS4-Config_Triangle.png
  213. BIN DS4Windows/Resources/DS4-Config_Up.png
  214. BIN DS4Windows/Resources/DS4-Config_ptionss.png
  215. +1 −1 DS4Windows/app.manifest
Oops, something went wrong.
@@ -265,6 +265,7 @@ public void TouchPadOn(int ind, DS4Device device)
device.Touchpad.TouchesMoved += tPad.touchesMoved;
device.Touchpad.TouchesEnded += tPad.touchesEnded;
device.Touchpad.TouchUnchanged += tPad.touchUnchanged;
+ device.SixAxis.SixAccelMoved += tPad.sixaxisMoved;
//LogDebug("Touchpad mode for " + device.MacAddress + " is now " + tmode.ToString());
//Log.LogToTray("Touchpad mode for " + device.MacAddress + " is now " + tmode.ToString());
ControllerStatusChanged(this);
@@ -540,7 +541,7 @@ private void DoExtras(int ind)
DS4Controls helddown = DS4Controls.None;
foreach (KeyValuePair<DS4Controls, string> p in getCustomExtras(ind))
{
- if (Mapping.getBoolMapping(p.Key, cState, eState, tp))
+ if (Mapping.getBoolMapping(ind, p.Key, cState, eState, tp))
{
helddown = p.Key;
break;
@@ -600,7 +601,7 @@ public void EasterTime(int ind)
bool pb = false;
foreach (DS4Controls dc in dcs)
{
- if (Mapping.getBoolMapping(dc, cState, eState, tp))
+ if (Mapping.getBoolMapping(ind, dc, cState, eState, tp))
{
pb = true;
break;
@@ -673,35 +674,35 @@ public string GetInputkeys(int ind)
DS4StateExposed eState = ExposedState[ind];
Mouse tp = touchPad[ind];
if (DS4Controllers[ind] != null)
- if (Mapping.getBoolMapping(DS4Controls.Cross, cState, eState, tp)) return "Cross";
- else if (Mapping.getBoolMapping(DS4Controls.Circle, cState, eState, tp)) return "Circle";
- else if (Mapping.getBoolMapping(DS4Controls.Triangle, cState, eState, tp)) return "Triangle";
- else if (Mapping.getBoolMapping(DS4Controls.Square, cState, eState, tp)) return "Square";
- else if (Mapping.getBoolMapping(DS4Controls.L1, cState, eState, tp)) return "L1";
- else if (Mapping.getBoolMapping(DS4Controls.R1, cState, eState, tp)) return "R1";
- else if (Mapping.getBoolMapping(DS4Controls.L2, cState, eState, tp)) return "L2";
- else if (Mapping.getBoolMapping(DS4Controls.R2, cState, eState, tp)) return "R2";
- else if (Mapping.getBoolMapping(DS4Controls.L3, cState, eState, tp)) return "L3";
- else if (Mapping.getBoolMapping(DS4Controls.R3, cState, eState, tp)) return "R3";
- else if (Mapping.getBoolMapping(DS4Controls.DpadUp, cState, eState, tp)) return "Up";
- else if (Mapping.getBoolMapping(DS4Controls.DpadDown, cState, eState, tp)) return "Down";
- else if (Mapping.getBoolMapping(DS4Controls.DpadLeft, cState, eState, tp)) return "Left";
- else if (Mapping.getBoolMapping(DS4Controls.DpadRight, cState, eState, tp)) return "Right";
- else if (Mapping.getBoolMapping(DS4Controls.Share, cState, eState, tp)) return "Share";
- else if (Mapping.getBoolMapping(DS4Controls.Options, cState, eState, tp)) return "Options";
- else if (Mapping.getBoolMapping(DS4Controls.PS, cState, eState, tp)) return "PS";
- else if (Mapping.getBoolMapping(DS4Controls.LXPos, cState, eState, tp)) return "LS Right";
- else if (Mapping.getBoolMapping(DS4Controls.LXNeg, cState, eState, tp)) return "LS Left";
- else if (Mapping.getBoolMapping(DS4Controls.LYPos, cState, eState, tp)) return "LS Down";
- else if (Mapping.getBoolMapping(DS4Controls.LYNeg, cState, eState, tp)) return "LS Up";
- else if (Mapping.getBoolMapping(DS4Controls.RXPos, cState, eState, tp)) return "RS Right";
- else if (Mapping.getBoolMapping(DS4Controls.RXNeg, cState, eState, tp)) return "RS Left";
- else if (Mapping.getBoolMapping(DS4Controls.RYPos, cState, eState, tp)) return "RS Down";
- else if (Mapping.getBoolMapping(DS4Controls.RYNeg, cState, eState, tp)) return "RS Up";
- else if (Mapping.getBoolMapping(DS4Controls.TouchLeft, cState, eState, tp)) return "Touch Left";
- else if (Mapping.getBoolMapping(DS4Controls.TouchRight, cState, eState, tp)) return "Touch Right";
- else if (Mapping.getBoolMapping(DS4Controls.TouchMulti, cState, eState, tp)) return "Touch Multi";
- else if (Mapping.getBoolMapping(DS4Controls.TouchUpper, cState, eState, tp)) return "Touch Upper";
+ if (Mapping.getBoolMapping(ind, DS4Controls.Cross, cState, eState, tp)) return "Cross";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Circle, cState, eState, tp)) return "Circle";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Triangle, cState, eState, tp)) return "Triangle";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Square, cState, eState, tp)) return "Square";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.L1, cState, eState, tp)) return "L1";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.R1, cState, eState, tp)) return "R1";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.L2, cState, eState, tp)) return "L2";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.R2, cState, eState, tp)) return "R2";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.L3, cState, eState, tp)) return "L3";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.R3, cState, eState, tp)) return "R3";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadUp, cState, eState, tp)) return "Up";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadDown, cState, eState, tp)) return "Down";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadLeft, cState, eState, tp)) return "Left";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadRight, cState, eState, tp)) return "Right";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Share, cState, eState, tp)) return "Share";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Options, cState, eState, tp)) return "Options";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.PS, cState, eState, tp)) return "PS";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LXPos, cState, eState, tp)) return "LS Right";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LXNeg, cState, eState, tp)) return "LS Left";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LYPos, cState, eState, tp)) return "LS Down";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LYNeg, cState, eState, tp)) return "LS Up";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RXPos, cState, eState, tp)) return "RS Right";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RXNeg, cState, eState, tp)) return "RS Left";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RYPos, cState, eState, tp)) return "RS Down";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RYNeg, cState, eState, tp)) return "RS Up";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchLeft, cState, eState, tp)) return "Touch Left";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchRight, cState, eState, tp)) return "Touch Right";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchMulti, cState, eState, tp)) return "Touch Multi";
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchUpper, cState, eState, tp)) return "Touch Upper";
return "nothing";
}
@@ -711,35 +712,35 @@ public DS4Controls GetInputkeysDS4(int ind)
DS4StateExposed eState = ExposedState[ind];
Mouse tp = touchPad[ind];
if (DS4Controllers[ind] != null)
- if (Mapping.getBoolMapping(DS4Controls.Cross, cState, eState, tp)) return DS4Controls.Cross;
- else if (Mapping.getBoolMapping(DS4Controls.Circle, cState, eState, tp)) return DS4Controls.Circle;
- else if (Mapping.getBoolMapping(DS4Controls.Triangle, cState, eState, tp)) return DS4Controls.Triangle;
- else if (Mapping.getBoolMapping(DS4Controls.Square, cState, eState, tp)) return DS4Controls.Square;
- else if (Mapping.getBoolMapping(DS4Controls.L1, cState, eState, tp)) return DS4Controls.L1;
- else if (Mapping.getBoolMapping(DS4Controls.R1, cState, eState, tp)) return DS4Controls.R1;
- else if (Mapping.getBoolMapping(DS4Controls.L2, cState, eState, tp)) return DS4Controls.L2;
- else if (Mapping.getBoolMapping(DS4Controls.R2, cState, eState, tp)) return DS4Controls.R2;
- else if (Mapping.getBoolMapping(DS4Controls.L3, cState, eState, tp)) return DS4Controls.L3;
- else if (Mapping.getBoolMapping(DS4Controls.R3, cState, eState, tp)) return DS4Controls.R3;
- else if (Mapping.getBoolMapping(DS4Controls.DpadUp, cState, eState, tp)) return DS4Controls.DpadUp;
- else if (Mapping.getBoolMapping(DS4Controls.DpadDown, cState, eState, tp)) return DS4Controls.DpadDown;
- else if (Mapping.getBoolMapping(DS4Controls.DpadLeft, cState, eState, tp)) return DS4Controls.DpadLeft;
- else if (Mapping.getBoolMapping(DS4Controls.DpadRight, cState, eState, tp)) return DS4Controls.DpadRight;
- else if (Mapping.getBoolMapping(DS4Controls.Share, cState, eState, tp)) return DS4Controls.Share;
- else if (Mapping.getBoolMapping(DS4Controls.Options, cState, eState, tp)) return DS4Controls.Options;
- else if (Mapping.getBoolMapping(DS4Controls.PS, cState, eState, tp)) return DS4Controls.PS;
- else if (Mapping.getBoolMapping(DS4Controls.LXPos, cState, eState, tp)) return DS4Controls.LXPos;
- else if (Mapping.getBoolMapping(DS4Controls.LXNeg, cState, eState, tp)) return DS4Controls.LXNeg;
- else if (Mapping.getBoolMapping(DS4Controls.LYPos, cState, eState, tp)) return DS4Controls.LYPos;
- else if (Mapping.getBoolMapping(DS4Controls.LYNeg, cState, eState, tp)) return DS4Controls.LYNeg;
- else if (Mapping.getBoolMapping(DS4Controls.RXPos, cState, eState, tp)) return DS4Controls.RXPos;
- else if (Mapping.getBoolMapping(DS4Controls.RXNeg, cState, eState, tp)) return DS4Controls.RXNeg;
- else if (Mapping.getBoolMapping(DS4Controls.RYPos, cState, eState, tp)) return DS4Controls.RYPos;
- else if (Mapping.getBoolMapping(DS4Controls.RYNeg, cState, eState, tp)) return DS4Controls.RYNeg;
- else if (Mapping.getBoolMapping(DS4Controls.TouchLeft, cState, eState, tp)) return DS4Controls.TouchLeft;
- else if (Mapping.getBoolMapping(DS4Controls.TouchRight, cState, eState, tp)) return DS4Controls.TouchRight;
- else if (Mapping.getBoolMapping(DS4Controls.TouchMulti, cState, eState, tp)) return DS4Controls.TouchMulti;
- else if (Mapping.getBoolMapping(DS4Controls.TouchUpper, cState, eState, tp)) return DS4Controls.TouchUpper;
+ if (Mapping.getBoolMapping(ind, DS4Controls.Cross, cState, eState, tp)) return DS4Controls.Cross;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Circle, cState, eState, tp)) return DS4Controls.Circle;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Triangle, cState, eState, tp)) return DS4Controls.Triangle;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Square, cState, eState, tp)) return DS4Controls.Square;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.L1, cState, eState, tp)) return DS4Controls.L1;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.R1, cState, eState, tp)) return DS4Controls.R1;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.L2, cState, eState, tp)) return DS4Controls.L2;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.R2, cState, eState, tp)) return DS4Controls.R2;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.L3, cState, eState, tp)) return DS4Controls.L3;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.R3, cState, eState, tp)) return DS4Controls.R3;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadUp, cState, eState, tp)) return DS4Controls.DpadUp;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadDown, cState, eState, tp)) return DS4Controls.DpadDown;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadLeft, cState, eState, tp)) return DS4Controls.DpadLeft;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.DpadRight, cState, eState, tp)) return DS4Controls.DpadRight;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Share, cState, eState, tp)) return DS4Controls.Share;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.Options, cState, eState, tp)) return DS4Controls.Options;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.PS, cState, eState, tp)) return DS4Controls.PS;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LXPos, cState, eState, tp)) return DS4Controls.LXPos;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LXNeg, cState, eState, tp)) return DS4Controls.LXNeg;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LYPos, cState, eState, tp)) return DS4Controls.LYPos;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.LYNeg, cState, eState, tp)) return DS4Controls.LYNeg;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RXPos, cState, eState, tp)) return DS4Controls.RXPos;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RXNeg, cState, eState, tp)) return DS4Controls.RXNeg;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RYPos, cState, eState, tp)) return DS4Controls.RYPos;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.RYNeg, cState, eState, tp)) return DS4Controls.RYNeg;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchLeft, cState, eState, tp)) return DS4Controls.TouchLeft;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchRight, cState, eState, tp)) return DS4Controls.TouchRight;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchMulti, cState, eState, tp)) return DS4Controls.TouchMulti;
+ else if (Mapping.getBoolMapping(ind, DS4Controls.TouchUpper, cState, eState, tp)) return DS4Controls.TouchUpper;
return DS4Controls.None;
}
Oops, something went wrong.

0 comments on commit 8d9f69d

Please sign in to comment.