ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3253 from Phatcat/master 

More wiimote controls (+extensions) for android
This commit is contained in:
Markus Wick 2015-12-02 22:50:29 +01:00
parent 9e389ab144 ca9c9b7135
commit 6425ddcbe7
9 changed files with 3779 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

512
Source/Android/app/src/main/assets/WiimoteNew.ini
View File

@ -7,17 +7,131 @@ Buttons/2 = `Button 28`
Buttons/- = `Button 24`
Buttons/+ = `Button 25`
Buttons/Home = `Button 26`
IR/Up =
IR/Down =
IR/Left =
IR/Right =
Shake/X =
Shake/Y =
Shake/Z =
D-Pad/Up = `Button 29`
D-Pad/Down = `Button 30`
D-Pad/Left = `Button 31`
D-Pad/Right = `Button 32`
IR/Up = `Axis 33`
IR/Down = `Axis 34`
IR/Left = `Axis 35`
IR/Right = `Axis 36`
IR/Forward = `Axis 37`
IR/Backward = `Axis 38`
IR/Hide = `Button 39`
Swing/Up = `Axis 40`
Swing/Down = `Axis 41`
Swing/Left = `Axis 42`
Swing/Right = `Axis 43`
Swing/Forward = `Axis 44`
Swing/Backward = `Axis 45`
Tilt/Forward = `Axis 46`
Tilt/Backward = `Axis 47`
Tilt/Left = `Axis 48`
Tilt/Right = `Axis 49`
Tilt/Modifier = `Button 50`
Shake/X = `Button 51`
Shake/Y = `Button 52`
Shake/Z = `Button 53`
Extension = None
Nunchuk/Buttons/C = `Button 54`
Nunchuk/Buttons/Z = `Button 55`
Nunchuk/Stick/Up = `Axis 57`
Nunchuk/Stick/Down = `Axis 58`
Nunchuk/Stick/Left = `Axis 59`
Nunchuk/Stick/Right = `Axis 60`
Nunchuk/Stick/Modifier = Shift_R
Nunchuk/Stick/Modifier/Range = 50.000000
Nunchuk/Swing/Up = `Axis 61`
Nunchuk/Swing/Down = `Axis 62`
Nunchuk/Swing/Left = `Axis 63`
Nunchuk/Swing/Right = `Axis 64`
Nunchuk/Swing/Forward = `Axis 65`
Nunchuk/Swing/Backward = `Axis 66`
Nunchuk/Tilt/Forward = `Axis 67`
Nunchuk/Tilt/Backward = `Axis 68`
Nunchuk/Tilt/Left = `Axis 69`
Nunchuk/Tilt/Right = `Axis 70`
Nunchuk/Tilt/Modifier = `Button 71`
Nunchuk/Shake/X = `Button 72`
Nunchuk/Shake/Y = `Button 73`
Nunchuk/Shake/Z = `Button 74`
Classic/Buttons/A = `Button 75`
Classic/Buttons/B = `Button 76`
Classic/Buttons/X = `Button 77`
Classic/Buttons/Y = `Button 78`
Classic/Buttons/- = `Button 79`
Classic/Buttons/+ = `Button 80`
Classic/Buttons/Home = `Button 81`
Classic/Buttons/ZL = `Button 82`
Classic/Buttons/ZR = `Button 83`
Classic/D-Pad/Up = `Button 84`
Classic/D-Pad/Down = `Button 85`
Classic/D-Pad/Left = `Button 86`
Classic/D-Pad/Right = `Button 87`
Classic/Left Stick/Up = `Axis 89`
Classic/Left Stick/Down = `Axis 90`
Classic/Left Stick/Left = `Axis 91`
Classic/Left Stick/Right = `Axis 92`
Classic/Left Stick/Modifier/Range = 50.000000
Classic/Right Stick/Up = `Axis 94`
Classic/Right Stick/Down = `Axis 95`
Classic/Right Stick/Left = `Axis 96`
Classic/Right Stick/Right = `Axis 97`
Classic/Right Stick/Modifier/Range = 50.000000
Classic/Trigger/L = `Axis 98`
Classic/Trigger/L/Modifier/Range = 50.000000
Classic/Trigger/R = `Axis 99`
Classic/Trigger/R/Modifier/Range = 50.000000
Guitar/Buttons/- = `Button 100`
Guitar/Buttons/+ = `Button 101`
Guitar/Frets/Green = `Button 102`
Guitar/Frets/Red = `Button 103`
Guitar/Frets/Yellow = `Button 104`
Guitar/Frets/Blue = `Button 105`
Guitar/Frets/Orange = `Button 106`
Guitar/Strum/Up = `Button 107`
Guitar/Strum/Down = `Button 108`
Guitar/Stick/Up = `Axis 110`
Guitar/Stick/Down = `Axis 111`
Guitar/Stick/Left = `Axis 112`
Guitar/Stick/Right = `Axis 113`
Guitar/Stick/Modifier/Range = 50.000000
Guitar/Whammy/Bar = `Axis = 114`
Drums/Buttons/- = `Button 115`
Drums/Buttons/+ = `Button 116`
Drums/Pads/Red = `Button 117`
Drums/Pads/Yellow = `Button 118`
Drums/Pads/Blue = `Button 119`
Drums/Pads/Green = `Button 120`
Drums/Pads/Orange = `Button 121`
Drums/Pads/Bass = `Button 122`
Drums/Stick/Up = `Axis 124`
Drums/Stick/Down = `Axis 125`
Drums/Stick/Left = `Axis 126`
Drums/Stick/Right = `Axis 127`
Drums/Stick/Modifier/Range = 50.000000
Turntable/Buttons/Green Left = `Button 128`
Turntable/Buttons/Red Left = `Button 129`
Turntable/Buttons/Blue Left = `Button 130`
Turntable/Buttons/Green Right = `Button 131`
Turntable/Buttons/Red Right = `Button 132`
Turntable/Buttons/Blue Right = `Button 133`
Turntable/Buttons/- = `Button 134`
Turntable/Buttons/+ = `Button 135`
Turntable/Buttons/Home = `Button 136`
Turntable/Buttons/Euphoria = `Button 137`
Turntable/Table Left/Left = `Axis 138`
Turntable/Table Left/Right = `Axis 139`
Turntable/Table Right/Left = `Axis 140`
Turntable/Table Right/Right = `Axis 141`
Turntable/Stick/Up = `Axis 143`
Turntable/Stick/Down = `Axis 144`
Turntable/Stick/Left = `Axis 145`
Turntable/Stick/Right = `Axis 146`
Turntable/Stick/Modifier/Range = 50.000000
Turntable/Effect/Dial = `Axis 147`
Turntable/Crossfade/Left = `Axis 148`
Turntable/Crossfade/Right = `Axis 149`
Source = 1
[Wiimote2]
Device = Android/5/Touchscreen
@ -28,17 +142,131 @@ Buttons/2 = `Button 28`
Buttons/- = `Button 24`
Buttons/+ = `Button 25`
Buttons/Home = `Button 26`
IR/Up =
IR/Down =
IR/Left =
IR/Right =
Shake/X =
Shake/Y =
Shake/Z =
D-Pad/Up = `Button 29`
D-Pad/Down = `Button 30`
D-Pad/Left = `Button 31`
D-Pad/Right = `Button 32`
IR/Up = `Axis 33`
IR/Down = `Axis 34`
IR/Left = `Axis 35`
IR/Right = `Axis 36`
IR/Forward = `Axis 37`
IR/Backward = `Axis 38`
IR/Hide = `Button 39`
Swing/Up = `Axis 40`
Swing/Down = `Axis 41`
Swing/Left = `Axis 42`
Swing/Right = `Axis 43`
Swing/Forward = `Axis 44`
Swing/Backward = `Axis 45`
Tilt/Forward = `Axis 46`
Tilt/Backward = `Axis 47`
Tilt/Left = `Axis 48`
Tilt/Right = `Axis 49`
Tilt/Modifier = `Button 50`
Shake/X = `Button 51`
Shake/Y = `Button 52`
Shake/Z = `Button 53`
Extension = None
Nunchuk/Buttons/C = `Button 54`
Nunchuk/Buttons/Z = `Button 55`
Nunchuk/Stick/Up = `Axis 57`
Nunchuk/Stick/Down = `Axis 58`
Nunchuk/Stick/Left = `Axis 59`
Nunchuk/Stick/Right = `Axis 60`
Nunchuk/Stick/Modifier = Shift_R
Nunchuk/Stick/Modifier/Range = 50.000000
Nunchuk/Swing/Up = `Axis 61`
Nunchuk/Swing/Down = `Axis 62`
Nunchuk/Swing/Left = `Axis 63`
Nunchuk/Swing/Right = `Axis 64`
Nunchuk/Swing/Forward = `Axis 65`
Nunchuk/Swing/Backward = `Axis 66`
Nunchuk/Tilt/Forward = `Axis 67`
Nunchuk/Tilt/Backward = `Axis 68`
Nunchuk/Tilt/Left = `Axis 69`
Nunchuk/Tilt/Right = `Axis 70`
Nunchuk/Tilt/Modifier = `Button 71`
Nunchuk/Shake/X = `Button 72`
Nunchuk/Shake/Y = `Button 73`
Nunchuk/Shake/Z = `Button 74`
Classic/Buttons/A = `Button 75`
Classic/Buttons/B = `Button 76`
Classic/Buttons/X = `Button 77`
Classic/Buttons/Y = `Button 78`
Classic/Buttons/- = `Button 79`
Classic/Buttons/+ = `Button 80`
Classic/Buttons/Home = `Button 81`
Classic/Buttons/ZL = `Button 82`
Classic/Buttons/ZR = `Button 83`
Classic/D-Pad/Up = `Button 84`
Classic/D-Pad/Down = `Button 85`
Classic/D-Pad/Left = `Button 86`
Classic/D-Pad/Right = `Button 87`
Classic/Left Stick/Up = `Axis 89`
Classic/Left Stick/Down = `Axis 90`
Classic/Left Stick/Left = `Axis 91`
Classic/Left Stick/Right = `Axis 92`
Classic/Left Stick/Modifier/Range = 50.000000
Classic/Right Stick/Up = `Axis 94`
Classic/Right Stick/Down = `Axis 95`
Classic/Right Stick/Left = `Axis 96`
Classic/Right Stick/Right = `Axis 97`
Classic/Right Stick/Modifier/Range = 50.000000
Classic/Trigger/L = `Axis 98`
Classic/Trigger/L/Modifier/Range = 50.000000
Classic/Trigger/R = `Axis 99`
Classic/Trigger/R/Modifier/Range = 50.000000
Guitar/Buttons/- = `Button 100`
Guitar/Buttons/+ = `Button 101`
Guitar/Frets/Green = `Button 102`
Guitar/Frets/Red = `Button 103`
Guitar/Frets/Yellow = `Button 104`
Guitar/Frets/Blue = `Button 105`
Guitar/Frets/Orange = `Button 106`
Guitar/Strum/Up = `Button 107`
Guitar/Strum/Down = `Button 108`
Guitar/Stick/Up = `Axis 110`
Guitar/Stick/Down = `Axis 111`
Guitar/Stick/Left = `Axis 112`
Guitar/Stick/Right = `Axis 113`
Guitar/Stick/Modifier/Range = 50.000000
Guitar/Whammy/Bar = `Axis = 114`
Drums/Buttons/- = `Button 115`
Drums/Buttons/+ = `Button 116`
Drums/Pads/Red = `Button 117`
Drums/Pads/Yellow = `Button 118`
Drums/Pads/Blue = `Button 119`
Drums/Pads/Green = `Button 120`
Drums/Pads/Orange = `Button 121`
Drums/Pads/Bass = `Button 122`
Drums/Stick/Up = `Axis 124`
Drums/Stick/Down = `Axis 125`
Drums/Stick/Left = `Axis 126`
Drums/Stick/Right = `Axis 127`
Drums/Stick/Modifier/Range = 50.000000
Turntable/Buttons/Green Left = `Button 128`
Turntable/Buttons/Red Left = `Button 129`
Turntable/Buttons/Blue Left = `Button 130`
Turntable/Buttons/Green Right = `Button 131`
Turntable/Buttons/Red Right = `Button 132`
Turntable/Buttons/Blue Right = `Button 133`
Turntable/Buttons/- = `Button 134`
Turntable/Buttons/+ = `Button 135`
Turntable/Buttons/Home = `Button 136`
Turntable/Buttons/Euphoria = `Button 137`
Turntable/Table Left/Left = `Axis 138`
Turntable/Table Left/Right = `Axis 139`
Turntable/Table Right/Left = `Axis 140`
Turntable/Table Right/Right = `Axis 141`
Turntable/Stick/Up = `Axis 143`
Turntable/Stick/Down = `Axis 144`
Turntable/Stick/Left = `Axis 145`
Turntable/Stick/Right = `Axis 146`
Turntable/Stick/Modifier/Range = 50.000000
Turntable/Effect/Dial = `Axis 147`
Turntable/Crossfade/Left = `Axis 148`
Turntable/Crossfade/Right = `Axis 149`
Source = 1
[Wiimote3]
Device = Android/6/Touchscreen
@ -49,17 +277,131 @@ Buttons/2 = `Button 28`
Buttons/- = `Button 24`
Buttons/+ = `Button 25`
Buttons/Home = `Button 26`
IR/Up =
IR/Down =
IR/Left =
IR/Right =
Shake/X =
Shake/Y =
Shake/Z =
D-Pad/Up = `Button 29`
D-Pad/Down = `Button 30`
D-Pad/Left = `Button 31`
D-Pad/Right = `Button 32`
IR/Up = `Axis 33`
IR/Down = `Axis 34`
IR/Left = `Axis 35`
IR/Right = `Axis 36`
IR/Forward = `Axis 37`
IR/Backward = `Axis 38`
IR/Hide = `Button 39`
Swing/Up = `Axis 40`
Swing/Down = `Axis 41`
Swing/Left = `Axis 42`
Swing/Right = `Axis 43`
Swing/Forward = `Axis 44`
Swing/Backward = `Axis 45`
Tilt/Forward = `Axis 46`
Tilt/Backward = `Axis 47`
Tilt/Left = `Axis 48`
Tilt/Right = `Axis 49`
Tilt/Modifier = `Button 50`
Shake/X = `Button 51`
Shake/Y = `Button 52`
Shake/Z = `Button 53`
Extension = None
Nunchuk/Buttons/C = `Button 54`
Nunchuk/Buttons/Z = `Button 55`
Nunchuk/Stick/Up = `Axis 57`
Nunchuk/Stick/Down = `Axis 58`
Nunchuk/Stick/Left = `Axis 59`
Nunchuk/Stick/Right = `Axis 60`
Nunchuk/Stick/Modifier = Shift_R
Nunchuk/Stick/Modifier/Range = 50.000000
Nunchuk/Swing/Up = `Axis 61`
Nunchuk/Swing/Down = `Axis 62`
Nunchuk/Swing/Left = `Axis 63`
Nunchuk/Swing/Right = `Axis 64`
Nunchuk/Swing/Forward = `Axis 65`
Nunchuk/Swing/Backward = `Axis 66`
Nunchuk/Tilt/Forward = `Axis 67`
Nunchuk/Tilt/Backward = `Axis 68`
Nunchuk/Tilt/Left = `Axis 69`
Nunchuk/Tilt/Right = `Axis 70`
Nunchuk/Tilt/Modifier = `Button 71`
Nunchuk/Shake/X = `Button 72`
Nunchuk/Shake/Y = `Button 73`
Nunchuk/Shake/Z = `Button 74`
Classic/Buttons/A = `Button 75`
Classic/Buttons/B = `Button 76`
Classic/Buttons/X = `Button 77`
Classic/Buttons/Y = `Button 78`
Classic/Buttons/- = `Button 79`
Classic/Buttons/+ = `Button 80`
Classic/Buttons/Home = `Button 81`
Classic/Buttons/ZL = `Button 82`
Classic/Buttons/ZR = `Button 83`
Classic/D-Pad/Up = `Button 84`
Classic/D-Pad/Down = `Button 85`
Classic/D-Pad/Left = `Button 86`
Classic/D-Pad/Right = `Button 87`
Classic/Left Stick/Up = `Axis 89`
Classic/Left Stick/Down = `Axis 90`
Classic/Left Stick/Left = `Axis 91`
Classic/Left Stick/Right = `Axis 92`
Classic/Left Stick/Modifier/Range = 50.000000
Classic/Right Stick/Up = `Axis 94`
Classic/Right Stick/Down = `Axis 95`
Classic/Right Stick/Left = `Axis 96`
Classic/Right Stick/Right = `Axis 97`
Classic/Right Stick/Modifier/Range = 50.000000
Classic/Trigger/L = `Axis 98`
Classic/Trigger/L/Modifier/Range = 50.000000
Classic/Trigger/R = `Axis 99`
Classic/Trigger/R/Modifier/Range = 50.000000
Guitar/Buttons/- = `Button 100`
Guitar/Buttons/+ = `Button 101`
Guitar/Frets/Green = `Button 102`
Guitar/Frets/Red = `Button 103`
Guitar/Frets/Yellow = `Button 104`
Guitar/Frets/Blue = `Button 105`
Guitar/Frets/Orange = `Button 106`
Guitar/Strum/Up = `Button 107`
Guitar/Strum/Down = `Button 108`
Guitar/Stick/Up = `Axis 110`
Guitar/Stick/Down = `Axis 111`
Guitar/Stick/Left = `Axis 112`
Guitar/Stick/Right = `Axis 113`
Guitar/Stick/Modifier/Range = 50.000000
Guitar/Whammy/Bar = `Axis = 114`
Drums/Buttons/- = `Button 115`
Drums/Buttons/+ = `Button 116`
Drums/Pads/Red = `Button 117`
Drums/Pads/Yellow = `Button 118`
Drums/Pads/Blue = `Button 119`
Drums/Pads/Green = `Button 120`
Drums/Pads/Orange = `Button 121`
Drums/Pads/Bass = `Button 122`
Drums/Stick/Up = `Axis 124`
Drums/Stick/Down = `Axis 125`
Drums/Stick/Left = `Axis 126`
Drums/Stick/Right = `Axis 127`
Drums/Stick/Modifier/Range = 50.000000
Turntable/Buttons/Green Left = `Button 128`
Turntable/Buttons/Red Left = `Button 129`
Turntable/Buttons/Blue Left = `Button 130`
Turntable/Buttons/Green Right = `Button 131`
Turntable/Buttons/Red Right = `Button 132`
Turntable/Buttons/Blue Right = `Button 133`
Turntable/Buttons/- = `Button 134`
Turntable/Buttons/+ = `Button 135`
Turntable/Buttons/Home = `Button 136`
Turntable/Buttons/Euphoria = `Button 137`
Turntable/Table Left/Left = `Axis 138`
Turntable/Table Left/Right = `Axis 139`
Turntable/Table Right/Left = `Axis 140`
Turntable/Table Right/Right = `Axis 141`
Turntable/Stick/Up = `Axis 143`
Turntable/Stick/Down = `Axis 144`
Turntable/Stick/Left = `Axis 145`
Turntable/Stick/Right = `Axis 146`
Turntable/Stick/Modifier/Range = 50.000000
Turntable/Effect/Dial = `Axis 147`
Turntable/Crossfade/Left = `Axis 148`
Turntable/Crossfade/Right = `Axis 149`
Source = 1
[Wiimote4]
Device = Android/7/Touchscreen
@ -70,15 +412,129 @@ Buttons/2 = `Button 28`
Buttons/- = `Button 24`
Buttons/+ = `Button 25`
Buttons/Home = `Button 26`
IR/Up =
IR/Down =
IR/Left =
IR/Right =
Shake/X =
Shake/Y =
Shake/Z =
D-Pad/Up = `Button 29`
D-Pad/Down = `Button 30`
D-Pad/Left = `Button 31`
D-Pad/Right = `Button 32`
IR/Up = `Axis 33`
IR/Down = `Axis 34`
IR/Left = `Axis 35`
IR/Right = `Axis 36`
IR/Forward = `Axis 37`
IR/Backward = `Axis 38`
IR/Hide = `Button 39`
Swing/Up = `Axis 40`
Swing/Down = `Axis 41`
Swing/Left = `Axis 42`
Swing/Right = `Axis 43`
Swing/Forward = `Axis 44`
Swing/Backward = `Axis 45`
Tilt/Forward = `Axis 46`
Tilt/Backward = `Axis 47`
Tilt/Left = `Axis 48`
Tilt/Right = `Axis 49`
Tilt/Modifier = `Button 50`
Shake/X = `Button 51`
Shake/Y = `Button 52`
Shake/Z = `Button 53`
Extension = None
Nunchuk/Buttons/C = `Button 54`
Nunchuk/Buttons/Z = `Button 55`
Nunchuk/Stick/Up = `Axis 57`
Nunchuk/Stick/Down = `Axis 58`
Nunchuk/Stick/Left = `Axis 59`
Nunchuk/Stick/Right = `Axis 60`
Nunchuk/Stick/Modifier = Shift_R
Nunchuk/Stick/Modifier/Range = 50.000000
Nunchuk/Swing/Up = `Axis 61`
Nunchuk/Swing/Down = `Axis 62`
Nunchuk/Swing/Left = `Axis 63`
Nunchuk/Swing/Right = `Axis 64`
Nunchuk/Swing/Forward = `Axis 65`
Nunchuk/Swing/Backward = `Axis 66`
Nunchuk/Tilt/Forward = `Axis 67`
Nunchuk/Tilt/Backward = `Axis 68`
Nunchuk/Tilt/Left = `Axis 69`
Nunchuk/Tilt/Right = `Axis 70`
Nunchuk/Tilt/Modifier = `Button 71`
Nunchuk/Shake/X = `Button 72`
Nunchuk/Shake/Y = `Button 73`
Nunchuk/Shake/Z = `Button 74`
Classic/Buttons/A = `Button 75`
Classic/Buttons/B = `Button 76`
Classic/Buttons/X = `Button 77`
Classic/Buttons/Y = `Button 78`
Classic/Buttons/- = `Button 79`
Classic/Buttons/+ = `Button 80`
Classic/Buttons/Home = `Button 81`
Classic/Buttons/ZL = `Button 82`
Classic/Buttons/ZR = `Button 83`
Classic/D-Pad/Up = `Button 84`
Classic/D-Pad/Down = `Button 85`
Classic/D-Pad/Left = `Button 86`
Classic/D-Pad/Right = `Button 87`
Classic/Left Stick/Up = `Axis 89`
Classic/Left Stick/Down = `Axis 90`
Classic/Left Stick/Left = `Axis 91`
Classic/Left Stick/Right = `Axis 92`
Classic/Left Stick/Modifier/Range = 50.000000
Classic/Right Stick/Up = `Axis 94`
Classic/Right Stick/Down = `Axis 95`
Classic/Right Stick/Left = `Axis 96`
Classic/Right Stick/Right = `Axis 97`
Classic/Right Stick/Modifier/Range = 50.000000
Classic/Trigger/L = `Axis 98`
Classic/Trigger/L/Modifier/Range = 50.000000
Classic/Trigger/R = `Axis 99`
Classic/Trigger/R/Modifier/Range = 50.000000
Guitar/Buttons/- = `Button 100`
Guitar/Buttons/+ = `Button 101`
Guitar/Frets/Green = `Button 102`
Guitar/Frets/Red = `Button 103`
Guitar/Frets/Yellow = `Button 104`
Guitar/Frets/Blue = `Button 105`
Guitar/Frets/Orange = `Button 106`
Guitar/Strum/Up = `Button 107`
Guitar/Strum/Down = `Button 108`
Guitar/Stick/Up = `Axis 110`
Guitar/Stick/Down = `Axis 111`
Guitar/Stick/Left = `Axis 112`
Guitar/Stick/Right = `Axis 113`
Guitar/Stick/Modifier/Range = 50.000000
Guitar/Whammy/Bar = `Axis = 114`
Drums/Buttons/- = `Button 115`
Drums/Buttons/+ = `Button 116`
Drums/Pads/Red = `Button 117`
Drums/Pads/Yellow = `Button 118`
Drums/Pads/Blue = `Button 119`
Drums/Pads/Green = `Button 120`
Drums/Pads/Orange = `Button 121`
Drums/Pads/Bass = `Button 122`
Drums/Stick/Up = `Axis 124`
Drums/Stick/Down = `Axis 125`
Drums/Stick/Left = `Axis 126`
Drums/Stick/Right = `Axis 127`
Drums/Stick/Modifier/Range = 50.000000
Turntable/Buttons/Green Left = `Button 128`
Turntable/Buttons/Red Left = `Button 129`
Turntable/Buttons/Blue Left = `Button 130`
Turntable/Buttons/Green Right = `Button 131`
Turntable/Buttons/Red Right = `Button 132`
Turntable/Buttons/Blue Right = `Button 133`
Turntable/Buttons/- = `Button 134`
Turntable/Buttons/+ = `Button 135`
Turntable/Buttons/Home = `Button 136`
Turntable/Buttons/Euphoria = `Button 137`
Turntable/Table Left/Left = `Axis 138`
Turntable/Table Left/Right = `Axis 139`
Turntable/Table Right/Left = `Axis 140`
Turntable/Table Right/Right = `Axis 141`
Turntable/Stick/Up = `Axis 143`
Turntable/Stick/Down = `Axis 144`
Turntable/Stick/Left = `Axis 145`
Turntable/Stick/Right = `Axis 146`
Turntable/Stick/Modifier/Range = 50.000000
Turntable/Effect/Dial = `Axis 147`
Turntable/Crossfade/Left = `Axis 148`
Turntable/Crossfade/Right = `Axis 149`
Source = 1

185
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -25,39 +25,156 @@ public final class NativeLibrary
*/
public static final class ButtonType
{
public static final int BUTTON_A = 0;
public static final int BUTTON_B = 1;
public static final int BUTTON_START = 2;
public static final int BUTTON_X = 3;
public static final int BUTTON_Y = 4;
public static final int BUTTON_Z = 5;
public static final int BUTTON_UP = 6;
public static final int BUTTON_DOWN = 7;
public static final int BUTTON_LEFT = 8;
public static final int BUTTON_RIGHT = 9;
public static final int STICK_MAIN = 10;
public static final int STICK_MAIN_UP = 11;
public static final int STICK_MAIN_DOWN = 12;
public static final int STICK_MAIN_LEFT = 13;
public static final int STICK_MAIN_RIGHT = 14;
public static final int STICK_C = 15;
public static final int STICK_C_UP = 16;
public static final int STICK_C_DOWN = 17;
public static final int STICK_C_LEFT = 18;
public static final int STICK_C_RIGHT = 19;
public static final int TRIGGER_L = 20;
public static final int TRIGGER_R = 21;
public static final int WIIMOTE_BUTTON_A = 22;
public static final int WIIMOTE_BUTTON_B = 23;
public static final int WIIMOTE_BUTTON_MINUS = 24;
public static final int WIIMOTE_BUTTON_PLUS = 25;
public static final int WIIMOTE_BUTTON_HOME = 26;
public static final int WIIMOTE_BUTTON_1 = 27;
public static final int WIIMOTE_BUTTON_2 = 28;
public static final int WIIMOTE_UP = 29;
public static final int WIIMOTE_DOWN = 30;
public static final int WIIMOTE_LEFT = 31;
public static final int WIIMOTE_RIGHT = 32;
public static final int BUTTON_A = 0;
public static final int BUTTON_B = 1;
public static final int BUTTON_START = 2;
public static final int BUTTON_X = 3;
public static final int BUTTON_Y = 4;
public static final int BUTTON_Z = 5;
public static final int BUTTON_UP = 6;
public static final int BUTTON_DOWN = 7;
public static final int BUTTON_LEFT = 8;
public static final int BUTTON_RIGHT = 9;
public static final int STICK_MAIN = 10;
public static final int STICK_MAIN_UP = 11;
public static final int STICK_MAIN_DOWN = 12;
public static final int STICK_MAIN_LEFT = 13;
public static final int STICK_MAIN_RIGHT = 14;
public static final int STICK_C = 15;
public static final int STICK_C_UP = 16;
public static final int STICK_C_DOWN = 17;
public static final int STICK_C_LEFT = 18;
public static final int STICK_C_RIGHT = 19;
public static final int TRIGGER_L = 20;
public static final int TRIGGER_R = 21;
public static final int WIIMOTE_BUTTON_A = 22;
public static final int WIIMOTE_BUTTON_B = 23;
public static final int WIIMOTE_BUTTON_MINUS = 24;
public static final int WIIMOTE_BUTTON_PLUS = 25;
public static final int WIIMOTE_BUTTON_HOME = 26;
public static final int WIIMOTE_BUTTON_1 = 27;
public static final int WIIMOTE_BUTTON_2 = 28;
public static final int WIIMOTE_UP = 29;
public static final int WIIMOTE_DOWN = 30;
public static final int WIIMOTE_LEFT = 31;
public static final int WIIMOTE_RIGHT = 32;
public static final int WIIMOTE_IR_UP = 33;
public static final int WIIMOTE_IR_DOWN = 34;
public static final int WIIMOTE_IR_LEFT = 35;
public static final int WIIMOTE_IR_RIGHT = 36;
public static final int WIIMOTE_IR_FORWARD = 37;
public static final int WIIMOTE_IR_BACKWARD = 38;
public static final int WIIMOTE_IR_HIDE = 39;
public static final int WIIMOTE_SWING_UP = 40;
public static final int WIIMOTE_SWING_DOWN = 41;
public static final int WIIMOTE_SWING_LEFT = 42;
public static final int WIIMOTE_SWING_RIGHT = 43;
public static final int WIIMOTE_SWING_FORWARD = 44;
public static final int WIIMOTE_SWING_BACKWARD = 45;
public static final int WIIMOTE_TILT_FORWARD = 46;
public static final int WIIMOTE_TILT_BACKWARD = 47;
public static final int WIIMOTE_TILT_LEFT = 48;
public static final int WIIMOTE_TILT_RIGHT = 49;
public static final int WIIMOTE_TILT_MODIFIER = 50;
public static final int WIIMOTE_SHAKE_X = 51;
public static final int WIIMOTE_SHAKE_Y = 52;
public static final int WIIMOTE_SHAKE_Z = 53;
public static final int NUNCHUK_BUTTON_C = 54;
public static final int NUNCHUK_BUTTON_Z = 55;
public static final int NUNCHUK_STICK = 56;
public static final int NUNCHUK_STICK_UP = 57;
public static final int NUNCHUK_STICK_DOWN = 58;
public static final int NUNCHUK_STICK_LEFT = 59;
public static final int NUNCHUK_STICK_RIGHT = 60;
public static final int NUNCHUK_SWING_UP = 61;
public static final int NUNCHUK_SWING_DOWN = 62;
public static final int NUNCHUK_SWING_LEFT = 63;
public static final int NUNCHUK_SWING_RIGHT = 64;
public static final int NUNCHUK_SWING_FORWARD = 65;
public static final int NUNCHUK_SWING_BACKWARD = 66;
public static final int NUNCHUK_TILT_FORWARD = 67;
public static final int NUNCHUK_TILT_BACKWARD = 68;
public static final int NUNCHUK_TILT_LEFT = 69;
public static final int NUNCHUK_TILT_RIGHT = 70;
public static final int NUNCHUK_TILT_MODIFIER = 71;
public static final int NUNCHUK_SHAKE_X = 72;
public static final int NUNCHUK_SHAKE_Y = 73;
public static final int NUNCHUK_SHAKE_Z = 74;
public static final int CLASSIC_BUTTON_A = 75;
public static final int CLASSIC_BUTTON_B = 76;
public static final int CLASSIC_BUTTON_X = 77;
public static final int CLASSIC_BUTTON_Y = 78;
public static final int CLASSIC_BUTTON_MINUS = 79;
public static final int CLASSIC_BUTTON_PLUS = 80;
public static final int CLASSIC_BUTTON_HOME = 81;
public static final int CLASSIC_BUTTON_ZL = 82;
public static final int CLASSIC_BUTTON_ZR = 83;
public static final int CLASSIC_DPAD_UP = 84;
public static final int CLASSIC_DPAD_DOWN = 85;
public static final int CLASSIC_DPAD_LEFT = 86;
public static final int CLASSIC_DPADON_RIGHT = 87;
public static final int CLASSIC_STICK_LEFT = 88;
public static final int CLASSIC_STICK_LEFT_UP = 89;
public static final int CLASSIC_STICK_LEFT_DOWN = 90;
public static final int CLASSIC_STICK_LEFT_LEFT = 91;
public static final int CLASSIC_STICK_LEFT_RIGHT = 92;
public static final int CLASSIC_STICK_RIGHT = 93;
public static final int CLASSIC_STICK_RIGHT_UP = 94;
public static final int CLASSIC_STICK_RIGHT_DOWN = 95;
public static final int CLASSIC_STICK_RIGHT_LEFT = 96;
public static final int CLASSIC_STICK_RIGHT_RIGHT = 97;
public static final int CLASSIC_TRIGGER_L = 98;
public static final int CLASSIC_TRIGGER_R = 99;
public static final int GUITAR_BUTTON_MINUS = 100;
public static final int GUITAR_BUTTON_PLUS = 101;
public static final int GUITAR_FRET_GREEN = 102;
public static final int GUITAR_FRET_RED = 103;
public static final int GUITAR_FRET_YELLOW = 104;
public static final int GUITAR_FRET_BLUE = 105;
public static final int GUITAR_FRET_ORANGE = 106;
public static final int GUITAR_STRUM_UP = 107;
public static final int GUITAR_STRUM_DOWN = 108;
public static final int GUITAR_STICK = 109;
public static final int GUITAR_STICK_UP = 110;
public static final int GUITAR_STICK_DOWN = 111;
public static final int GUITAR_STICK_LEFT = 112;
public static final int GUITAR_STOCK_RIGHT = 113;
public static final int GUITAR_WHAMMY_BAR = 114;
public static final int DRUMS_BUTTON_MINUS = 115;
public static final int DRUMS_BUTTON_PLUS = 116;
public static final int DRUMS_PAD_RED = 117;
public static final int DRUMS_PAD_YELLOW = 118;
public static final int DRUMS_PAD_BLUE = 119;
public static final int DRUMS_PAD_GREEN = 120;
public static final int DRUMS_PAD_ORANGE = 121;
public static final int DRUMS_PAD_BASS = 122;
public static final int DRUMS_STICK = 123;
public static final int DRUMS_STICK_UP = 124;
public static final int DRUMS_STICK_DOWN = 125;
public static final int DRUMS_STICK_LEFT = 126;
public static final int DRUMS_STICK_RIGHT = 127;
public static final int TURNTABLE_BUTTON_GREEN_LEFT = 128;
public static final int TURNTABLE_BUTTON_RED_LEFT = 129;
public static final int TURNTABLE_BUTTON_BLUE_LEFT = 130;
public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 131;
public static final int TURNTABLE_BUTTON_RED_RIGHT = 132;
public static final int TURNTABLE_BUTTON_BLUE_RIGHT = 133;
public static final int TURNTABLE_BUTTON_MINUS = 134;
public static final int TURNTABLE_BUTTON_PLUS = 135;
public static final int TURNTABLE_BUTTON_HOME = 136;
public static final int TURNTABLE_BUTTON_EUPHORIA = 137;
public static final int TURNTABLE_TABLE_LEFT_LEFT = 138;
public static final int TURNTABLE_TABLE_LEFT_RIGHT = 139;
public static final int TURNTABLE_TABLE_RIGHT_LEFT = 140;
public static final int TURNTABLE_TABLE_RIGHT_RIGHT = 141;
public static final int TURNTABLE_STICK = 142;
public static final int TURNTABLE_STICK_UP = 143;
public static final int TURNTABLE_STICK_DOWN = 144;
public static final int TURNTABLE_STICK_LEFT = 145;
public static final int TURNTABLE_STICK_RIGHT = 146;
public static final int TURNTABLE_EFFECT_DIAL = 147;
public static final int TURNTABLE_CROSSFADE_LEFT = 148;
public static final int TURNTABLE_CROSSFADE_RIGHT = 149;
}
/**
@ -84,7 +201,7 @@ public final class NativeLibrary
*
* @param Device The input descriptor of the gamepad.
* @param Button Key code identifying which button was pressed.
* @param Action Mask identifying which action is happing (button pressed down, or button released).
* @param Action Mask identifying which action is happening (button pressed down, or button released).
*
* @return If we handled the button press.
*/

19
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
View File

@ -47,6 +47,11 @@ public final class UserPreferences
editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "True").equals("True"));
editor.putString("WiimoteExtension_4", getConfig("WiimoteNew.ini", "Wiimote1", "Extension", "None"));
editor.putString("WiimoteExtension_5", getConfig("WiimoteNew.ini", "Wiimote2", "Extension", "None"));
editor.putString("WiimoteExtension_6", getConfig("WiimoteNew.ini", "Wiimote3", "Extension", "None"));
editor.putString("WiimoteExtension_7", getConfig("WiimoteNew.ini", "Wiimote4", "Extension", "None"));
editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL"));
editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True"));
editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True"));
@ -135,7 +140,13 @@ public final class UserPreferences
boolean isUsingDualCore = prefs.getBoolean("dualCorePref", true);
// Current CPU core being used. Falls back to interpreter upon error.
String currentEmuCore = prefs.getString("cpuCorePref", "0");
String currentEmuCore = prefs.getString("cpuCorePref", "0");
// Current wiimote extension setup. Falls back to no extension upon error.
String WiimoteExtension_4 = prefs.getString("WiimoteExtension_4", "None");
String WiimoteExtension_5 = prefs.getString("WiimoteExtension_5", "None");
String WiimoteExtension_6 = prefs.getString("WiimoteExtension_6", "None");
String WiimoteExtension_7 = prefs.getString("WiimoteExtension_7", "None");
// Current video backend being used. Falls back to software rendering upon error.
String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering");
@ -213,6 +224,12 @@ public final class UserPreferences
// CPU related Settings
NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUCore", currentEmuCore);
NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUThread", isUsingDualCore ? "True" : "False");
// Wiimote Extension Settings
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", WiimoteExtension_4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Extension", WiimoteExtension_5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Extension", WiimoteExtension_6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Extension", WiimoteExtension_7);
// General Video Settings
NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend);

18
Source/Android/app/src/main/res/values/arrays.xml
View File

@ -80,6 +80,24 @@
<string-array name="videoBackendValuesNoGLES3" translatable="false">
<item>Software Renderer</item>
</string-array>
<!-- Wiimote extensions -->
<string-array name="wiimoteExtEntries" translatable="false">
<item>"None"</item>
<item>"Nunchuk"</item>
<item>"Classic"</item>
<item>"Guitar"</item>
<item>"Drums"</item>
<item>"Turntable"</item>
</string-array>
<string-array name="wiimoteExtValues" translatable="false">
<item>None</item>
<item>Nunchuk</item>
<item>Classic</item>
<item>Guitar</item>
<item>Drums</item>
<item>Turntable</item>
</string-array>
<!-- EFB Copy Method Preference -->
<string-array name="efbCopyMethodEntries" translatable="false">

104
Source/Android/app/src/main/res/values/strings.xml
View File

@ -87,6 +87,13 @@
<string name="wiimote_3">Wiimote 3</string>
<string name="wiimote_4">Wiimote 4</string>
<string name="enable_wiimote">Enable Wiimote</string>
<string name="wiimote_extensions">Wiimote Extension</string>
<string name="wiimote_extensions_descrip">Choose which Wii Extension you want to use with the Wiimote</string>
<string name="show_nunchuk">Show Nunchuk Extension configurations</string>
<string name="show_classic">Show Classic Extension configurations</string>
<string name="show_guitar">Show Guitar Extension configurations</string>
<string name="show_drums">Show Drums Extension configurations</string>
<string name="show_turntable">Show Turntable Extension configurations</string>
<string name="input_binding">Input Binding</string>
<string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
<!-- GameCube buttons (May be shared with Wiimote stuff too) -->
@ -122,10 +129,13 @@
<string name="ir_right">IR Right</string>
<string name="ir_forward">IR Forward</string>
<string name="ir_backward">IR Backward</string>
<string name="ir_hide">IR Hide</string>
<string name="swing_up">Swing Up</string>
<string name="swing_down">Swing Down</string>
<string name="swing_left">Swing Left</string>
<string name="swing_right">Swing Right</string>
<string name="swing_forward">Swing Forward</string>
<string name="swing_backward">Swing Backward</string>
<string name="tilt_forward">Tilt Forward</string>
<string name="tilt_backward">Tilt Backward</string>
<string name="tilt_left">Tilt Left</string>
@ -133,6 +143,100 @@
<string name="shake_x">Shake X</string>
<string name="shake_y">Shake Y</string>
<string name="shake_z">Shake Z</string>
<!-- Nunchuk only buttons -->
<string name="nunchuk_button_c">Nunchuk Button C</string>
<string name="nunchuk_button_z">Nunchuk Button Z</string>
<string name="nunchuk_stick_up">Nunchuk Stick Up</string>
<string name="nunchuk_stick_down">Nunchuk Stick Down</string>
<string name="nunchuk_stick_left">Nunchuk Stick Left</string>
<string name="nunchuk_stick_right">Nunchuk Stick Right</string>
<string name="nunchuk_swing_up">Nunchuk Swing Up</string>
<string name="nunchuk_swing_down">Nunchuk Swing Down</string>
<string name="nunchuk_swing_left">Nunchuk Swing Left</string>
<string name="nunchuk_swing_right">Nunchuk Swing Right</string>
<string name="nunchuk_swing_forward">Nunchuk Swing Forward</string>
<string name="nunchuk_swing_backward">Nunchuk Swing Backward</string>
<string name="nunchuk_tilt_forward">Nunchuk Tilt Forward</string>
<string name="nunchuk_tilt_backward">Nunchuk Tilt Backward</string>
<string name="nunchuk_tilt_left">Nunchuk Tilt Left</string>
<string name="nunchuk_tilt_right">Nunchuk Tilt Right</string>
<string name="nunchuk_shake_x">Nunchuk Shake X</string>
<string name="nunchuk_shake_y">Nunchuk Shake Y</string>
<string name="nunchuk_shake_z">Nunchuk Shake Z</string>
<!-- Classic only buttons -->
<string name="classic_button_a">Classic Controller Button A</string>
<string name="classic_button_b">Classic Controller Button B</string>
<string name="classic_button_x">Classic Controller Button X</string>
<string name="classic_button_y">Classic Controller Button Y</string>
<string name="classic_button_minus">Classic Controller Button -</string>
<string name="classic_button_plus">Classic Controller Button +</string>
<string name="classic_button_home">Classic Controller Button Home</string>
<string name="classic_button_zl">Classic Controller Button ZL</string>
<string name="classic_button_zr">Classic Controller Button ZR</string>
<string name="classic_dpad_up">Classic Controller D-Pad Up</string>
<string name="classic_dpad_down">Classic Controller D-Pad Down</string>
<string name="classic_dpad_left">Classic Controller D-Pad Left</string>
<string name="classic_dpad_right">Classic Controller D-Pad Right</string>
<string name="classic_stick_left_up">Classic Controller Left Stick Up</string>
<string name="classic_stick_left_down">Classic Controller Left Stick Down</string>
<string name="classic_stick_left_left">Classic Controller Left Stick Left</string>
<string name="classic_stick_left_right">Classic Controller Left Stick Right</string>
<string name="classic_stick_right_up">Classic Controller Right Stick Up</string>
<string name="classic_stick_right_down">Classic Controller Right Stick Down</string>
<string name="classic_stick_right_left">Classic Controller Right Stick Left</string>
<string name="classic_stick_right_right">Classic Controller Right Stick Right</string>
<string name="classic_trigger_l">Classic Controller Left Trigger</string>
<string name="classic_trigger_r">Classic Controller Right Trigger</string>
<!-- Guitar only buttons -->
<string name="guitar_button_minus">Guitar Button -</string>
<string name="guitar_button_plus">Guitar Button +</string>
<string name="guitar_fret_green">Guitar Fret Red</string>
<string name="guitar_fret_red">Guitar Fret Red</string>
<string name="guitar_fret_yellow">Guitar Fret Yellow</string>
<string name="guitar_fret_blue">Guitar Fret Blue</string>
<string name="guitar_fret_orange">Guitar Fret Orange</string>
<string name="guitar_strum_up">Guitar Strum Up</string>
<string name="guitar_strum_down">Guitar Strum Down</string>
<string name="guitar_stick_up">Guitar Stick Up</string>
<string name="guitar_stick_down">Guitar Stick Down</string>
<string name="guitar_stick_left">Guitar Stick Left</string>
<string name="guitar_stick_right">Guitar Stick Right</string>
<string name="guitar_whammy_bar">Guitar Whammy Bar</string>
<!-- Drums only buttons -->
<string name="drums_button_minus">Drums Button -</string>
<string name="drums_button_plus">Drums Button +</string>
<string name="drums_pad_red">Drums Pad Red</string>
<string name="drums_pad_yellow">Drums Pad Yellow</string>
<string name="drums_pad_blue">Drums Pad Blue</string>
<string name="drums_pad_green">Drums Pad Green</string>
<string name="drums_pad_orange">Drums Pad Orange</string>
<string name="drums_pad_bass">Drums Pad Bass</string>
<string name="drums_stick_up">Drums Stick Up</string>
<string name="drums_stick_down">Drums Stick Down</string>
<string name="drums_stick_left">Drums Stick Left</string>
<string name="drums_stick_right">Drums Stick Right</string>
<!-- Turntable only buttons -->
<string name="turntable_button_green_left">Turntable Button Green Left</string>
<string name="turntable_button_red_left">Turntable Button Red Left</string>
<string name="turntable_button_blue_left">Turntable Button Blue Left</string>
<string name="turntable_button_green_right">Turntable Button Green Right</string>
<string name="turntable_button_red_right">Turntable Button Red Right</string>
<string name="turntable_button_blue_right">Turntable Button Blue Right</string>
<string name="turntable_button_minus">Turntable Button -</string>
<string name="turntable_button_plus">Turntable Button +</string>
<string name="turntable_button_home">Turntable Button Home</string>
<string name="turntable_button_euphoria">Turntable Button Euphoria</string>
<string name="turntable_table_left_left">Turntable Left Table Left</string>
<string name="turntable_table_left_right">Turntable Left Table Right</string>
<string name="turntable_table_right_left">Turntable Right Table Left</string>
<string name="turntable_table_right_right">Turntable Right Table Right</string>
<string name="turntable_stick_up">Turntable Stick Up</string>
<string name="turntable_stick_down">Turntable Stick Down</string>
<string name="turntable_stick_left">Turntable Stick Left</string>
<string name="turntable_stick_right">Turntable Stick Right</string>
<string name="turntable_effect_dial">Turntable Effekt Dial</string>
<string name="turntable_crossfade_left">Turntable Crossfade Left</string>
<string name="turntable_crossfade_right">Turntable Crossfade Right</string>
<!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string>

2443
Source/Android/app/src/main/res/xml/preferences.xml
View File

File diff suppressed because it is too large Load Diff

353
Source/Core/DolphinWX/Android/ButtonManager.cpp
View File

@ -47,6 +47,120 @@ namespace ButtonManager
"WiimoteDown",
"WiimoteLeft",
"WiimoteRight",
"WiimoteIRUp",
"WiimoteIRDown",
"WiimoteIRLeft",
"WiimoteIRRight",
"WiimoteIRForward",
"WiimoteIRBackward",
"WiimoteIRHide",
"WiimoteSwingUp",
"WiimoteSwingDown",
"WiimoteSwingLeft",
"WiimoteSwingRight",
"WiimoteSwingForward",
"WiimoteSwingBackward",
"WiimoteTiltForward",
"WiimoteTiltBackward",
"WiimoteTiltLeft",
"WiimoteTiltRight",
"WiimoteShakeX",
"WiimoteShakeY",
"WiimoteShakeZ",
// Nunchuk
"NunchukC",
"NunchukZ",
"NunchukUp",
"NunchukDown",
"NunchukLeft",
"NunchukRight",
"NunchukSwingUp",
"NunchukSwingDown",
"NunchukSwingLeft",
"NunchukSwingRight",
"NunchukSwingForward",
"NunchukSwingBackward",
"NunchukTiltForward",
"NunchukTiltBackward",
"NunchukTiltLeft",
"NunchukTiltRight",
"NunchukShakeX",
"NunchukShakeY",
"NunchukShakeZ",
// Classic
"ClassicA",
"ClassicB",
"ClassicX",
"ClassicY",
"ClassicMinus",
"ClassicPlus",
"ClassicHome",
"ClassicZL",
"ClassicZR",
"ClassicUp",
"ClassicDown",
"ClassicLeft",
"ClassicRight",
"ClassicLeftStickUp",
"ClassicLeftStickDown",
"ClassicLeftStickLeft",
"ClassicLeftStickRight",
"ClassicRightStickUp",
"ClassicRightStickDown",
"ClassicRightStickLeft",
"ClassicRightStickRight",
"ClassicTriggerL",
"ClassicTriggerR",
// Guitar
"GuitarMinus",
"GuitarPlus",
"GuitarGreen",
"GuitarRed",
"GuitarYellow",
"GuitarBue",
"GuitarOrange",
"GuitarStrumUp",
"GuitarStrumDown",
"GuitarUp",
"GuitarDown",
"GuitarLeft",
"GuitarRight",
"GuitarWhammy",
// Drums
"DrumsMinus",
"DrumsPlus",
"DrumsRed",
"DrumsYellow",
"DrumsBlue",
"DrumsGreen",
"DrumsOrange",
"DrumsBass",
"DrumsUp",
"DrumsDown",
"DrumsLeft",
"DrumsRight",
// Turntable
"TurntableGreenLeft",
"TurntableRedLeft",
"TurntableBlueLeft",
"TurntableGreenRight",
"TurntableRedRight",
"TurntableBlueRight",
"TurntableMinus",
"TurntablePlus",
"TurntableHome",
"TurntableEuphoria",
"TurntableLeftTLeft",
"TurntableLeftTRight",
"TurntableRightTLeft",
"TurntableRightTRight",
"TurntableUp",
"TurntableDown",
"TurntableLeft",
"TurntableRight",
"TurntableEffDial",
"TurntableCrossLeft",
"TurntableCrossRight",
};
std::vector<ButtonType> configTypes = {
// GC
@ -82,6 +196,120 @@ namespace ButtonManager
WIIMOTE_DOWN,
WIIMOTE_LEFT,
WIIMOTE_RIGHT,
WIIMOTE_IR_UP,
WIIMOTE_IR_DOWN,
WIIMOTE_IR_LEFT,
WIIMOTE_IR_RIGHT,
WIIMOTE_IR_FORWARD,
WIIMOTE_IR_BACKWARD,
WIIMOTE_IR_HIDE,
WIIMOTE_SWING_UP,
WIIMOTE_SWING_DOWN,
WIIMOTE_SWING_LEFT,
WIIMOTE_SWING_RIGHT,
WIIMOTE_SWING_FORWARD,
WIIMOTE_SWING_BACKWARD,
WIIMOTE_TILT_FORWARD,
WIIMOTE_TILT_BACKWARD,
WIIMOTE_TILT_LEFT,
WIIMOTE_TILT_RIGHT,
WIIMOTE_SHAKE_X,
WIIMOTE_SHAKE_Y,
WIIMOTE_SHAKE_Z,
// Nunchuk
NUNCHUK_BUTTON_C,
NUNCHUK_BUTTON_Z,
NUNCHUK_STICK_UP,
NUNCHUK_STICK_DOWN,
NUNCHUK_STICK_LEFT,
NUNCHUK_STICK_RIGHT,
NUNCHUK_SWING_UP,
NUNCHUK_SWING_DOWN,
NUNCHUK_SWING_LEFT,
NUNCHUK_SWING_RIGHT,
NUNCHUK_SWING_FORWARD,
NUNCHUK_SWING_BACKWARD,
NUNCHUK_TILT_FORWARD,
NUNCHUK_TILT_BACKWARD,
NUNCHUK_TILT_LEFT,
NUNCHUK_TILT_RIGHT,
NUNCHUK_SHAKE_X,
NUNCHUK_SHAKE_Y,
NUNCHUK_SHAKE_Z,
// Classic
CLASSIC_BUTTON_A,
CLASSIC_BUTTON_B,
CLASSIC_BUTTON_X,
CLASSIC_BUTTON_Y,
CLASSIC_BUTTON_MINUS,
CLASSIC_BUTTON_PLUS,
CLASSIC_BUTTON_HOME,
CLASSIC_BUTTON_ZL,
CLASSIC_BUTTON_ZR,
CLASSIC_DPAD_UP,
CLASSIC_DPAD_DOWN,
CLASSIC_DPAD_LEFT,
CLASSIC_DPAD_RIGHT,
CLASSIC_STICK_LEFT_UP,
CLASSIC_STICK_LEFT_DOWN,
CLASSIC_STICK_LEFT_LEFT,
CLASSIC_STICK_LEFT_RIGHT,
CLASSIC_STICK_RIGHT_UP,
CLASSIC_STICK_RIGHT_DOWN,
CLASSIC_STICK_RIGHT_LEFT,
CLASSIC_STICK_RIGHT_RIGHT,
CLASSIC_TRIGGER_L,
CLASSIC_TRIGGER_R,
// Guitar
GUITAR_BUTTON_MINUS,
GUITAR_BUTTON_PLUS,
GUITAR_FRET_GREEN,
GUITAR_FRET_RED,
GUITAR_FRET_YELLOW,
GUITAR_FRET_BLUE,
GUITAR_FRET_ORANGE,
GUITAR_STRUM_UP,
GUITAR_STRUM_DOWN,
GUITAR_STICK_UP,
GUITAR_STICK_DOWN,
GUITAR_STICK_LEFT,
GUITAR_STICK_RIGHT,
GUITAR_WHAMMY_BAR,
// Drums
DRUMS_BUTTON_MINUS,
DRUMS_BUTTON_PLUS,
DRUMS_PAD_RED,
DRUMS_PAD_YELLOW,
DRUMS_PAD_BLUE,
DRUMS_PAD_GREEN,
DRUMS_PAD_ORANGE,
DRUMS_PAD_BASS,
DRUMS_STICK_UP,
DRUMS_STICK_DOWN,
DRUMS_STICK_LEFT,
DRUMS_STICK_RIGHT,
// Turntable
TURNTABLE_BUTTON_GREEN_LEFT,
TURNTABLE_BUTTON_RED_LEFT,
TURNTABLE_BUTTON_BLUE_LEFT,
TURNTABLE_BUTTON_GREEN_RIGHT,
TURNTABLE_BUTTON_RED_RIGHT,
TURNTABLE_BUTTON_BLUE_RIGHT,
TURNTABLE_BUTTON_MINUS,
TURNTABLE_BUTTON_PLUS,
TURNTABLE_BUTTON_HOME,
TURNTABLE_BUTTON_EUPHORIA,
TURNTABLE_TABLE_LEFT_LEFT,
TURNTABLE_TABLE_LEFT_RIGHT,
TURNTABLE_TABLE_RIGHT_LEFT,
TURNTABLE_TABLE_RIGHT_RIGHT,
TURNTABLE_STICK_UP,
TURNTABLE_STICK_DOWN,
TURNTABLE_STICK_LEFT,
TURNTABLE_STICK_RIGHT,
TURNTABLE_EFFECT_DIAL,
TURNTABLE_CROSSFADE_LEFT,
TURNTABLE_CROSSFADE_RIGHT,
};
static void AddBind(const std::string& dev, sBind *bind)
@ -136,6 +364,131 @@ namespace ButtonManager
AddBind(touchScreenKey, new sBind(a, WIIMOTE_DOWN, BIND_BUTTON, WIIMOTE_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_LEFT, BIND_BUTTON, WIIMOTE_LEFT, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_RIGHT, BIND_BUTTON, WIIMOTE_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_HIDE, BIND_BUTTON, WIIMOTE_IR_HIDE, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_X, BIND_BUTTON, WIIMOTE_SHAKE_X, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Y, BIND_BUTTON, WIIMOTE_SHAKE_Y, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Z, BIND_BUTTON, WIIMOTE_SHAKE_Z, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_UP, BIND_AXIS, WIIMOTE_IR_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_DOWN, BIND_AXIS, WIIMOTE_IR_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_LEFT, BIND_AXIS, WIIMOTE_IR_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_RIGHT, BIND_AXIS, WIIMOTE_IR_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_FORWARD, BIND_AXIS, WIIMOTE_IR_FORWARD, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_BACKWARD, BIND_AXIS, WIIMOTE_IR_BACKWARD, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_UP, BIND_AXIS, WIIMOTE_SWING_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_DOWN, BIND_AXIS, WIIMOTE_SWING_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_LEFT, BIND_AXIS, WIIMOTE_SWING_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_RIGHT, BIND_AXIS, WIIMOTE_SWING_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_FORWARD, BIND_AXIS, WIIMOTE_SWING_FORWARD, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_BACKWARD, BIND_AXIS, WIIMOTE_SWING_BACKWARD, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_FORWARD, BIND_AXIS, WIIMOTE_TILT_FORWARD, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_BACKWARD, BIND_AXIS, WIIMOTE_TILT_BACKWARD, 1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_LEFT, BIND_AXIS, WIIMOTE_TILT_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_RIGHT, BIND_AXIS, WIIMOTE_TILT_RIGHT, 1.0f));
// Wii: Nunchuk
AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_C, BIND_BUTTON, NUNCHUK_BUTTON_C, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_Z, BIND_BUTTON, NUNCHUK_BUTTON_Z, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_X, BIND_BUTTON, NUNCHUK_SHAKE_X, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Y, BIND_BUTTON, NUNCHUK_SHAKE_Y, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Z, BIND_BUTTON, NUNCHUK_SHAKE_Z, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_UP, BIND_AXIS, NUNCHUK_SWING_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_DOWN, BIND_AXIS, NUNCHUK_SWING_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_LEFT, BIND_AXIS, NUNCHUK_SWING_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_RIGHT, BIND_AXIS, NUNCHUK_SWING_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_FORWARD, BIND_AXIS, NUNCHUK_SWING_FORWARD, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_BACKWARD, BIND_BUTTON, NUNCHUK_SWING_BACKWARD, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_FORWARD, BIND_AXIS, NUNCHUK_TILT_FORWARD, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_BACKWARD, BIND_AXIS, NUNCHUK_TILT_BACKWARD, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_LEFT, BIND_AXIS, NUNCHUK_TILT_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_RIGHT, BIND_AXIS, NUNCHUK_TILT_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_UP, BIND_AXIS, NUNCHUK_STICK_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_DOWN, BIND_AXIS, NUNCHUK_STICK_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_LEFT, BIND_AXIS, NUNCHUK_STICK_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_RIGHT, BIND_AXIS, NUNCHUK_STICK_RIGHT, 1.0f));
// Wii: Classic
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_A, BIND_BUTTON, CLASSIC_BUTTON_A, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_B, BIND_BUTTON, CLASSIC_BUTTON_B, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_X, BIND_BUTTON, CLASSIC_BUTTON_X, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_Y, BIND_BUTTON, CLASSIC_BUTTON_Y, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_MINUS, BIND_BUTTON, CLASSIC_BUTTON_MINUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_PLUS, BIND_BUTTON, CLASSIC_BUTTON_PLUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_HOME, BIND_BUTTON, CLASSIC_BUTTON_HOME, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_ZL, BIND_BUTTON, CLASSIC_BUTTON_ZL, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_ZR, BIND_BUTTON, CLASSIC_BUTTON_ZR, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_UP, BIND_BUTTON, CLASSIC_DPAD_UP, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_DOWN, BIND_BUTTON, CLASSIC_DPAD_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_LEFT, BIND_BUTTON, CLASSIC_DPAD_LEFT, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_RIGHT, BIND_BUTTON, CLASSIC_DPAD_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_UP, BIND_AXIS, CLASSIC_STICK_LEFT_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_DOWN, BIND_AXIS, CLASSIC_STICK_LEFT_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_LEFT, BIND_AXIS, CLASSIC_STICK_LEFT_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_RIGHT, BIND_AXIS, CLASSIC_STICK_LEFT_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_UP, BIND_AXIS, CLASSIC_STICK_RIGHT_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_DOWN, BIND_AXIS, CLASSIC_STICK_RIGHT_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_LEFT, BIND_AXIS, CLASSIC_STICK_RIGHT_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_RIGHT, BIND_AXIS, CLASSIC_STICK_RIGHT_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_TRIGGER_L, BIND_AXIS, CLASSIC_TRIGGER_L, 1.0f));
AddBind(touchScreenKey, new sBind(a, CLASSIC_TRIGGER_R, BIND_AXIS, CLASSIC_TRIGGER_R, 1.0f));
// Wii: Guitar
AddBind(touchScreenKey, new sBind(a, GUITAR_BUTTON_MINUS, BIND_BUTTON, GUITAR_BUTTON_MINUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_BUTTON_PLUS, BIND_BUTTON, GUITAR_BUTTON_PLUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_GREEN, BIND_BUTTON, GUITAR_FRET_GREEN, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_RED, BIND_BUTTON, GUITAR_FRET_RED, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_YELLOW, BIND_BUTTON, GUITAR_FRET_YELLOW, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_BLUE, BIND_BUTTON, GUITAR_FRET_BLUE, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_ORANGE, BIND_BUTTON, GUITAR_FRET_ORANGE, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_STRUM_UP, BIND_BUTTON, GUITAR_STRUM_UP, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_STRUM_DOWN, BIND_BUTTON, GUITAR_STRUM_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_UP, BIND_AXIS, GUITAR_STICK_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_DOWN, BIND_AXIS, GUITAR_STICK_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_LEFT, BIND_AXIS, GUITAR_STICK_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_RIGHT, BIND_AXIS, GUITAR_STICK_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, GUITAR_WHAMMY_BAR, BIND_AXIS, GUITAR_WHAMMY_BAR, 1.0f));
// Wii: Drums
AddBind(touchScreenKey, new sBind(a, DRUMS_BUTTON_MINUS, BIND_BUTTON, DRUMS_BUTTON_MINUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_BUTTON_PLUS, BIND_BUTTON, DRUMS_BUTTON_PLUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_RED, BIND_BUTTON, DRUMS_PAD_RED, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_YELLOW, BIND_BUTTON, DRUMS_PAD_YELLOW, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_BLUE, BIND_BUTTON, DRUMS_PAD_BLUE, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_GREEN, BIND_BUTTON, DRUMS_PAD_GREEN, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_ORANGE, BIND_BUTTON, DRUMS_PAD_ORANGE, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_BASS, BIND_BUTTON, DRUMS_PAD_BASS, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_UP, BIND_AXIS, DRUMS_STICK_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_DOWN, BIND_AXIS, DRUMS_STICK_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_LEFT, BIND_AXIS, DRUMS_STICK_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_RIGHT, BIND_AXIS, DRUMS_STICK_RIGHT, 1.0f));
// Wii: Turntable
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_GREEN_LEFT, BIND_BUTTON, TURNTABLE_BUTTON_GREEN_LEFT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_RED_LEFT, BIND_BUTTON, TURNTABLE_BUTTON_RED_LEFT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_BLUE_LEFT, BIND_BUTTON, TURNTABLE_BUTTON_BLUE_LEFT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_GREEN_RIGHT, BIND_BUTTON, TURNTABLE_BUTTON_GREEN_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_RED_RIGHT, BIND_BUTTON, TURNTABLE_BUTTON_RED_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_BLUE_RIGHT, BIND_BUTTON, TURNTABLE_BUTTON_BLUE_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_MINUS, BIND_BUTTON, TURNTABLE_BUTTON_MINUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_PLUS, BIND_BUTTON, TURNTABLE_BUTTON_PLUS, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_HOME, BIND_BUTTON, TURNTABLE_BUTTON_HOME, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_EUPHORIA, BIND_BUTTON, TURNTABLE_BUTTON_EUPHORIA, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_LEFT_LEFT, BIND_AXIS, TURNTABLE_TABLE_LEFT_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_LEFT_RIGHT, BIND_AXIS, TURNTABLE_TABLE_LEFT_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_RIGHT_LEFT, BIND_AXIS, TURNTABLE_TABLE_RIGHT_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_RIGHT_RIGHT, BIND_AXIS, TURNTABLE_TABLE_RIGHT_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_UP, BIND_AXIS, TURNTABLE_STICK_UP, -1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_DOWN, BIND_AXIS, TURNTABLE_STICK_DOWN, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_LEFT, BIND_AXIS, TURNTABLE_STICK_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_RIGHT, BIND_AXIS, TURNTABLE_STICK_RIGHT, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_EFFECT_DIAL, BIND_AXIS, TURNTABLE_EFFECT_DIAL, 1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_CROSSFADE_LEFT, BIND_AXIS, TURNTABLE_CROSSFADE_LEFT, -1.0f));
AddBind(touchScreenKey, new sBind(a, TURNTABLE_CROSSFADE_RIGHT, BIND_AXIS, TURNTABLE_CROSSFADE_RIGHT, 1.0f));
}
// Init our controller bindings
IniFile ini;

120
Source/Core/DolphinWX/Android/ButtonManager.h
View File

@ -46,6 +46,126 @@ namespace ButtonManager
WIIMOTE_DOWN = 30,
WIIMOTE_LEFT = 31,
WIIMOTE_RIGHT = 32,
WIIMOTE_IR_UP = 33,
WIIMOTE_IR_DOWN = 34,
WIIMOTE_IR_LEFT = 35,
WIIMOTE_IR_RIGHT = 36,
WIIMOTE_IR_FORWARD = 37,
WIIMOTE_IR_BACKWARD = 38,
WIIMOTE_IR_HIDE = 39,
WIIMOTE_SWING_UP = 40,
WIIMOTE_SWING_DOWN = 41,
WIIMOTE_SWING_LEFT = 42,
WIIMOTE_SWING_RIGHT = 43,
WIIMOTE_SWING_FORWARD = 44,
WIIMOTE_SWING_BACKWARD = 45,
WIIMOTE_TILT_FORWARD = 46,
WIIMOTE_TILT_BACKWARD = 47,
WIIMOTE_TILT_LEFT = 48,
WIIMOTE_TILT_RIGHT = 49,
WIIMOTE_SHAKE_X = 51,
WIIMOTE_SHAKE_Y = 52,
WIIMOTE_SHAKE_Z = 53,
//Nunchuk
NUNCHUK_BUTTON_C = 54,
NUNCHUK_BUTTON_Z = 55,
NUNCHUK_STICK = 56,
NUNCHUK_STICK_UP = 57,
NUNCHUK_STICK_DOWN = 58,
NUNCHUK_STICK_LEFT = 59,
NUNCHUK_STICK_RIGHT = 60,
NUNCHUK_SWING_UP = 61,
NUNCHUK_SWING_DOWN = 62,
NUNCHUK_SWING_LEFT = 63,
NUNCHUK_SWING_RIGHT = 64,
NUNCHUK_SWING_FORWARD = 65,
NUNCHUK_SWING_BACKWARD = 66,
NUNCHUK_TILT_FORWARD = 67,
NUNCHUK_TILT_BACKWARD = 68,
NUNCHUK_TILT_LEFT = 69,
NUNCHUK_TILT_RIGHT = 70,
NUNCHUK_SHAKE_X = 72,
NUNCHUK_SHAKE_Y = 73,
NUNCHUK_SHAKE_Z = 74,
//Classic
CLASSIC_BUTTON_A = 75,
CLASSIC_BUTTON_B = 76,
CLASSIC_BUTTON_X = 77,
CLASSIC_BUTTON_Y = 78,
CLASSIC_BUTTON_MINUS = 79,
CLASSIC_BUTTON_PLUS = 80,
CLASSIC_BUTTON_HOME = 81,
CLASSIC_BUTTON_ZL = 82,
CLASSIC_BUTTON_ZR = 83,
CLASSIC_DPAD_UP = 84,
CLASSIC_DPAD_DOWN = 85,
CLASSIC_DPAD_LEFT = 86,
CLASSIC_DPAD_RIGHT = 87,
CLASSIC_STICK_LEFT = 88,
CLASSIC_STICK_LEFT_UP = 89,
CLASSIC_STICK_LEFT_DOWN = 90,
CLASSIC_STICK_LEFT_LEFT = 91,
CLASSIC_STICK_LEFT_RIGHT = 92,
CLASSIC_STICK_RIGHT = 93,
CLASSIC_STICK_RIGHT_UP = 94,
CLASSIC_STICK_RIGHT_DOWN = 95,
CLASSIC_STICK_RIGHT_LEFT = 96,
CLASSIC_STICK_RIGHT_RIGHT = 97,
CLASSIC_TRIGGER_L = 98,
CLASSIC_TRIGGER_R = 99,
//Guitar
GUITAR_BUTTON_MINUS = 100,
GUITAR_BUTTON_PLUS = 101,
GUITAR_FRET_GREEN = 102,
GUITAR_FRET_RED = 103,
GUITAR_FRET_YELLOW = 104,
GUITAR_FRET_BLUE = 105,
GUITAR_FRET_ORANGE = 106,
GUITAR_STRUM_UP = 107,
GUITAR_STRUM_DOWN = 108,
GUITAR_STICK = 109,
GUITAR_STICK_UP = 110,
GUITAR_STICK_DOWN = 111,
GUITAR_STICK_LEFT = 112,
GUITAR_STICK_RIGHT = 113,
GUITAR_WHAMMY_BAR = 114,
//Drums
DRUMS_BUTTON_MINUS = 115,
DRUMS_BUTTON_PLUS = 116,
DRUMS_PAD_RED = 117,
DRUMS_PAD_YELLOW = 118,
DRUMS_PAD_BLUE = 119,
DRUMS_PAD_GREEN = 120,
DRUMS_PAD_ORANGE = 121,
DRUMS_PAD_BASS = 122,
DRUMS_STICK = 123,
DRUMS_STICK_UP = 124,
DRUMS_STICK_DOWN = 125,
DRUMS_STICK_LEFT = 126,
DRUMS_STICK_RIGHT = 127,
//Turntable
TURNTABLE_BUTTON_GREEN_LEFT = 128,
TURNTABLE_BUTTON_RED_LEFT = 129,
TURNTABLE_BUTTON_BLUE_LEFT = 130,
TURNTABLE_BUTTON_GREEN_RIGHT = 131,
TURNTABLE_BUTTON_RED_RIGHT = 132,
TURNTABLE_BUTTON_BLUE_RIGHT = 133,
TURNTABLE_BUTTON_MINUS = 134,
TURNTABLE_BUTTON_PLUS = 135,
TURNTABLE_BUTTON_HOME = 136,
TURNTABLE_BUTTON_EUPHORIA = 137,
TURNTABLE_TABLE_LEFT_LEFT = 138,
TURNTABLE_TABLE_LEFT_RIGHT = 139,
TURNTABLE_TABLE_RIGHT_LEFT = 140,
TURNTABLE_TABLE_RIGHT_RIGHT = 141,
TURNTABLE_STICK = 142,
TURNTABLE_STICK_UP = 143,
TURNTABLE_STICK_DOWN = 144,
TURNTABLE_STICK_LEFT = 145,
TURNTABLE_STICK_RIGHT = 146,
TURNTABLE_EFFECT_DIAL = 147,
TURNTABLE_CROSSFADE_LEFT = 148,
TURNTABLE_CROSSFADE_RIGHT = 149,
};
enum ButtonState
{

91
Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
View File

@ -71,6 +71,97 @@ Touchscreen::Touchscreen(int padID)
AddInput(new Button(_padID, ButtonManager::WIIMOTE_DOWN));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_LEFT));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_RIGHT));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_IR_HIDE));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_X));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Y));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Z));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_IR_UP), new Axis(_padID, ButtonManager::WIIMOTE_IR_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_IR_LEFT), new Axis(_padID, ButtonManager::WIIMOTE_IR_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_IR_FORWARD), new Axis(_padID, ButtonManager::WIIMOTE_IR_BACKWARD));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_SWING_UP), new Axis(_padID, ButtonManager::WIIMOTE_SWING_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_SWING_LEFT), new Axis(_padID, ButtonManager::WIIMOTE_SWING_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_SWING_FORWARD), new Axis(_padID, ButtonManager::WIIMOTE_SWING_BACKWARD));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_TILT_LEFT), new Axis(_padID, ButtonManager::WIIMOTE_TILT_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_TILT_FORWARD), new Axis(_padID, ButtonManager::WIIMOTE_TILT_BACKWARD));
//Wii ext: Nunchuk
AddInput(new Button(_padID, ButtonManager::NUNCHUK_BUTTON_C));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_BUTTON_Z));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_X));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Y));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Z));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_STICK_LEFT), new Axis(_padID, ButtonManager::NUNCHUK_STICK_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_STICK_UP), new Axis(_padID, ButtonManager::NUNCHUK_STICK_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_SWING_LEFT), new Axis(_padID, ButtonManager::NUNCHUK_SWING_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_SWING_UP), new Axis(_padID, ButtonManager::NUNCHUK_SWING_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_SWING_FORWARD), new Axis(_padID, ButtonManager::NUNCHUK_SWING_BACKWARD));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_TILT_LEFT), new Axis(_padID, ButtonManager::NUNCHUK_TILT_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_TILT_FORWARD), new Axis(_padID, ButtonManager::NUNCHUK_TILT_BACKWARD));
// Wii ext: Classic
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_A));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_B));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_X));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_Y));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_MINUS));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_PLUS));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_HOME));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_ZL));
AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_ZR));
AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_UP));
AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_DOWN));
AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_LEFT));
AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_LEFT), new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_UP), new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_LEFT), new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_UP), new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_L), new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_L));
AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_R), new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_R));
// Wii-ext: Guitar
AddInput(new Button(_padID, ButtonManager::GUITAR_BUTTON_MINUS));
AddInput(new Button(_padID, ButtonManager::GUITAR_BUTTON_PLUS));
AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_GREEN));
AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_RED));
AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_YELLOW));
AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_BLUE));
AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_ORANGE));
AddInput(new Button(_padID, ButtonManager::GUITAR_STRUM_UP));
AddInput(new Button(_padID, ButtonManager::GUITAR_STRUM_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::GUITAR_STICK_LEFT), new Axis(_padID, ButtonManager::GUITAR_STICK_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::GUITAR_STICK_UP), new Axis(_padID, ButtonManager::GUITAR_STICK_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::GUITAR_WHAMMY_BAR), new Axis(_padID, ButtonManager::GUITAR_WHAMMY_BAR));
// Wii-ext: Drums
AddInput(new Button(_padID, ButtonManager::DRUMS_BUTTON_MINUS));
AddInput(new Button(_padID, ButtonManager::DRUMS_BUTTON_PLUS));
AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_RED));
AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_YELLOW));
AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_BLUE));
AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_GREEN));
AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_ORANGE));
AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_BASS));
AddAnalogInputs(new Axis(_padID, ButtonManager::DRUMS_STICK_LEFT), new Axis(_padID, ButtonManager::DRUMS_STICK_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::DRUMS_STICK_UP), new Axis(_padID, ButtonManager::DRUMS_STICK_DOWN));
// Wii-ext: Turntable
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_GREEN_LEFT));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_RED_LEFT));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_BLUE_LEFT));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_GREEN_RIGHT));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_RED_RIGHT));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_BLUE_RIGHT));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_MINUS));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_PLUS));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_HOME));
AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_EUPHORIA));
AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_TABLE_LEFT_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_TABLE_LEFT_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_TABLE_RIGHT_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_TABLE_RIGHT_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_STICK_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_STICK_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_STICK_UP), new Axis(_padID, ButtonManager::TURNTABLE_STICK_DOWN));
AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_CROSSFADE_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_CROSSFADE_RIGHT));
AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_EFFECT_DIAL), new Axis(_padID, ButtonManager::TURNTABLE_EFFECT_DIAL));
}
// Buttons and stuff