Merge pull request #1481 from mar753/clipping_switch_added
Clipping switch in settings added - Android (multiplayer/split screen fixed)
This commit is contained in:
commit
3c57177d38
|
@ -21,6 +21,7 @@ public class Emulator extends Application {
|
||||||
public static final String pref_mipmaps = "use_mipmaps";
|
public static final String pref_mipmaps = "use_mipmaps";
|
||||||
public static final String pref_resolution = "resolution";
|
public static final String pref_resolution = "resolution";
|
||||||
public static final String pref_frameskip = "frame_skip";
|
public static final String pref_frameskip = "frame_skip";
|
||||||
|
public static final String pref_clipping = "clipping";
|
||||||
public static final String pref_pvrrender = "pvr_render";
|
public static final String pref_pvrrender = "pvr_render";
|
||||||
public static final String pref_syncedrender = "synced_render";
|
public static final String pref_syncedrender = "synced_render";
|
||||||
public static final String pref_modvols = "modifier_volumes";
|
public static final String pref_modvols = "modifier_volumes";
|
||||||
|
@ -42,6 +43,7 @@ public class Emulator extends Application {
|
||||||
public static boolean crtview = false;
|
public static boolean crtview = false;
|
||||||
public static boolean subdivide = false;
|
public static boolean subdivide = false;
|
||||||
public static int frameskip = 0;
|
public static int frameskip = 0;
|
||||||
|
public static boolean clipping = false;
|
||||||
public static boolean pvrrender = false;
|
public static boolean pvrrender = false;
|
||||||
public static boolean syncedrender = false;
|
public static boolean syncedrender = false;
|
||||||
public static boolean modvols = true;
|
public static boolean modvols = true;
|
||||||
|
@ -64,6 +66,7 @@ public class Emulator extends Application {
|
||||||
Emulator.widescreen = mPrefs.getInt(pref_resolution, 0) == 2;
|
Emulator.widescreen = mPrefs.getInt(pref_resolution, 0) == 2;
|
||||||
Emulator.crtview = mPrefs.getInt(pref_resolution, 0) == 1;
|
Emulator.crtview = mPrefs.getInt(pref_resolution, 0) == 1;
|
||||||
Emulator.frameskip = mPrefs.getInt(pref_frameskip, frameskip);
|
Emulator.frameskip = mPrefs.getInt(pref_frameskip, frameskip);
|
||||||
|
Emulator.clipping = mPrefs.getBoolean(pref_clipping, clipping);
|
||||||
Emulator.pvrrender = mPrefs.getBoolean(pref_pvrrender, pvrrender);
|
Emulator.pvrrender = mPrefs.getBoolean(pref_pvrrender, pvrrender);
|
||||||
Emulator.syncedrender = mPrefs.getBoolean(pref_syncedrender, syncedrender);
|
Emulator.syncedrender = mPrefs.getBoolean(pref_syncedrender, syncedrender);
|
||||||
Emulator.bootdisk = mPrefs.getString(pref_bootdisk, bootdisk);
|
Emulator.bootdisk = mPrefs.getString(pref_bootdisk, bootdisk);
|
||||||
|
@ -89,6 +92,7 @@ public class Emulator extends Application {
|
||||||
JNIdc.widescreen(Emulator.widescreen ? 1 : 0);
|
JNIdc.widescreen(Emulator.widescreen ? 1 : 0);
|
||||||
JNIdc.subdivide(Emulator.subdivide ? 1 : 0);
|
JNIdc.subdivide(Emulator.subdivide ? 1 : 0);
|
||||||
JNIdc.frameskip(Emulator.frameskip);
|
JNIdc.frameskip(Emulator.frameskip);
|
||||||
|
JNIdc.clipping(Emulator.clipping ? 1 : 0);
|
||||||
JNIdc.pvrrender(Emulator.pvrrender ? 1 : 0);
|
JNIdc.pvrrender(Emulator.pvrrender ? 1 : 0);
|
||||||
JNIdc.syncedrender(Emulator.syncedrender ? 1 : 0);
|
JNIdc.syncedrender(Emulator.syncedrender ? 1 : 0);
|
||||||
JNIdc.modvols(Emulator.modvols ? 1 : 0);
|
JNIdc.modvols(Emulator.modvols ? 1 : 0);
|
||||||
|
|
|
@ -355,6 +355,16 @@ public class OptionsFragment extends Fragment {
|
||||||
limit_fps.setChecked(mPrefs.getBoolean(Emulator.pref_limitfps, Emulator.limitfps));
|
limit_fps.setChecked(mPrefs.getBoolean(Emulator.pref_limitfps, Emulator.limitfps));
|
||||||
limit_fps.setOnCheckedChangeListener(limitfps_option);
|
limit_fps.setOnCheckedChangeListener(limitfps_option);
|
||||||
|
|
||||||
|
OnCheckedChangeListener clipping_option = new OnCheckedChangeListener() {
|
||||||
|
|
||||||
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||||
|
mPrefs.edit().putBoolean(Emulator.pref_clipping, isChecked).apply();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
CompoundButton clipping_fps = (CompoundButton) getView().findViewById(R.id.clipping_option);
|
||||||
|
clipping_fps.setChecked(mPrefs.getBoolean(Emulator.pref_clipping, Emulator.clipping));
|
||||||
|
clipping_fps.setOnCheckedChangeListener(clipping_option);
|
||||||
|
|
||||||
OnCheckedChangeListener mipmaps_option = new OnCheckedChangeListener() {
|
OnCheckedChangeListener mipmaps_option = new OnCheckedChangeListener() {
|
||||||
|
|
||||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||||
|
@ -690,6 +700,7 @@ public class OptionsFragment extends Fragment {
|
||||||
mPrefs.edit().remove(Emulator.pref_mipmaps).apply();
|
mPrefs.edit().remove(Emulator.pref_mipmaps).apply();
|
||||||
mPrefs.edit().remove(Emulator.pref_resolution).apply();
|
mPrefs.edit().remove(Emulator.pref_resolution).apply();
|
||||||
mPrefs.edit().remove(Emulator.pref_frameskip).apply();
|
mPrefs.edit().remove(Emulator.pref_frameskip).apply();
|
||||||
|
mPrefs.edit().remove(Emulator.pref_clipping).apply();
|
||||||
mPrefs.edit().remove(Emulator.pref_pvrrender).apply();
|
mPrefs.edit().remove(Emulator.pref_pvrrender).apply();
|
||||||
mPrefs.edit().remove(Emulator.pref_syncedrender).apply();
|
mPrefs.edit().remove(Emulator.pref_syncedrender).apply();
|
||||||
mPrefs.edit().remove(Emulator.pref_bootdisk).apply();
|
mPrefs.edit().remove(Emulator.pref_bootdisk).apply();
|
||||||
|
|
|
@ -43,6 +43,7 @@ public final class JNIdc
|
||||||
public static native void widescreen(int stretch);
|
public static native void widescreen(int stretch);
|
||||||
public static native void subdivide(int subdivide);
|
public static native void subdivide(int subdivide);
|
||||||
public static native void frameskip(int frames);
|
public static native void frameskip(int frames);
|
||||||
|
public static native void clipping(int clipping);
|
||||||
public static native void pvrrender(int render);
|
public static native void pvrrender(int render);
|
||||||
public static native void syncedrender(int sync);
|
public static native void syncedrender(int sync);
|
||||||
public static native void modvols(int volumes);
|
public static native void modvols(int volumes);
|
||||||
|
|
|
@ -52,6 +52,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_safemode(JNIEnv *env,
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_cable(JNIEnv *env,jobject obj, jint cable) __attribute__((visibility("default")));
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_cable(JNIEnv *env,jobject obj, jint cable) __attribute__((visibility("default")));
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_region(JNIEnv *env,jobject obj, jint region) __attribute__((visibility("default")));
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_region(JNIEnv *env,jobject obj, jint region) __attribute__((visibility("default")));
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_broadcast(JNIEnv *env,jobject obj, jint broadcast) __attribute__((visibility("default")));
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_broadcast(JNIEnv *env,jobject obj, jint broadcast) __attribute__((visibility("default")));
|
||||||
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_clipping(JNIEnv *env,jobject obj, jint clipping) __attribute__((visibility("default")));
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) __attribute__((visibility("default")));
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) __attribute__((visibility("default")));
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) __attribute__((visibility("default")));
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) __attribute__((visibility("default")));
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nosound(JNIEnv *env,jobject obj, jint noaudio) __attribute__((visibility("default")));
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nosound(JNIEnv *env,jobject obj, jint noaudio) __attribute__((visibility("default")));
|
||||||
|
@ -122,6 +123,11 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_mipmaps(JNIEnv *env,j
|
||||||
settings.rend.UseMipmaps = mipmaps;
|
settings.rend.UseMipmaps = mipmaps;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_clipping(JNIEnv *env,jobject obj, jint clipping)
|
||||||
|
{
|
||||||
|
settings.rend.Clipping = clipping;
|
||||||
|
}
|
||||||
|
|
||||||
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch)
|
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch)
|
||||||
{
|
{
|
||||||
settings.rend.WideScreen = stretch;
|
settings.rend.WideScreen = stretch;
|
||||||
|
|
|
@ -665,6 +665,34 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
|
<TableRow
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:gravity="center_vertical" >
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/clipping_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:ems="10"
|
||||||
|
android:gravity="center_vertical|left"
|
||||||
|
android:text="@string/clipping" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="right"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
|
||||||
|
<Switch
|
||||||
|
android:id="@+id/clipping_option"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:focusable="true" />
|
||||||
|
</LinearLayout>
|
||||||
|
</TableRow>
|
||||||
|
|
||||||
<TableRow
|
<TableRow
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:gravity="center_vertical" >
|
android:gravity="center_vertical" >
|
||||||
|
|
|
@ -665,6 +665,34 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
|
<TableRow
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:gravity="center_vertical" >
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/clipping_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:ems="10"
|
||||||
|
android:gravity="center_vertical|left"
|
||||||
|
android:text="@string/clipping" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="right"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
|
||||||
|
<Checkbox
|
||||||
|
android:id="@+id/clipping_option"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:focusable="true" />
|
||||||
|
</LinearLayout>
|
||||||
|
</TableRow>
|
||||||
|
|
||||||
<TableRow
|
<TableRow
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:gravity="center_vertical" >
|
android:gravity="center_vertical" >
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
<string name="select_sound">Disable Emulator Sound</string>
|
<string name="select_sound">Disable Emulator Sound</string>
|
||||||
<string name="select_depth">View Rendering Depth</string>
|
<string name="select_depth">View Rendering Depth</string>
|
||||||
<string name="boot_disk">Boot Disk (ie. Gameshark, Utopia)</string>
|
<string name="boot_disk">Boot Disk (ie. Gameshark, Utopia)</string>
|
||||||
|
<string name="clipping">Clipping</string>
|
||||||
|
|
||||||
<string name="reset_emu">Reset Emu</string>
|
<string name="reset_emu">Reset Emu</string>
|
||||||
<string name="reset_emu_title">Reset Emulator Settings</string>
|
<string name="reset_emu_title">Reset Emulator Settings</string>
|
||||||
|
|
Loading…
Reference in New Issue