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

Support deprecated platforms, Bring Moga into Gamepads

This commit is contained in:
TwistedUmbrella 2014-02-24 00:51:39 -05:00
parent 3d7b8570b6
commit b1bcef83ea
2 changed files with 67 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
shell/android/src/com/reicast/emulator/periph/Gamepad.java
View File

@ -4,6 +4,7 @@ import tv.ouya.console.api.OuyaController;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Build;
import android.preference.PreferenceManager;
import android.view.KeyEvent;
@ -39,8 +40,8 @@ public class Gamepad {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START,
KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_SELECT
getStartButtonCode(), key_CONT_START,
getSelectButtonCode(), getSelectButtonCode()
// Redundant, but verifies it is mapped properly
};
}
@ -57,8 +58,8 @@ public class Gamepad {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START,
KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_SELECT
getStartButtonCode(), key_CONT_START,
getSelectButtonCode(), getSelectButtonCode()
// Redundant, but verifies it is mapped properly
};
}
@ -80,12 +81,35 @@ public class Gamepad {
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START
=======
OuyaController.BUTTON_MENU, key_CONT_START,
<<<<<<< HEAD
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START,
OuyaController.BUTTON_R3, KeyEvent.KEYCODE_BUTTON_SELECT
>>>>>>> Support "Select" as menu, Mapping, "Menu" hardware key
=======
getStartButtonCode(), key_CONT_START,
OuyaController.BUTTON_R3, getSelectButtonCode()
>>>>>>> Support deprecated platforms, Bring Moga into Gamepads
};
}
public int[] getMogaController() {
return new int[] {
KeyEvent.KEYCODE_BUTTON_B, key_CONT_B,
KeyEvent.KEYCODE_BUTTON_A, key_CONT_A,
KeyEvent.KEYCODE_BUTTON_X, key_CONT_X,
KeyEvent.KEYCODE_BUTTON_Y, key_CONT_Y,
KeyEvent.KEYCODE_DPAD_UP, key_CONT_DPAD_UP,
KeyEvent.KEYCODE_DPAD_DOWN, key_CONT_DPAD_DOWN,
KeyEvent.KEYCODE_DPAD_LEFT, key_CONT_DPAD_LEFT,
KeyEvent.KEYCODE_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
getStartButtonCode(), key_CONT_START,
getSelectButtonCode(), getSelectButtonCode()
// Redundant, but verifies it is mapped properly
};
}
public int[] setModifiedKeys(String id, int playerNum) {
return new int[] {
mPrefs.getInt("a_button" + id, OuyaController.BUTTON_O), key_CONT_A,
@ -97,9 +121,8 @@ public class Gamepad {
mPrefs.getInt("dpad_down" + id, OuyaController.BUTTON_DPAD_DOWN), key_CONT_DPAD_DOWN,
mPrefs.getInt("dpad_left" + id, OuyaController.BUTTON_DPAD_LEFT), key_CONT_DPAD_LEFT,
mPrefs.getInt("dpad_right" + id, OuyaController.BUTTON_DPAD_RIGHT), key_CONT_DPAD_RIGHT,
mPrefs.getInt("start_button" + id, KeyEvent.KEYCODE_BUTTON_START), key_CONT_START,
mPrefs.getInt("select_button" + id, KeyEvent.KEYCODE_BUTTON_SELECT), KeyEvent.KEYCODE_BUTTON_SELECT
mPrefs.getInt("start_button" + id, getStartButtonCode()), key_CONT_START,
mPrefs.getInt("select_button" + id, getSelectButtonCode()), getSelectButtonCode()
};
}
@ -119,4 +142,26 @@ public class Gamepad {
}
return false;
}
public static int getStartButtonCode() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD) {
return 108;
} else {
return KeyEvent.KEYCODE_BUTTON_START;
}
}
public static int getSelectButtonCode() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD) {
return 109;
} else {
return KeyEvent.KEYCODE_BUTTON_SELECT;
}
}
public static boolean IsNvidiaShield() {
return android.os.Build.MODEL.equals("SHIELD")
|| android.os.Build.DEVICE.equals("roth")
|| android.os.Build.PRODUCT.equals("thor");
}
}

65
shell/android/src/com/reicast/emulator/periph/MOGAInput.java
View File

@ -38,6 +38,8 @@ public class MOGAInput
public Controller mController = null;
private Handler handler;
private String notify;
private Gamepad gamepad;
static String[] portId = { "_A", "_B", "_C", "_D" };
static boolean[] custom = { false, false, false, false },
@ -48,32 +50,8 @@ public class MOGAInput
public boolean isActive[] = { false, false, false, false };
public boolean isMogaPro[] = { false, false, false, false };
private static final int key_CONT_B = 0x0002;
private static final int key_CONT_A = 0x0004;
private static final int key_CONT_START = 0x0008;
private static final int key_CONT_DPAD_UP = 0x0010;
private static final int key_CONT_DPAD_DOWN = 0x0020;
private static final int key_CONT_DPAD_LEFT = 0x0040;
private static final int key_CONT_DPAD_RIGHT = 0x0080;
private static final int key_CONT_Y = 0x0200;
private static final int key_CONT_X = 0x0400;
int[] keys = new int[] {
KeyEvent.KEYCODE_BUTTON_B, key_CONT_B,
KeyEvent.KEYCODE_BUTTON_A, key_CONT_A,
KeyEvent.KEYCODE_BUTTON_X, key_CONT_X,
KeyEvent.KEYCODE_BUTTON_Y, key_CONT_Y,
KeyEvent.KEYCODE_DPAD_UP, key_CONT_DPAD_UP,
KeyEvent.KEYCODE_DPAD_DOWN, key_CONT_DPAD_DOWN,
KeyEvent.KEYCODE_DPAD_LEFT, key_CONT_DPAD_LEFT,
KeyEvent.KEYCODE_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START,
};
int map[][] = { keys, keys, keys, keys };
int map[][];
Activity act;
public MOGAInput()
@ -118,6 +96,8 @@ public class MOGAInput
prefs = PreferenceManager
.getDefaultSharedPreferences(act.getApplicationContext());
gamepad = new Gamepad(act);
mController = Controller.getInstance(act);
mController.init();
mController.setListener(new ExampleControllerListener(), new Handler());
@ -160,29 +140,6 @@ public class MOGAInput
}
*/
}
private void setModifiedKeys(int player) {
String id = portId[player];
if (custom[player]) {
map[player] = new int[] {
prefs.getInt("a_button" + id, KeyEvent.KEYCODE_BUTTON_A), key_CONT_A,
prefs.getInt("b_button" + id, KeyEvent.KEYCODE_BUTTON_B), key_CONT_B,
prefs.getInt("x_button" + id, KeyEvent.KEYCODE_BUTTON_X), key_CONT_X,
prefs.getInt("y_button" + id, KeyEvent.KEYCODE_BUTTON_Y), key_CONT_Y,
prefs.getInt("dpad_up" + id, KeyEvent.KEYCODE_DPAD_UP), key_CONT_DPAD_UP,
prefs.getInt("dpad_down" + id, KeyEvent.KEYCODE_DPAD_DOWN), key_CONT_DPAD_DOWN,
prefs.getInt("dpad_left" + id, KeyEvent.KEYCODE_DPAD_LEFT), key_CONT_DPAD_LEFT,
prefs.getInt("dpad_right" + id, KeyEvent.KEYCODE_DPAD_RIGHT), key_CONT_DPAD_RIGHT,
prefs.getInt("start_button" + id, KeyEvent.KEYCODE_BUTTON_START), key_CONT_START,
};
}
if (jsCompat[player]) {
globalLS_X[player] = previousLS_X[player] = 0.0f;
globalLS_Y[player] = previousLS_Y[player] = 0.0f;
}
}
class ExampleControllerListener implements ControllerListener
{
@ -292,12 +249,20 @@ public class MOGAInput
if (mControllerVersion == Controller.ACTION_VERSION_MOGAPRO) {
isActive[playerNum] = true;
isMogaPro[playerNum] = true;
setModifiedKeys(playerNum);
if (custom[playerNum]) {
map[playerNum] = gamepad.setModifiedKeys(id, playerNum);
} else {
map[playerNum] = gamepad.getMogaController();
}
notify = act.getApplicationContext().getString(R.string.moga_pro_connect);
} else if (mControllerVersion == Controller.ACTION_VERSION_MOGA) {
isActive[playerNum] = true;
isMogaPro[playerNum] = false;
setModifiedKeys(playerNum);
if (custom[playerNum]) {
map[playerNum] = gamepad.setModifiedKeys(id, playerNum);
} else {
map[playerNum] = gamepad.getMogaController();
}
notify = act.getApplicationContext().getString(R.string.moga_connect);
}
if (notify != null && !notify.equals(null)) {