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

Add support to use the right joystick as A / B, L1 / R2 trigger

This commit is contained in:
TwistedUmbrella 2014-02-23 18:50:31 -05:00
parent 339ed77516
commit 5c0601dd2e
5 changed files with 103 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
shell/android/psd/dctemplate.psd
View File

Binary file not shown.

BIN
shell/android/res/drawable/toggle_a_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
shell/android/res/drawable/toggle_r_l.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

19
shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
View File

@ -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);

105
shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
View File

@ -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) {
if (screen) {
JNIdc.widescreen(1);
dismiss();
widescreen = true;
}
});
screen = true;
((ImageButton) fullscreen).setImageResource(R.drawable.normal_view);
} else {
fullscreen = addbut(R.drawable.normal_view,
new OnClickListener() {
public void onClick(View v) {
JNIdc.widescreen(0);
screen = false;
((ImageButton) fullscreen).setImageResource(R.drawable.widescreen);
}
dismiss();
widescreen = false;
}
});
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) {
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();
limitframes = false;
}
});
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) {
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();
audiodisabled = false;
audio = true;
}
});
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);