mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: add gamepad rumble support

Browse Source
This commit is contained in:
Brad Parker 2019-03-13 03:32:18 -04:00
parent 2c024f400e
commit 44a06d69a6
3 changed files with 90 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_unix.c
View File

@ -2037,7 +2037,7 @@ static void frontend_unix_init(void *data)
GET_METHOD_ID(env, android_app->setScreenOrientation, class,
"setScreenOrientation", "(I)V");
GET_METHOD_ID(env, android_app->doVibrate, class,
"doVibrate", "(III)V");
"doVibrate", "(IIII)V");
CALL_OBJ_METHOD(env, obj, android_app->activity->clazz,
android_app->getIntent);

102
input/drivers/android_input.c
View File

@ -111,6 +111,9 @@ typedef struct state_device
int id;
int port;
char name[256];
uint16_t rumble_last_strength_strong;
uint16_t rumble_last_strength_weak;
uint16_t rumble_last_strength;
} state_device_t;
typedef struct android_input
@ -428,7 +431,7 @@ static void android_input_poll_main_cmd(void)
if (env && g_android && g_android->doVibrate)
{
CALL_VOID_METHOD_PARAM(env, g_android->activity->clazz,
g_android->doVibrate, RETRO_RUMBLE_STRONG, 255, 1);
g_android->doVibrate, (jint)-1, (jint)RETRO_RUMBLE_STRONG, (jint)255, (jint)1);
}
break;
}
@ -880,8 +883,13 @@ static int android_input_get_id_port(android_input_t *android, int id,
ret = 0; /* touch overlay is always user 1 */
for (i = 0; i < android->pads_connected; i++)
{
if (android->pad_states[i].id == id)
{
ret = i;
break;
}
}
return ret;
}
@ -1632,45 +1640,75 @@ static void android_input_grab_mouse(void *data, bool state)
static bool android_input_set_rumble(void *data, unsigned port,
enum retro_rumble_effect effect, uint16_t strength)
{
android_input_t *android = (android_input_t*)data;
settings_t *settings = config_get_ptr();
JNIEnv *env = (JNIEnv*)jni_thread_getenv();
(void)data;
(void)port;
if (!android || !env || !g_android || !g_android->doVibrate)
return false;
if (settings->bools.enable_device_vibration)
{
JNIEnv *env = (JNIEnv*)jni_thread_getenv();
struct android_app *android_app = (struct android_app*)g_android;
static uint16_t last_strength_strong = 0;
static uint16_t last_strength_weak = 0;
static uint16_t last_strength = 0;
uint16_t new_strength = 0;
if (env && g_android && g_android->doVibrate)
if (port != 0)
return false;
if (effect == RETRO_RUMBLE_STRONG)
{
static uint16_t last_strength_strong = 0;
static uint16_t last_strength_weak = 0;
static uint16_t last_strength = 0;
uint16_t new_strength = 0;
if (effect == RETRO_RUMBLE_STRONG)
{
new_strength = strength | last_strength_weak;
last_strength_strong = strength;
}
else if (effect == RETRO_RUMBLE_WEAK)
{
new_strength = strength | last_strength_strong;
last_strength_weak = strength;
}
if (new_strength != last_strength)
{
/* trying to send this value as a JNI param without storing it first was causing 0 to be seen on the other side ?? */
int strength_final = (255.0f / 65535.0f) * (float)new_strength;
CALL_VOID_METHOD_PARAM(env, g_android->activity->clazz,
g_android->doVibrate, RETRO_RUMBLE_STRONG, strength_final, 0);
last_strength = new_strength;
}
new_strength = strength | last_strength_weak;
last_strength_strong = strength;
}
else if (effect == RETRO_RUMBLE_WEAK)
{
new_strength = strength | last_strength_strong;
last_strength_weak = strength;
}
if (new_strength != last_strength)
{
/* trying to send this value as a JNI param without storing it first was causing 0 to be seen on the other side ?? */
int strength_final = (255.0f / 65535.0f) * (float)new_strength;
CALL_VOID_METHOD_PARAM(env, g_android->activity->clazz,
g_android->doVibrate, (jint)-1, (jint)RETRO_RUMBLE_STRONG, (jint)strength_final, (jint)0);
last_strength = new_strength;
}
return true;
}
else
{
uint16_t new_strength = 0;
state_device_t *state = &android->pad_states[port];
if (effect == RETRO_RUMBLE_STRONG)
{
new_strength = strength | state->rumble_last_strength_weak;
state->rumble_last_strength_strong = strength;
}
else if (effect == RETRO_RUMBLE_WEAK)
{
new_strength = strength | state->rumble_last_strength_strong;
state->rumble_last_strength_weak = strength;
}
if (new_strength != state->rumble_last_strength)
{
/* trying to send this value as a JNI param without storing it first was causing 0 to be seen on the other side ?? */
int strength_final = (255.0f / 65535.0f) * (float)new_strength;
int id = state->id;
CALL_VOID_METHOD_PARAM(env, g_android->activity->clazz,
g_android->doVibrate, (jint)id, (jint)RETRO_RUMBLE_STRONG, (jint)strength_final, (jint)0);
state->rumble_last_strength = new_strength;
}
return true;
}

21
pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
View File

@ -9,6 +9,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.media.AudioAttributes;
import android.view.InputDevice;
import android.view.Surface;
import android.view.WindowManager;
import android.app.UiModeManager;
@ -40,13 +41,26 @@ public class RetroActivityCommon extends RetroActivityLocation
public boolean sustainedPerformanceMode = true;
public int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
public void doVibrate(int effect, int strength, int oneShot)
public void doVibrate(int id, int effect, int strength, int oneShot)
{
Vibrator vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
Vibrator vibrator = null;
int repeat = 0;
long[] pattern = {16};
int[] strengths = {strength};
if (id == -1)
vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
else
{
InputDevice dev = InputDevice.getDevice(id);
if (dev != null)
vibrator = dev.getVibrator();
}
if (vibrator == null)
return;
if (strength == 0) {
vibrator.cancel();
return;
@ -58,6 +72,9 @@ public class RetroActivityCommon extends RetroActivityLocation
pattern[0] = 1000;
if (Build.VERSION.SDK_INT >= 26) {
if (id >= 0)
Log.i("RetroActivity", "Vibrate id " + id + ": strength " + strength);
vibrator.vibrate(VibrationEffect.createWaveform(pattern, strengths, repeat), new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_GAME).setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).build());
}else{
vibrator.vibrate(pattern, repeat);