From 5c0601dd2e1617d6426e3512226b67add737140f Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Sun, 23 Feb 2014 18:50:31 -0500 Subject: [PATCH] Add support to use the right joystick as A / B, L1 / R2 trigger --- shell/android/psd/dctemplate.psd | Bin 189016 -> 220692 bytes shell/android/res/drawable/toggle_a_b.png | Bin 0 -> 15060 bytes shell/android/res/drawable/toggle_r_l.png | Bin 0 -> 13867 bytes .../reicast/emulator/emu/GL2JNIActivity.java | 19 +++ .../reicast/emulator/emu/OnScreenMenu.java | 151 ++++++++++-------- 5 files changed, 103 insertions(+), 67 deletions(-) create mode 100644 shell/android/res/drawable/toggle_a_b.png create mode 100644 shell/android/res/drawable/toggle_r_l.png diff --git a/shell/android/psd/dctemplate.psd b/shell/android/psd/dctemplate.psd index 481bb87cfe268f97153816609466a0e629c716bc..60f64c2020b680818635b5f3547e6b316bf485fa 100644 GIT binary patch delta 26503 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 E4-z5b$p8QV diff --git a/shell/android/res/drawable/toggle_a_b.png b/shell/android/res/drawable/toggle_a_b.png new file mode 100644 index 0000000000000000000000000000000000000000..95fcf23e6e22dcaae42e5ae2f5a3cac106034724 GIT binary patch literal 15060 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 literal 0 HcmV?d00001 diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java index 417f15229..c1a3f4489 100644 --- a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java @@ -307,6 +307,25 @@ public class GL2JNIActivity extends Activity { globalLS_Y[playerNum] = LS_Y; } + if (prefs.getBoolean("right_buttons", true)) { + if (RS_Y > 0.5) { + GL2JNIView.kcode_raw[playerNum] |= map[playerNum][gamepad.key_CONT_B]; + GL2JNIView.kcode_raw[playerNum] &= ~map[playerNum][gamepad.key_CONT_A]; + } else if (RS_Y < 0.5) { + GL2JNIView.kcode_raw[playerNum] |= map[playerNum][gamepad.key_CONT_A]; + GL2JNIView.kcode_raw[playerNum] &= ~map[playerNum][gamepad.key_CONT_B]; + } else { + GL2JNIView.kcode_raw[playerNum] |= map[playerNum][gamepad.key_CONT_A]; + GL2JNIView.kcode_raw[playerNum] |= map[playerNum][gamepad.key_CONT_B]; + } + } else { + if (RS_Y > 0) { + R2 = RS_Y; + } else if (RS_Y < 0) { + L2 = -(RS_Y); + } + } + GL2JNIView.lt[playerNum] = (int) (L2 * 255); GL2JNIView.rt[playerNum] = (int) (R2 * 255); diff --git a/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java index ce0f2956e..e486a66ff 100644 --- a/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java +++ b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java @@ -153,6 +153,13 @@ public class OnScreenMenu { private View fullscreen; private View framelimit; + private View audiosetting; + private View fdown; + private View fup; + private int frames = Config.frameskip; + private boolean screen = Config.widescreen; + private boolean limit = Config.limitfps; + private boolean audio; public ConfigPopup(Context c) { super(c); @@ -172,43 +179,35 @@ public class OnScreenMenu { } }), configParams); - if (!widescreen) { - fullscreen = addbut(R.drawable.widescreen, - new OnClickListener() { - public void onClick(View v) { - JNIdc.widescreen(1); - dismiss(); - widescreen = true; - } - }); - } else { - fullscreen = addbut(R.drawable.normal_view, - new OnClickListener() { - public void onClick(View v) { - JNIdc.widescreen(0); - dismiss(); - widescreen = false; - } - }); + fullscreen = addbut(R.drawable.widescreen, + new OnClickListener() { + public void onClick(View v) { + if (screen) { + JNIdc.widescreen(1); + screen = true; + ((ImageButton) fullscreen).setImageResource(R.drawable.normal_view); + } else { + JNIdc.widescreen(0); + screen = false; + ((ImageButton) fullscreen).setImageResource(R.drawable.widescreen); + } + dismiss(); + } + }); + if (screen) { + ((ImageButton) fullscreen).setImageResource(R.drawable.normal_view); + } hlay.addView(fullscreen, params); - final ImageButton frames_up = new ImageButton(mContext); - final ImageButton frames_down = new ImageButton(mContext); - - frames_up.setImageResource(R.drawable.frames_up); - frames_up.setScaleType(ScaleType.FIT_CENTER); - frames_up.setOnClickListener(new OnClickListener() { + fdown = addbut(R.drawable.frames_down, new OnClickListener() { public void onClick(View v) { frameskip++; JNIdc.frameskip(frameskip); enableState(frames_up, frames_down); } }); - - frames_down.setImageResource(R.drawable.frames_down); - frames_down.setScaleType(ScaleType.FIT_CENTER); - frames_down.setOnClickListener(new OnClickListener() { + fup = addbut(R.drawable.frames_up, new OnClickListener() { public void onClick(View v) { frameskip--; JNIdc.frameskip(frameskip); @@ -220,50 +219,47 @@ public class OnScreenMenu { hlay.addView(frames_down, params); enableState(frames_up, frames_down); - if (!limitframes) { - framelimit = addbut(R.drawable.frames_limit_on, - new OnClickListener() { - public void onClick(View v) { - JNIdc.limitfps(1); - dismiss(); - limitframes = true; - } - }); - } else { - framelimit = addbut(R.drawable.frames_limit_off, - new OnClickListener() { - public void onClick(View v) { - JNIdc.limitfps(0); - dismiss(); - limitframes = false; - } - }); + + framelimit = addbut(R.drawable.frames_limit_on, + new OnClickListener() { + public void onClick(View v) { + if (limit) { + JNIdc.limitfps(0); + limit = false; + ((ImageButton) audiosetting).setImageResource(R.drawable.frames_limit_on); + } else { + JNIdc.limitfps(1); + limit = true; + ((ImageButton) audiosetting).setImageResource(R.drawable.frames_limit_off); + } + dismiss(); + + } + }); + if (limit) { + ((ImageButton) audiosetting).setImageResource(R.drawable.frames_limit_off); } hlay.addView(framelimit, params); - if (prefs.getBoolean("sound_enabled", true)) { - View audiosetting; - if (!audiodisabled) { - audiosetting = addbut(R.drawable.mute_sound, - new OnClickListener() { - public void onClick(View v) { - mContext.mView.audioDisable(true); - dismiss(); - audiodisabled = true; - } - }); - } else { - audiosetting = addbut(R.drawable.enable_sound, - new OnClickListener() { - public void onClick(View v) { - mContext.mView.audioDisable(false); - dismiss(); - audiodisabled = false; - } - }); + audiosetting = addbut(R.drawable.enable_sound, + new OnClickListener() { + public void onClick(View v) { + if (audio) { + ((ImageButton) audiosetting).setImageResource(R.drawable.mute_sound); + mContext.mView.audioDisable(false); + } else { + ((ImageButton) audiosetting).setImageResource(R.drawable.enable_sound); + mContext.mView.audioDisable(true); + } + dismiss(); + audio = true; } - hlay.addView(audiosetting, params); + }); + audio = prefs.getBoolean("sound_enabled", true); + if (audio) { + ((ImageButton) audiosetting).setImageResource(R.drawable.mute_sound); } + hlay.addView(audiosetting, params); hlay.addView(addbut(R.drawable.close, new OnClickListener() { public void onClick(View v) { @@ -342,6 +338,9 @@ public class OnScreenMenu { } public class MainPopup extends PopupWindow { + + private View rsticksetting; + public MainPopup(Context c) { super(c); setBackgroundDrawable(null); @@ -373,6 +372,24 @@ public class OnScreenMenu { } }), params); + rsticksetting = addbut(R.drawable.toggle_a_b, + new OnClickListener() { + public void onClick(View v) { + if (prefs.getBoolean("right_buttons", true)) { + prefs.edit().putBoolean("right_buttons", false).commit(); + ((ImageButton) rsticksetting).setImageResource(R.drawable.toggle_a_b); + } else { + prefs.edit().putBoolean("right_buttons", true).commit(); + ((ImageButton) rsticksetting).setImageResource(R.drawable.toggle_r_l); + } + dismiss(); + } + }); + if (prefs.getBoolean("right_buttons", true)) { + ((ImageButton) rsticksetting).setImageResource(R.drawable.toggle_r_l); + } + hlay.addView(rsticksetting, params); + hlay.addView(addbut(R.drawable.config, new OnClickListener() { public void onClick(View v) { displayConfigPopup(MainPopup.this);