Merge pull request #3311 from Phatcat/analog_input_android

[Android] More analog input configurations + misc
This commit is contained in:
Markus Wick 2016-01-04 14:57:43 +01:00
commit f3c1cc95fc
11 changed files with 5626 additions and 4084 deletions

View File

@ -2,103 +2,99 @@
Device = Android/0/Touchscreen
Buttons/A = `Button 0`
Buttons/B = `Button 1`
Buttons/Start = `Button 2`
Buttons/X = `Button 3`
Buttons/Y = `Button 4`
Buttons/Z = `Button 5`
Buttons/Start = `Button 2`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Modifier = Shift_L
Main Stick/Modifier/Range = 50.000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Modifier = Control_L
C-Stick/Modifier/Range = 50.000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
D-Pad/Up = `Button 6`
D-Pad/Down = `Button 7`
D-Pad/Left = `Button 8`
D-Pad/Right = `Button 9`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Radius = 100,000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Radius = 100,000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
Triggers/Threshold = 90,000000
[GCPad2]
Device = Android/1/Touchscreen
Buttons/A = `Button 0`
Buttons/B = `Button 1`
Buttons/Start = `Button 2`
Buttons/X = `Button 3`
Buttons/Y = `Button 4`
Buttons/Z = `Button 5`
Buttons/Start = `Button 2`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Modifier = Shift_L
Main Stick/Modifier/Range = 50.000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Modifier = Control_L
C-Stick/Modifier/Range = 50.000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
D-Pad/Up = `Button 6`
D-Pad/Down = `Button 7`
D-Pad/Left = `Button 8`
D-Pad/Right = `Button 9`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Radius = 100,000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Radius = 100,000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
Triggers/Threshold = 90,000000
[GCPad3]
Device = Android/2/Touchscreen
Buttons/A = `Button 0`
Buttons/B = `Button 1`
Buttons/Start = `Button 2`
Buttons/X = `Button 3`
Buttons/Y = `Button 4`
Buttons/Z = `Button 5`
Buttons/Start = `Button 2`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Modifier = Shift_L
Main Stick/Modifier/Range = 50.000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Modifier = Control_L
C-Stick/Modifier/Range = 50.000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
D-Pad/Up = `Button 6`
D-Pad/Down = `Button 7`
D-Pad/Left = `Button 8`
D-Pad/Right = `Button 9`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Radius = 100,000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Radius = 100,000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
Triggers/Threshold = 90,000000
[GCPad4]
Device = Android/3/Touchscreen
Buttons/A = `Button 0`
Buttons/B = `Button 1`
Buttons/Start = `Button 2`
Buttons/X = `Button 3`
Buttons/Y = `Button 4`
Buttons/Z = `Button 5`
Buttons/Start = `Button 2`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Modifier = Shift_L
Main Stick/Modifier/Range = 50.000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Modifier = Control_L
C-Stick/Modifier/Range = 50.000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
D-Pad/Up = `Button 6`
D-Pad/Down = `Button 7`
D-Pad/Left = `Button 8`
D-Pad/Right = `Button 9`
Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14`
Main Stick/Radius = 100,000000
C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19`
C-Stick/Radius = 100,000000
Triggers/L = `Axis 20`
Triggers/R = `Axis 21`
Triggers/Threshold = 90,000000

File diff suppressed because it is too large Load Diff

View File

@ -47,134 +47,142 @@ public final class NativeLibrary
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;
public static final int WIIMOTE_BUTTON_A = 100;
public static final int WIIMOTE_BUTTON_B = 101;
public static final int WIIMOTE_BUTTON_MINUS = 102;
public static final int WIIMOTE_BUTTON_PLUS = 103;
public static final int WIIMOTE_BUTTON_HOME = 104;
public static final int WIIMOTE_BUTTON_1 = 105;
public static final int WIIMOTE_BUTTON_2 = 106;
public static final int WIIMOTE_UP = 107;
public static final int WIIMOTE_DOWN = 108;
public static final int WIIMOTE_LEFT = 119;
public static final int WIIMOTE_RIGHT = 110;
public static final int WIIMOTE_IR = 111;
public static final int WIIMOTE_IR_UP = 112;
public static final int WIIMOTE_IR_DOWN = 113;
public static final int WIIMOTE_IR_LEFT = 114;
public static final int WIIMOTE_IR_RIGHT = 115;
public static final int WIIMOTE_IR_FORWARD = 116;
public static final int WIIMOTE_IR_BACKWARD = 117;
public static final int WIIMOTE_IR_HIDE = 118;
public static final int WIIMOTE_SWING = 119;
public static final int WIIMOTE_SWING_UP = 120;
public static final int WIIMOTE_SWING_DOWN = 121;
public static final int WIIMOTE_SWING_LEFT = 122;
public static final int WIIMOTE_SWING_RIGHT = 123;
public static final int WIIMOTE_SWING_FORWARD = 124;
public static final int WIIMOTE_SWING_BACKWARD = 125;
public static final int WIIMOTE_TILT = 126;
public static final int WIIMOTE_TILT_FORWARD = 127;
public static final int WIIMOTE_TILT_BACKWARD = 128;
public static final int WIIMOTE_TILT_LEFT = 129;
public static final int WIIMOTE_TILT_RIGHT = 130;
public static final int WIIMOTE_TILT_MODIFIER = 131;
public static final int WIIMOTE_SHAKE_X = 132;
public static final int WIIMOTE_SHAKE_Y = 133;
public static final int WIIMOTE_SHAKE_Z = 134;
public static final int NUNCHUK_BUTTON_C = 200;
public static final int NUNCHUK_BUTTON_Z = 201;
public static final int NUNCHUK_STICK = 202;
public static final int NUNCHUK_STICK_UP = 203;
public static final int NUNCHUK_STICK_DOWN = 204;
public static final int NUNCHUK_STICK_LEFT = 205;
public static final int NUNCHUK_STICK_RIGHT = 206;
public static final int NUNCHUK_SWING = 207;
public static final int NUNCHUK_SWING_UP = 208;
public static final int NUNCHUK_SWING_DOWN = 209;
public static final int NUNCHUK_SWING_LEFT = 210;
public static final int NUNCHUK_SWING_RIGHT = 221;
public static final int NUNCHUK_SWING_FORWARD = 212;
public static final int NUNCHUK_SWING_BACKWARD = 213;
public static final int NUNCHUK_TILT = 214;
public static final int NUNCHUK_TILT_FORWARD = 215;
public static final int NUNCHUK_TILT_BACKWARD = 216;
public static final int NUNCHUK_TILT_LEFT = 217;
public static final int NUNCHUK_TILT_RIGHT = 218;
public static final int NUNCHUK_TILT_MODIFIER = 219;
public static final int NUNCHUK_SHAKE_X = 220;
public static final int NUNCHUK_SHAKE_Y = 221;
public static final int NUNCHUK_SHAKE_Z = 222;
public static final int CLASSIC_BUTTON_A = 300;
public static final int CLASSIC_BUTTON_B = 301;
public static final int CLASSIC_BUTTON_X = 302;
public static final int CLASSIC_BUTTON_Y = 303;
public static final int CLASSIC_BUTTON_MINUS = 304;
public static final int CLASSIC_BUTTON_PLUS = 305;
public static final int CLASSIC_BUTTON_HOME = 306;
public static final int CLASSIC_BUTTON_ZL = 307;
public static final int CLASSIC_BUTTON_ZR = 308;
public static final int CLASSIC_DPAD_UP = 309;
public static final int CLASSIC_DPAD_DOWN = 310;
public static final int CLASSIC_DPAD_LEFT = 311;
public static final int CLASSIC_DPADON_RIGHT = 312;
public static final int CLASSIC_STICK_LEFT = 313;
public static final int CLASSIC_STICK_LEFT_UP = 314;
public static final int CLASSIC_STICK_LEFT_DOWN = 315;
public static final int CLASSIC_STICK_LEFT_LEFT = 316;
public static final int CLASSIC_STICK_LEFT_RIGHT = 317;
public static final int CLASSIC_STICK_RIGHT = 318;
public static final int CLASSIC_STICK_RIGHT_UP = 319;
public static final int CLASSIC_STICK_RIGHT_DOWN = 100;
public static final int CLASSIC_STICK_RIGHT_LEFT = 321;
public static final int CLASSIC_STICK_RIGHT_RIGHT = 322;
public static final int CLASSIC_TRIGGER_L = 323;
public static final int CLASSIC_TRIGGER_R = 324;
public static final int GUITAR_BUTTON_MINUS = 400;
public static final int GUITAR_BUTTON_PLUS = 401;
public static final int GUITAR_FRET_GREEN = 402;
public static final int GUITAR_FRET_RED = 403;
public static final int GUITAR_FRET_YELLOW = 404;
public static final int GUITAR_FRET_BLUE = 405;
public static final int GUITAR_FRET_ORANGE = 406;
public static final int GUITAR_STRUM_UP = 407;
public static final int GUITAR_STRUM_DOWN = 408;
public static final int GUITAR_STICK = 409;
public static final int GUITAR_STICK_UP = 410;
public static final int GUITAR_STICK_DOWN = 411;
public static final int GUITAR_STICK_LEFT = 412;
public static final int GUITAR_STICK_RIGHT = 413;
public static final int GUITAR_WHAMMY_BAR = 414;
public static final int DRUMS_BUTTON_MINUS = 500;
public static final int DRUMS_BUTTON_PLUS = 501;
public static final int DRUMS_PAD_RED = 502;
public static final int DRUMS_PAD_YELLOW = 503;
public static final int DRUMS_PAD_BLUE = 504;
public static final int DRUMS_PAD_GREEN = 505;
public static final int DRUMS_PAD_ORANGE = 506;
public static final int DRUMS_PAD_BASS = 507;
public static final int DRUMS_STICK = 508;
public static final int DRUMS_STICK_UP = 509;
public static final int DRUMS_STICK_DOWN = 510;
public static final int DRUMS_STICK_LEFT = 511;
public static final int DRUMS_STICK_RIGHT = 512;
public static final int TURNTABLE_BUTTON_GREEN_LEFT = 600;
public static final int TURNTABLE_BUTTON_RED_LEFT = 601;
public static final int TURNTABLE_BUTTON_BLUE_LEFT = 602;
public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 603;
public static final int TURNTABLE_BUTTON_RED_RIGHT = 604;
public static final int TURNTABLE_BUTTON_BLUE_RIGHT = 605;
public static final int TURNTABLE_BUTTON_MINUS = 606;
public static final int TURNTABLE_BUTTON_PLUS = 607;
public static final int TURNTABLE_BUTTON_HOME = 608;
public static final int TURNTABLE_BUTTON_EUPHORIA = 609;
public static final int TURNTABLE_TABLE_LEFT = 610;
public static final int TURNTABLE_TABLE_LEFT_LEFT = 611;
public static final int TURNTABLE_TABLE_LEFT_RIGHT = 612;
public static final int TURNTABLE_TABLE_RIGHT = 613;
public static final int TURNTABLE_TABLE_RIGHT_LEFT = 614;
public static final int TURNTABLE_TABLE_RIGHT_RIGHT = 615;
public static final int TURNTABLE_STICK = 616;
public static final int TURNTABLE_STICK_UP = 617;
public static final int TURNTABLE_STICK_DOWN = 618;
public static final int TURNTABLE_STICK_LEFT = 619;
public static final int TURNTABLE_STICK_RIGHT = 620;
public static final int TURNTABLE_EFFECT_DIAL = 621;
public static final int TURNTABLE_CROSSFADE = 622;
public static final int TURNTABLE_CROSSFADE_LEFT = 623;
public static final int TURNTABLE_CROSSFADE_RIGHT = 624;
}
/**

View File

@ -49,10 +49,67 @@ public final class UserPreferences
editor.putBoolean("OverclockEnable", getConfig("Dolphin.ini", "Core", "OverclockEnable", "False").equals("True"));
editor.putString("Overclock", getConfig("Dolphin.ini", "Core", "Overclock", "100"));
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"));
// Load analog ranges from GCPadNew.ini and WiimoteNew.ini
editor.putString("mainRadius0", getConfig("GCPadNew.ini", "GCPad1", "Main Stick/Radius", "100,000000"));
editor.putString("cStickRadius0", getConfig("GCPadNew.ini", "GCPad1", "C-Stick/Radius", "100,000000"));
editor.putString("inputThres0", getConfig("GCPadNew.ini", "GCPad1", "Triggers/Threshold", "90,000000"));
editor.putString("mainRadius1", getConfig("GCPadNew.ini", "GCPad2", "Main Stick/Radius", "100,000000"));
editor.putString("cStickRadius1", getConfig("GCPadNew.ini", "GCPad2", "C-Stick/Radius", "100,000000"));
editor.putString("inputThres1", getConfig("GCPadNew.ini", "GCPad2", "Triggers/Threshold", "90,000000"));
editor.putString("mainRadius2", getConfig("GCPadNew.ini", "GCPad3", "Main Stick/Radius", "100,000000"));
editor.putString("cStickRadius2", getConfig("GCPadNew.ini", "GCPad3", "C-Stick/Radius", "100,000000"));
editor.putString("inputThres2", getConfig("GCPadNew.ini", "GCPad3", "Triggers/Threshold", "90,000000"));
editor.putString("mainRadius3", getConfig("GCPadNew.ini", "GCPad4", "Main Stick/Radius", "100,000000"));
editor.putString("cStickRadius3", getConfig("GCPadNew.ini", "GCPad4", "C-Stick/Radius", "100,000000"));
editor.putString("inputThres3", getConfig("GCPadNew.ini", "GCPad4", "Triggers/Threshold", "90,000000"));
editor.putString("tiltRange4", getConfig("WiimoteNew.ini", "Wiimote1", "Tilt/Modifier/Range", "50,00000"));
editor.putString("tiltRange5", getConfig("WiimoteNew.ini", "Wiimote2", "Tilt/Modifier/Range", "50,00000"));
editor.putString("tiltRange6", getConfig("WiimoteNew.ini", "Wiimote3", "Tilt/Modifier/Range", "50,00000"));
editor.putString("tiltRange7", getConfig("WiimoteNew.ini", "Wiimote4", "Tilt/Modifier/Range", "50,00000"));
editor.putString("nunchukRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", "100,000000"));
editor.putString("nunchukRange4", getConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
editor.putString("nunchukRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", "100,000000"));
editor.putString("nunchukRange5", getConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
editor.putString("nunchukRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", "100,000000"));
editor.putString("nunchukRange6", getConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
editor.putString("nunchukRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", "100,000000"));
editor.putString("nunchukRange7", getConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
editor.putString("classicLRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Left Stick/Radius", "100,000000"));
editor.putString("classicRRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Right Stick/Radius", "100,000000"));
editor.putString("classicThres4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Triggers/Threshold", "90,000000"));
editor.putString("classicLRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Left Stick/Radius", "100,000000"));
editor.putString("classicRRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Right Stick/Radius", "100,000000"));
editor.putString("classicThres5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Triggers/Threshold", "90,000000"));
editor.putString("classicLRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Left Stick/Radius", "100,000000"));
editor.putString("classicRRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Right Stick/Radius", "100,000000"));
editor.putString("classicThres6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Triggers/Threshold", "90,000000"));
editor.putString("classicLRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Left Stick/Radius", "100,000000"));
editor.putString("classicRRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Right Stick/Radius", "100,000000"));
editor.putString("classicThres7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Triggers/Threshold", "90,000000"));
editor.putString("guitarRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Guitar/Stick/Radius", "100,000000"));
editor.putString("guitarRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Guitar/Stick/Radius", "100,000000"));
editor.putString("guitarRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Guitar/Stick/Radius", "100,000000"));
editor.putString("guitarRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Guitar/Stick/Radius", "100,000000"));
editor.putString("drumsRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Drums/Stick/Radius", "100,000000"));
editor.putString("drumsRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Drums/Stick/Radius", "100,000000"));
editor.putString("drumsRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Drums/Stick/Radius", "100,000000"));
editor.putString("drumsRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Drums/Stick/Radius", "100,000000"));
editor.putString("turntableRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Turntable/Stick/Radius", "100,000000"));
editor.putString("turntableRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Turntable/Stick/Radius", "100,000000"));
editor.putString("turntableRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Turntable/Stick/Radius", "100,000000"));
editor.putString("turntableRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Turntable/Stick/Radius", "100,000000"));
// Load Wiimote Extension settings from WiimoteNew.ini
editor.putString("wiimoteExtension4", getConfig("WiimoteNew.ini", "Wiimote1", "Extension", "None"));
editor.putString("wiimoteExtension5", getConfig("WiimoteNew.ini", "Wiimote2", "Extension", "None"));
editor.putString("wiimoteExtension6", getConfig("WiimoteNew.ini", "Wiimote3", "Extension", "None"));
editor.putString("wiimoteExtension7", 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"));
@ -147,11 +204,73 @@ public final class UserPreferences
boolean overclockEnabled = prefs.getBoolean("OverclockEnable", false);
String overclockSetting = prefs.getString("Overclock", "100");
// Current GC analog range setup. Falls back to default upon error.
String currentMainRadius0 = prefs.getString("mainRadius0", "100,000000");
String currentCStickRadius0 = prefs.getString("cStickRadius0", "100,000000");
String currentInputThres0 = prefs.getString("inputThres0", "90,000000");
String currentMainRadius1 = prefs.getString("mainRadius1", "100,000000");
String currentCStickRadius1 = prefs.getString("cStickRadius1", "100,000000");
String currentInputThres1 = prefs.getString("inputThres1", "90,000000");
String currentMainRadius2 = prefs.getString("mainRadius2", "100,000000");
String currentCStickRadius2 = prefs.getString("cStickRadius2", "100,000000");
String currentInputThres2 = prefs.getString("inputThres2", "90,000000");
String currentMainRadius3 = prefs.getString("mainRadius3", "100,000000");
String currentCStickRadius3 = prefs.getString("cStickRadius3", "100,000000");
String currentInputThres3 = prefs.getString("inputThres3", "90,000000");
// Current Wii analog range setup. Falls back to default on error.
String currentTiltRange4 = prefs.getString("tiltRange4", "50,000000");
String currentTiltRange5 = prefs.getString("tiltRange5", "50,000000");
String currentTiltRange6 = prefs.getString("tiltRange6", "50,000000");
String currentTiltRange7 = prefs.getString("tiltRange7", "50,000000");
// Current Nunchuk analog range setup. Falls back to default upon error.
String currentNunchukRadius4 = prefs.getString("nunchukRadius4", "100,000000");
String currentNunchukRange4 = prefs.getString("nunchukRange4", "50,000000");
String currentNunchukRadius5 = prefs.getString("nunchukRadius5", "100,000000");
String currentNunchukRange5 = prefs.getString("nunchukRange5", "50,000000");
String currentNunchukRadius6 = prefs.getString("nunchukRadius6", "100,000000");
String currentNunchukRange6 = prefs.getString("nunchukRange6", "50,000000");
String currentNunchukRadius7 = prefs.getString("nunchukRadius7", "100,000000");
String currentNunchukRange7 = prefs.getString("nunchukRange7", "50,000000");
// Current Classic analog range setup. Falls back to 100,000000 upon error.
String currentClassicLRadius4 = prefs.getString("classicLRadius4", "100,000000");
String currentClassicRRadius4 = prefs.getString("classicRRadius4", "100,000000");
String currentClassicThres4 = prefs.getString("classicThres4", "90,000000");
String currentClassicLRadius5 = prefs.getString("classicLRadius5", "100,000000");
String currentClassicRRadius5 = prefs.getString("classicRRadius5", "100,000000");
String currentClassicThres5 = prefs.getString("classicThres5", "90,000000");
String currentClassicLRadius6 = prefs.getString("classicLRadius6", "100,000000");
String currentClassicRRadius6 = prefs.getString("classicRRadius6", "100,000000");
String currentClassicThres6 = prefs.getString("classicThres6", "90,000000");
String currentClassicLRadius7 = prefs.getString("classicLRadius7", "100,000000");
String currentClassicRRadius7 = prefs.getString("classicRRadius7", "100,000000");
String currentClassicThres7 = prefs.getString("classicThres7", "90,000000");
// Current Guitar analog range setup. Falls back to default upon error.
String currentGuitarRadius4 = prefs.getString("guitarRadius4", "100,000000");
String currentGuitarRadius5 = prefs.getString("guitarRadius5", "100,000000");
String currentGuitarRadius6 = prefs.getString("guitarRadius6", "100,000000");
String currentGuitarRadius7 = prefs.getString("guitarRadius7", "100,000000");
// Current Drums modifier Radius setup. Falls back to default upon error.
String currentDrumsRadius4 = prefs.getString("drumsRadius4", "100,000000");
String currentDrumsRadius5 = prefs.getString("drumsRadius5", "100,000000");
String currentDrumsRadius6 = prefs.getString("drumsRadius6", "100,000000");
String currentDrumsRadius7 = prefs.getString("drumsRadius7", "100,000000");
// Current Turntable analog range setup. Falls back to default upon error.
String currentTurntableRadius4 = prefs.getString("turntableRadius4", "100,000000");
String currentTurntableRadius5 = prefs.getString("turntableRadius5", "100,000000");
String currentTurntableRadius6 = prefs.getString("turntableRadius6", "100,000000");
String currentTurntableRadius7 = prefs.getString("turntableRadius7", "100,000000");
// 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");
String currentWiimoteExtension4 = prefs.getString("wiimoteExtension4", "None");
String currentWiimoteExtension5 = prefs.getString("wiimoteExtension5", "None");
String currentWiimoteExtension6 = prefs.getString("wiimoteExtension6", "None");
String currentWiimoteExtension7 = prefs.getString("wiimoteExtension7", "None");
// Current video backend being used. Falls back to software rendering upon error.
String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering");
@ -233,11 +352,73 @@ public final class UserPreferences
NativeLibrary.SetConfig("Dolphin.ini", "Core", "OverclockEnable", overclockEnabled ? "True" : "False");
NativeLibrary.SetConfig("Dolphin.ini", "Core", "Overclock", overclockSetting);
// GameCube analog ranges Setup
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "Main Stick/Radius", currentMainRadius0);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "C-Stick/Radius", currentCStickRadius0);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "Triggers/Threshold", currentInputThres0);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "Main Stick/Radius", currentMainRadius1);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "C-Stick/Radius", currentCStickRadius1);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "Triggers/Threshold", currentInputThres1);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "Main Stick/Radius", currentMainRadius2);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "C-Stick/Radius", currentCStickRadius2);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "Triggers/Threshold", currentInputThres2);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "Main Stick/Radius", currentMainRadius3);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "C-Stick/Radius", currentCStickRadius3);
NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "Triggers/Threshold", currentInputThres3);
// Wiimote analog ranges Setup
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Tilt/Modifier/Range", currentTiltRange4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Tilt/Modifier/Range", currentTiltRange5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Tilt/Modifier/Range", currentTiltRange6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Tilt/Modifier/Range", currentTiltRange7);
// Nunchuk analog ranges Setup
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", currentNunchukRadius4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", currentNunchukRange4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", currentNunchukRadius5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", currentNunchukRange5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", currentNunchukRadius6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", currentNunchukRange6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", currentNunchukRadius7);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", currentNunchukRange7);
// Classic analog ranges Setup
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Left Stick/Radius", currentClassicLRadius4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Right Stick/Radius", currentClassicRRadius4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Triggers/Threshold", currentClassicThres4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Left Stick/Radius", currentClassicLRadius5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Right Stick/Radius", currentClassicRRadius5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Triggers/Threshold", currentClassicThres5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Left Stick/Radius", currentClassicLRadius6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Right Stick/Radius", currentClassicRRadius6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Triggers/Threshold", currentClassicThres6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Left Stick/Radius", currentClassicLRadius7);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Right Stick/Radius", currentClassicRRadius7);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Triggers/Threshold", currentClassicThres7);
// Guitar analog ranges Setup
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Guitar/Stick/Radius", currentGuitarRadius4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Guitar/Stick/Radius", currentGuitarRadius5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Guitar/Stick/Radius", currentGuitarRadius6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Guitar/Stick/Radius", currentGuitarRadius7);
// Drums analog ranges Setup
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Drums/Stick/Radius", currentDrumsRadius4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Drums/Stick/Radius", currentDrumsRadius5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Drums/Stick/Radius", currentDrumsRadius6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Drums/Stick/Radius", currentDrumsRadius7);
// Turntable analog ranges Setup
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Turntable/Stick/Radius", currentTurntableRadius4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Turntable/Stick/Radius", currentTurntableRadius5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Turntable/Stick/Radius", currentTurntableRadius6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Turntable/Stick/Radius", currentTurntableRadius7);
// 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);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", currentWiimoteExtension4);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Extension", currentWiimoteExtension5);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Extension", currentWiimoteExtension6);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Extension", currentWiimoteExtension7);
// General Video Settings
NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend);

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Title of the app -->
@ -73,17 +73,15 @@
<string name="input_overlay_layout">入力オーバーレイレイアウト</string>
<string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string>
<string name="controls_size">コントロールのサイズを調整し</string>
<string name="gamecube_bindings">ゲームキューブコントローラの入力バインディング</string>
<string name="controller_0">コントローラ1</string>
<string name="controller_1">コントローラ2</string>
<string name="controller_2">コントローラ3</string>
<string name="controller_3">コントローラ4</string>
<string name="enable_controller">コントローラを有効</string>
<string name="wiimote_bindings">Wiiリモコンの入力バインディング</string>
<string name="wiimote_1">Wiiリモコン1</string>
<string name="wiimote_2">Wiiリモコン2</string>
<string name="wiimote_3">Wiiリモコン3</string>
<string name="wiimote_4">Wiiリモコン4</string>
<string name="wiimote_0">Wiiリモコン1</string>
<string name="wiimote_1">Wiiリモコン2</string>
<string name="wiimote_2">Wiiリモコン3</string>
<string name="wiimote_3">Wiiリモコン4</string>
<string name="enable_wiimote">Wiiリモコンを有効</string>
<string name="input_binding">入力バインディング</string>
<string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>

View File

@ -125,6 +125,32 @@
<item>0</item>
</string-array>
<!-- Analog Modifier ranges -->
<string-array name="analogRangesEntries" translatable="false">
<item>100</item>
<item>90</item>
<item>80</item>
<item>70</item>
<item>60</item>
<item>50</item>
<item>40</item>
<item>30</item>
<item>20</item>
<item>10</item>
</string-array>
<string-array name="analogRangesValues" translatable="false">
<item>100,000000</item>
<item>90,000000</item>
<item>80,000000</item>
<item>70,000000</item>
<item>60,000000</item>
<item>50,000000</item>
<item>40,000000</item>
<item>30,000000</item>
<item>20,000000</item>
<item>10,000000</item>
</string-array>
<!-- External Frame Buffer Preference -->
<string-array name="externalFrameBufferEntries" translatable="false">
<item>@string/disabled</item>
@ -141,10 +167,12 @@
<string-array name="internalResolutionEntries" translatable="false">
<item>1x Native (640x528)</item>
<item>1.5x Native (960x792)</item>
<item>2x Native (1280x1056)</item>
<item>2x Native (1280x1056) for 720p</item>
<item>2.5x Native (1600x1320)</item>
<item>3x Native (1920x1584)</item>
<item>3x Native (1920x1584) for 1080p</item>
<item>4x Native (2560x2112)</item>
<item>5x Native (3200x2640)</item>
<item>6x Native (3840x3168) for 4K</item>
</string-array>
<string-array name="internalResolutionValues" translatable="false">
<item>2</item>
@ -153,6 +181,8 @@
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
</string-array>
<!-- FSAA Preference -->

View File

@ -75,27 +75,42 @@
<string name="input_overlay_layout">Input Overlay Layout</string>
<string name="input_overlay_layout_desc">Button layout for the input overlay.</string>
<string name="controls_size">Adjust the control size</string>
<string name="gamecube_bindings">GameCube Controller Bindings</string>
<string name="controller_0">Controller 1</string>
<string name="controller_1">Controller 2</string>
<string name="controller_2">Controller 3</string>
<string name="controller_3">Controller 4</string>
<string name="controller_bindings">Controller Bindings</string>
<string name="controller_gc">GameCube Controllers</string>
<string name="controller_wii">Wii Controllers (Wiimotes)</string>
<string name="controller_0">GameCube Controller 1</string>
<string name="controller_1">GameCube Controller 2</string>
<string name="controller_2">GameCube Controller 3</string>
<string name="controller_3">GameCube Controller 4</string>
<string name="enable_controller">Enable controller</string>
<string name="wiimote_bindings">Wiimote Bindings</string>
<string name="wiimote_1">Wiimote 1</string>
<string name="wiimote_2">Wiimote 2</string>
<string name="wiimote_3">Wiimote 3</string>
<string name="wiimote_4">Wiimote 4</string>
<string name="controller_buttons">Buttons</string>
<string name="controller_dpad">Directional Keys</string>
<string name="controller_main">Main Stick Navigation</string>
<string name="controller_c">C-Stick Navigation</string>
<string name="controller_trig">Analog Triggers</string>
<string name="modifier_range">Modifier Range</string>
<string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
<string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
<string name="wiimote_0">Wiimote 1</string>
<string name="wiimote_1">Wiimote 2</string>
<string name="wiimote_2">Wiimote 3</string>
<string name="wiimote_3">Wiimote 4</string>
<string name="enable_wiimote">Enable Wiimote</string>
<string name="wiimote_ir">IR Motion Controls</string>
<string name="wiimote_swing">Swing Navigation</string>
<string name="wiimote_tilt">Tilt Navigation</string>
<string name="wiimote_shake">Shake Controls</string>
<string name="wiimote_stick">Analog Stick Navigation</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="wiimote_extensions_descrip">Choose which Extension you want to use with the Wiimote</string>
<string name="show_nunchuk">Nunchuk</string>
<string name="show_classic">Classic Controller</string>
<string name="show_guitar">Guitar</string>
<string name="show_drums">Drums</string>
<string name="show_turntable">Turntable</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) -->
<string name="button_a">Button A</string>
<string name="button_b">Button B</string>
@ -117,12 +132,17 @@
<string name="c_stick_right">C Stick Right</string>
<string name="trigger_left">Trigger L</string>
<string name="trigger_right">Trigger R</string>
<!-- Wiimote (+ extension) only buttons -->
<string name="button_one">Button 1</string>
<string name="button_two">Button 2</string>
<string name="button_plus">Button +</string>
<string name="button_minus">Button -</string>
<string name="button_home">Button Home</string>
<string name="stick_up">Stick Up</string>
<string name="stick_down">Stick Down</string>
<string name="stick_left">Stick Left</string>
<string name="stick_right">Stick Right</string>
<string name="ir_up">IR Up</string>
<string name="ir_down">IR Down</string>
<string name="ir_left">IR Left</string>
@ -140,103 +160,68 @@
<string name="tilt_backward">Tilt Backward</string>
<string name="tilt_left">Tilt Left</string>
<string name="tilt_right">Tilt Right</string>
<string name="tilt_modifier">Tilt Modifier</string>
<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>
<string name="nunchuk_button_c">Button C</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>
<string name="classic_button_zl">Button ZL</string>
<string name="classic_button_zr">Button ZR</string>
<string name="classic_leftstick">Left Analog Stick Navigation</string>
<string name="classic_stick_left_up">Left Stick Up</string>
<string name="classic_stick_left_down">Left Stick Down</string>
<string name="classic_stick_left_left">Left Stick Left</string>
<string name="classic_stick_left_right">Left Stick Right</string>
<string name="classic_rightstick">Right Analog Stick Navigation</string>
<string name="classic_stick_right_up">Right Stick Up</string>
<string name="classic_stick_right_down">Right Stick Down</string>
<string name="classic_stick_right_left">Right Stick Left</string>
<string name="classic_stick_right_right">Right Stick Right</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>
<string name="guitar_frets">Guitar Frets</string>
<string name="guitar_fret_green">Red Fret</string>
<string name="guitar_fret_red">Red Fret</string>
<string name="guitar_fret_yellow">Yellow Fret</string>
<string name="guitar_fret_blue">Blue Fret</string>
<string name="guitar_fret_orange">Orange Fret</string>
<string name="guitar_strum_up">Strum Up</string>
<string name="guitar_strum_down">Strum Down</string>
<string name="guitar_whammy">Guitar Whammy</string>
<string name="guitar_whammy_bar">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>
<string name="drums_pads">Drum Pads</string>
<string name="drums_pad_red">Red Pad</string>
<string name="drums_pad_yellow">Yellow Pad</string>
<string name="drums_pad_blue">Blue Pad</string>
<string name="drums_pad_green">Green Pad</string>
<string name="drums_pad_orange">Orange Pad</string>
<string name="drums_pad_bass">Bass Pad</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>
<string name="turntable_button_green_left">Green Left</string>
<string name="turntable_button_red_left">Red Left</string>
<string name="turntable_button_blue_left">Blue Left</string>
<string name="turntable_button_green_right">Green Right</string>
<string name="turntable_button_red_right">Red Right</string>
<string name="turntable_button_blue_right">Blue Right</string>
<string name="turntable_button_euphoria">Euphoria</string>
<string name="turntable_table_left">Left Turntable</string>
<string name="turntable_table_left_left">Left Table Left</string>
<string name="turntable_table_left_right">Left Table Right</string>
<string name="turntable_table_right">Right Turntable</string>
<string name="turntable_table_right_left">Right Table Left</string>
<string name="turntable_table_right_right">Right Table Right</string>
<string name="turntable_effect"> Effects</string>
<string name="turntable_effect_dial">Effect Dial</string>
<string name="turntable_crossfade">Crossfade</string>
<string name="turntable_crossfade_left">Crossfade Left</string>
<string name="turntable_crossfade_right">Crossfade Right</string>
<!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string>
@ -346,6 +331,7 @@
<!-- Preferences Screen -->
<string name="preferences_cpu">CPU Settings</string>
<string name="preferences_input">Input Settings</string>
<string name="preferences_extensions">Extension Bindings</string>
<string name="preferences_video">Video Settings</string>
<string name="emulation_title">Emulation Activity</string>

File diff suppressed because it is too large Load Diff

View File

@ -47,26 +47,27 @@ 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",
"IRUp",
"IRDown",
"IRLeft",
"IRRight",
"IRForward",
"IRBackward",
"IRHide",
"SwingUp",
"SwingDown",
"SwingLeft",
"SwingRight",
"SwingForward",
"SwingBackward",
"TiltForward",
"TiltBackward",
"TiltLeft",
"TiltRight",
"TiltModifier"
"ShakeX",
"ShakeY",
"ShakeZ",
// Nunchuk
"NunchukC",
"NunchukZ",
@ -84,6 +85,7 @@ namespace ButtonManager
"NunchukTiltBackward",
"NunchukTiltLeft",
"NunchukTiltRight",
"NunchukTiltModifier",
"NunchukShakeX",
"NunchukShakeY",
"NunchukShakeZ",
@ -213,6 +215,7 @@ namespace ButtonManager
WIIMOTE_TILT_BACKWARD,
WIIMOTE_TILT_LEFT,
WIIMOTE_TILT_RIGHT,
WIIMOTE_TILT_MODIFIER,
WIIMOTE_SHAKE_X,
WIIMOTE_SHAKE_Y,
WIIMOTE_SHAKE_Z,
@ -233,6 +236,7 @@ namespace ButtonManager
NUNCHUK_TILT_BACKWARD,
NUNCHUK_TILT_LEFT,
NUNCHUK_TILT_RIGHT,
NUNCHUK_TILT_MODIFIER,
NUNCHUK_SHAKE_X,
NUNCHUK_SHAKE_Y,
NUNCHUK_SHAKE_Z,
@ -365,6 +369,7 @@ namespace ButtonManager
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_TILT_MODIFIER, BIND_BUTTON, WIIMOTE_TILT_MODIFIER, 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));
@ -389,6 +394,7 @@ namespace ButtonManager
// 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_TILT_MODIFIER, BIND_BUTTON, NUNCHUK_TILT_MODIFIER, 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));

View File

@ -22,12 +22,12 @@ namespace ButtonManager
BUTTON_DOWN = 7,
BUTTON_LEFT = 8,
BUTTON_RIGHT = 9,
STICK_MAIN = 10, /* Used on Java Side */
STICK_MAIN = 10, // Used on Java Side
STICK_MAIN_UP = 11,
STICK_MAIN_DOWN = 12,
STICK_MAIN_LEFT = 13,
STICK_MAIN_RIGHT = 14,
STICK_C = 15, /* Used on Java Side */
STICK_C = 15, // Used on Java Side
STICK_C_UP = 16,
STICK_C_DOWN = 17,
STICK_C_LEFT = 18,
@ -35,137 +35,147 @@ namespace ButtonManager
TRIGGER_L = 20,
TRIGGER_R = 21,
// Wiimote
WIIMOTE_BUTTON_A = 22,
WIIMOTE_BUTTON_B = 23,
WIIMOTE_BUTTON_MINUS = 24,
WIIMOTE_BUTTON_PLUS = 25,
WIIMOTE_BUTTON_HOME = 26,
WIIMOTE_BUTTON_1 = 27,
WIIMOTE_BUTTON_2 = 28,
WIIMOTE_UP = 29,
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,
WIIMOTE_BUTTON_A = 100,
WIIMOTE_BUTTON_B = 101,
WIIMOTE_BUTTON_MINUS = 102,
WIIMOTE_BUTTON_PLUS = 103,
WIIMOTE_BUTTON_HOME = 104,
WIIMOTE_BUTTON_1 = 105,
WIIMOTE_BUTTON_2 = 106,
WIIMOTE_UP = 107,
WIIMOTE_DOWN = 108,
WIIMOTE_LEFT = 109,
WIIMOTE_RIGHT = 110,
WIIMOTE_IR = 111, // To Be Used on Java Side
WIIMOTE_IR_UP = 112,
WIIMOTE_IR_DOWN = 113,
WIIMOTE_IR_LEFT = 114,
WIIMOTE_IR_RIGHT = 115,
WIIMOTE_IR_FORWARD = 116,
WIIMOTE_IR_BACKWARD = 117,
WIIMOTE_IR_HIDE = 118,
WIIMOTE_SWING = 119, // To Be Used on Java Side
WIIMOTE_SWING_UP = 120,
WIIMOTE_SWING_DOWN = 121,
WIIMOTE_SWING_LEFT = 122,
WIIMOTE_SWING_RIGHT = 123,
WIIMOTE_SWING_FORWARD = 124,
WIIMOTE_SWING_BACKWARD = 125,
WIIMOTE_TILT = 126, // To Be Used on Java Side
WIIMOTE_TILT_FORWARD = 127,
WIIMOTE_TILT_BACKWARD = 128,
WIIMOTE_TILT_LEFT = 129,
WIIMOTE_TILT_RIGHT = 130,
WIIMOTE_TILT_MODIFIER = 131,
WIIMOTE_SHAKE_X = 132,
WIIMOTE_SHAKE_Y = 133,
WIIMOTE_SHAKE_Z = 134,
//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,
NUNCHUK_BUTTON_C = 200,
NUNCHUK_BUTTON_Z = 201,
NUNCHUK_STICK = 202, // To Be Used on Java Side
NUNCHUK_STICK_UP = 203,
NUNCHUK_STICK_DOWN = 204,
NUNCHUK_STICK_LEFT = 205,
NUNCHUK_STICK_RIGHT = 206,
NUNCHUK_SWING = 207, // To Be Used on Java Side
NUNCHUK_SWING_UP = 208,
NUNCHUK_SWING_DOWN = 209,
NUNCHUK_SWING_LEFT = 210,
NUNCHUK_SWING_RIGHT = 211,
NUNCHUK_SWING_FORWARD = 212,
NUNCHUK_SWING_BACKWARD = 213,
NUNCHUK_TILT = 214, // To Be Used on Java Side
NUNCHUK_TILT_FORWARD = 215,
NUNCHUK_TILT_BACKWARD = 216,
NUNCHUK_TILT_LEFT = 217,
NUNCHUK_TILT_RIGHT = 218,
NUNCHUK_TILT_MODIFIER = 219,
NUNCHUK_SHAKE_X = 220,
NUNCHUK_SHAKE_Y = 221,
NUNCHUK_SHAKE_Z = 222,
//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,
CLASSIC_BUTTON_A = 300,
CLASSIC_BUTTON_B = 301,
CLASSIC_BUTTON_X = 302,
CLASSIC_BUTTON_Y = 303,
CLASSIC_BUTTON_MINUS = 304,
CLASSIC_BUTTON_PLUS = 305,
CLASSIC_BUTTON_HOME = 306,
CLASSIC_BUTTON_ZL = 307,
CLASSIC_BUTTON_ZR = 308,
CLASSIC_DPAD_UP = 309,
CLASSIC_DPAD_DOWN = 310,
CLASSIC_DPAD_LEFT = 311,
CLASSIC_DPAD_RIGHT = 312,
CLASSIC_STICK_LEFT = 313, // To Be Used on Java Side
CLASSIC_STICK_LEFT_UP = 314,
CLASSIC_STICK_LEFT_DOWN = 315,
CLASSIC_STICK_LEFT_LEFT = 316,
CLASSIC_STICK_LEFT_RIGHT = 317,
CLASSIC_STICK_RIGHT = 318, // To Be Used on Java Side
CLASSIC_STICK_RIGHT_UP = 319,
CLASSIC_STICK_RIGHT_DOWN = 320,
CLASSIC_STICK_RIGHT_LEFT = 321,
CLASSIC_STICK_RIGHT_RIGHT = 322,
CLASSIC_TRIGGER_L = 323,
CLASSIC_TRIGGER_R = 324,
//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,
GUITAR_BUTTON_MINUS = 400,
GUITAR_BUTTON_PLUS = 401,
GUITAR_FRET_GREEN = 402,
GUITAR_FRET_RED = 403,
GUITAR_FRET_YELLOW = 404,
GUITAR_FRET_BLUE = 405,
GUITAR_FRET_ORANGE = 406,
GUITAR_STRUM_UP = 407,
GUITAR_STRUM_DOWN = 408,
GUITAR_STICK = 409, // To Be Used on Java Side
GUITAR_STICK_UP = 410,
GUITAR_STICK_DOWN = 411,
GUITAR_STICK_LEFT = 412,
GUITAR_STICK_RIGHT = 413,
GUITAR_WHAMMY_BAR = 414,
//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,
DRUMS_BUTTON_MINUS = 500,
DRUMS_BUTTON_PLUS = 501,
DRUMS_PAD_RED = 502,
DRUMS_PAD_YELLOW = 503,
DRUMS_PAD_BLUE = 504,
DRUMS_PAD_GREEN = 505,
DRUMS_PAD_ORANGE = 506,
DRUMS_PAD_BASS = 507,
DRUMS_STICK = 508, // To Be Used on Java Side
DRUMS_STICK_UP = 509,
DRUMS_STICK_DOWN = 510,
DRUMS_STICK_LEFT = 511,
DRUMS_STICK_RIGHT = 512,
//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,
TURNTABLE_BUTTON_GREEN_LEFT = 600,
TURNTABLE_BUTTON_RED_LEFT = 601,
TURNTABLE_BUTTON_BLUE_LEFT = 602,
TURNTABLE_BUTTON_GREEN_RIGHT = 603,
TURNTABLE_BUTTON_RED_RIGHT = 604,
TURNTABLE_BUTTON_BLUE_RIGHT = 605,
TURNTABLE_BUTTON_MINUS = 606,
TURNTABLE_BUTTON_PLUS = 607,
TURNTABLE_BUTTON_HOME = 608,
TURNTABLE_BUTTON_EUPHORIA = 609,
TURNTABLE_TABLE_LEFT = 610, // To Be Used on Java Side
TURNTABLE_TABLE_LEFT_LEFT = 611,
TURNTABLE_TABLE_LEFT_RIGHT = 612,
TURNTABLE_TABLE_RIGHT = 613, // To Be Used on Java Side
TURNTABLE_TABLE_RIGHT_LEFT = 614,
TURNTABLE_TABLE_RIGHT_RIGHT = 615,
TURNTABLE_STICK = 616, // To Be Used on Java Side
TURNTABLE_STICK_UP = 617,
TURNTABLE_STICK_DOWN = 618,
TURNTABLE_STICK_LEFT = 619,
TURNTABLE_STICK_RIGHT = 620,
TURNTABLE_EFFECT_DIAL = 621,
TURNTABLE_CROSSFADE = 622, // To Be Used on Java Side
TURNTABLE_CROSSFADE_LEFT = 623,
TURNTABLE_CROSSFADE_RIGHT = 624,
};
enum ButtonState
{

View File

@ -72,6 +72,7 @@ Touchscreen::Touchscreen(int padID)
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_TILT_MODIFIER));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_X));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Y));
AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Z));
@ -87,6 +88,7 @@ Touchscreen::Touchscreen(int padID)
//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_TILT_MODIFIER));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_X));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Y));
AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Z));