From 126ff8dc5f513b01c750cd15e19f9c1e7acf06db Mon Sep 17 00:00:00 2001 From: zackhow Date: Sun, 2 Sep 2018 16:55:22 -0400 Subject: Android: Add rumble for phone This currently only supports using the internal vibrate on a phone for rumble. --- Source/Android/app/src/main/AndroidManifest.xml | 1 + Source/Android/app/src/main/assets/GCPadNew.ini | 4 +++ Source/Android/app/src/main/assets/WiimoteNew.ini | 4 +++ .../org/dolphinemu/dolphinemu/NativeLibrary.java | 38 ++++++++++++++++++++++ .../dolphinemu/activities/EmulationActivity.java | 17 +++++++++- .../app/src/main/res/menu/menu_emulation.xml | 4 +++ .../app/src/main/res/menu/menu_emulation_wii.xml | 5 +++ Source/Android/app/src/main/res/values/strings.xml | 1 + Source/Android/jni/ButtonManager.cpp | 5 +++ Source/Android/jni/ButtonManager.h | 2 ++ 10 files changed, 80 insertions(+), 1 deletion(-) (limited to 'Source/Android') diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 975a493860..147b658ad3 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -18,6 +18,7 @@ + = Build.VERSION_CODES.O) + { + vibrator.vibrate(VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE)); + } + else + { + vibrator.vibrate(100); + } + } + } + } + public static native String GetUserSetting(String gameID, String Section, String Key); public static native void SetUserSetting(String gameID, String Section, String Key, String Value); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 221d3ee399..7eb8430935 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -124,6 +124,7 @@ public final class EmulationActivity extends AppCompatActivity public static final int MENU_ACTION_EXIT = 22; public static final int MENU_ACTION_CHANGE_DISC = 23; public static final int MENU_ACTION_JOYSTICK_REL_CENTER = 24; + public static final int MENU_ACTION_RUMBLE = 25; private static SparseIntArray buttonsActionsMap = new SparseIntArray(); @@ -163,6 +164,7 @@ public final class EmulationActivity extends AppCompatActivity buttonsActionsMap.append(R.id.menu_exit, EmulationActivity.MENU_ACTION_EXIT); buttonsActionsMap.append(R.id.menu_emulation_joystick_rel_center, EmulationActivity.MENU_ACTION_JOYSTICK_REL_CENTER); + buttonsActionsMap.append(R.id.menu_emulation_rumble, EmulationActivity.MENU_ACTION_RUMBLE); } public static void launch(FragmentActivity activity, GameFile gameFile, int position, @@ -473,6 +475,8 @@ public final class EmulationActivity extends AppCompatActivity // Populate the checkbox value for joystick center on touch menu.findItem(R.id.menu_emulation_joystick_rel_center) .setChecked(mPreferences.getBoolean("joystickRelCenter", true)); + menu.findItem(R.id.menu_emulation_rumble) + .setChecked(mPreferences.getBoolean("phoneRumble", true)); return true; } @@ -504,7 +508,11 @@ public final class EmulationActivity extends AppCompatActivity case MENU_ACTION_JOYSTICK_REL_CENTER: item.setChecked(!item.isChecked()); toggleJoystickRelCenter(item.isChecked()); - return; + break; + case MENU_ACTION_RUMBLE: + item.setChecked(!item.isChecked()); + toggleRumble(item.isChecked()); + break; } } @@ -636,6 +644,13 @@ public final class EmulationActivity extends AppCompatActivity editor.commit(); } + private void toggleRumble(boolean state) + { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("phoneRumble", state); + editor.apply(); + } + private void editControlsPlacement() { diff --git a/Source/Android/app/src/main/res/menu/menu_emulation.xml b/Source/Android/app/src/main/res/menu/menu_emulation.xml index bbb418018c..0a9ccfd25d 100644 --- a/Source/Android/app/src/main/res/menu/menu_emulation.xml +++ b/Source/Android/app/src/main/res/menu/menu_emulation.xml @@ -98,6 +98,10 @@ android:id="@+id/menu_emulation_joystick_rel_center" android:checkable="true" android:title="@string/emulation_control_joystick_rel_center"/> + diff --git a/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml b/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml index 87c61eefc0..f0cbc6024a 100644 --- a/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml +++ b/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml @@ -98,11 +98,16 @@ android:id="@+id/menu_emulation_joystick_rel_center" android:checkable="true" android:title="@string/emulation_control_joystick_rel_center"/> + + diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 52627892cb..c1bf44b837 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -271,6 +271,7 @@ Toggle All Adjust Scale Relative Stick Center + Rumble Choose Controller You may have to reload the game after changing extensions. To change the button layout, open the menu -> Configure Controls -> Edit Layout diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp index 6f6b812494..8490561c0f 100644 --- a/Source/Android/jni/ButtonManager.cpp +++ b/Source/Android/jni/ButtonManager.cpp @@ -52,6 +52,8 @@ std::vector configStrings = { "TurntableEuphoria", "TurntableLeftTLeft", "TurntableLeftTRight", "TurntableRightTLeft", "TurntableRightTRight", "TurntableUp", "TurntableDown", "TurntableLeft", "TurntableRight", "TurntableEffDial", "TurntableCrossLeft", "TurntableCrossRight", + // Rumble + "Rumble", }; std::vector configTypes = { // GC @@ -95,6 +97,8 @@ std::vector configTypes = { 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, + // Rumble + RUMBLE, }; static void AddBind(const std::string& dev, sBind* bind) @@ -462,4 +466,5 @@ float InputDevice::AxisValue(int padID, ButtonType axis) else return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f; } + } diff --git a/Source/Android/jni/ButtonManager.h b/Source/Android/jni/ButtonManager.h index c65d8180f0..b9744f516c 100644 --- a/Source/Android/jni/ButtonManager.h +++ b/Source/Android/jni/ButtonManager.h @@ -176,6 +176,8 @@ enum ButtonType TURNTABLE_CROSSFADE = 622, // To Be Used on Java Side TURNTABLE_CROSSFADE_LEFT = 623, TURNTABLE_CROSSFADE_RIGHT = 624, + // Rumble + RUMBLE = 700, }; enum ButtonState { -- cgit v1.2.3