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

Android: more UI settings (video)

This commit is contained in:
Flyinghead 2019-02-07 09:42:51 +01:00
parent c02bb919c1
commit eb3bbb7dc0
4 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/nullDC.cpp
View File

@ -548,15 +548,11 @@ void LoadSettings()
settings.input.MouseSensitivity = cfgLoadInt("input", "MouseSensitivity", 100);
settings.input.JammaSetup = cfgLoadInt("input", "JammaSetup", 0);
#else
// TODO Expose this with JNI
settings.rend.Clipping = 1;
settings.rend.RenderToTextureUpscale = 1;
settings.rend.TextureUpscale = 1;
settings.rend.RenderToTextureUpscale = max(1, settings.rend.RenderToTextureUpscale);
settings.rend.TextureUpscale = max(1, settings.rend.TextureUpscale);
// Configured on a per-game basis
settings.rend.ExtraDepthScale = 1.f;
settings.dynarec.safemode = 0;
settings.input.JammaSetup = 0;
settings.rend.ExtraDepthScale = max(1.f, settings.rend.ExtraDepthScale);
#endif
settings.pvr.HashLogFile = cfgLoadStr("testing", "ta.HashLogFile", "");

30
shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java
View File

@ -35,6 +35,11 @@ public class Emulator extends Application {
public static final String pref_usereios = "use_reios";
public static final String pref_customtextures = "custom_textures";
public static final String pref_showfps = "show_fps";
public static final String pref_RenderToTextureBuffer = "RenderToTextureBuffer";
public static final String pref_RenderToTextureUpscale = "RenderToTextureUpscale";
public static final String pref_TextureUpscale = "TextureUpscale";
public static final String pref_MaxFilteredTextureSize= "MaxFilteredTextureSize";
public static final String pref_MaxThreads = "MaxThreads";
public static boolean dynarecopt = true;
public static boolean idleskip = true;
@ -60,6 +65,11 @@ public class Emulator extends Application {
public static boolean nativeact = false;
public static boolean customtextures = false;
public static boolean showfps = false;
public static boolean RenderToTextureBuffer = false;
public static int RenderToTextureUpscale = 1;
public static int TextureUpscale = 1;
public static int MaxFilteredTextureSize = 256;
public static int MaxThreads = 1;
/**
* Load the user configuration from preferences
@ -89,6 +99,11 @@ public class Emulator extends Application {
Emulator.nativeact = mPrefs.getBoolean(pref_nativeact, nativeact);
Emulator.customtextures = mPrefs.getBoolean(pref_customtextures, customtextures);
Emulator.showfps = mPrefs.getBoolean(pref_showfps, showfps);
Emulator.RenderToTextureBuffer = mPrefs.getBoolean(pref_RenderToTextureBuffer, RenderToTextureBuffer);
Emulator.RenderToTextureUpscale = mPrefs.getInt(pref_RenderToTextureUpscale, RenderToTextureUpscale);
Emulator.TextureUpscale = mPrefs.getInt(pref_TextureUpscale, TextureUpscale);
Emulator.MaxFilteredTextureSize = mPrefs.getInt(pref_MaxFilteredTextureSize, MaxFilteredTextureSize);
Emulator.MaxThreads = mPrefs.getInt(pref_MaxThreads, MaxThreads);
}
/**
@ -118,6 +133,11 @@ public class Emulator extends Application {
JNIdc.bootdisk(Emulator.bootdisk);
JNIdc.setCustomtextures(Emulator.customtextures);
JNIdc.setShowfps(Emulator.showfps);
JNIdc.setRenderToTextureBuffer(Emulator.RenderToTextureBuffer);
JNIdc.setRenderToTextureUpscale(Emulator.RenderToTextureUpscale);
JNIdc.setTextureUpscale(Emulator.TextureUpscale);
JNIdc.setMaxFilteredTextureSize(Emulator.MaxFilteredTextureSize);
JNIdc.setMaxThreads(Emulator.MaxThreads);
}
public void loadGameConfiguration(String gameId) {
@ -165,6 +185,11 @@ public class Emulator extends Application {
//Emulator.bootdisk = JNIdc.getBootdisk();
Emulator.customtextures = JNIdc.getCustomtextures();
Emulator.showfps = JNIdc.getShowfps();
Emulator.RenderToTextureBuffer = JNIdc.getRenderToTextureBuffer();
Emulator.RenderToTextureUpscale = JNIdc.getRenderToTextureUpscale();
Emulator.TextureUpscale = JNIdc.getTextureUpscale();
Emulator.MaxFilteredTextureSize = JNIdc.getMaxFilteredTextureSize();
Emulator.MaxThreads = JNIdc.getMaxThreads();
prefs.edit()
.putBoolean(Emulator.pref_dynarecopt, Emulator.dynarecopt)
@ -188,6 +213,11 @@ public class Emulator extends Application {
.putBoolean(Emulator.pref_usereios, Emulator.usereios)
.putBoolean(Emulator.pref_customtextures, Emulator.customtextures)
.putBoolean(Emulator.pref_showfps, Emulator.showfps)
.putBoolean(Emulator.pref_RenderToTextureBuffer, Emulator.RenderToTextureBuffer)
.putInt(Emulator.pref_RenderToTextureUpscale, Emulator.RenderToTextureUpscale)
.putInt(Emulator.pref_TextureUpscale, Emulator.TextureUpscale)
.putInt(Emulator.pref_MaxFilteredTextureSize, Emulator.MaxFilteredTextureSize)
.putInt(Emulator.pref_MaxThreads, Emulator.MaxThreads)
.apply();
}

10
shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
View File

@ -72,6 +72,16 @@ public final class JNIdc
public static native void setCustomtextures(boolean customtex);
public static native boolean getShowfps();
public static native void setShowfps(boolean showfps);
public static native boolean getRenderToTextureBuffer();
public static native void setRenderToTextureBuffer(boolean render);
public static native int getRenderToTextureUpscale();
public static native void setRenderToTextureUpscale(int upscale);
public static native int getTextureUpscale();
public static native void setTextureUpscale(int upscale);
public static native int getMaxFilteredTextureSize();
public static native void setMaxFilteredTextureSize(int maxSize);
public static native int getMaxThreads();
public static native void setMaxThreads(int maxThreads);
public static native void screenDpi(int screenDpi);
public static native void guiOpenSettings();

5
shell/android-studio/reicast/src/main/jni/src/Android.cpp
View File

@ -79,6 +79,11 @@ SETTINGS_ACCESSORS(Clipping, rend.Clipping, jboolean)
SETTINGS_ACCESSORS(Usereios, bios.UseReios, jboolean)
SETTINGS_ACCESSORS(Customtextures, rend.CustomTextures, jboolean)
SETTINGS_ACCESSORS(Showfps, rend.ShowFPS, jboolean)
SETTINGS_ACCESSORS(RenderToTextureBuffer, rend.RenderToTextureBuffer, jboolean)
SETTINGS_ACCESSORS(RenderToTextureUpscale, rend.RenderToTextureUpscale, jint)
SETTINGS_ACCESSORS(TextureUpscale, rend.TextureUpscale, jint)
SETTINGS_ACCESSORS(MaxFilteredTextureSize, rend.MaxFilteredTextureSize, jint)
SETTINGS_ACCESSORS(MaxThreads, pvr.MaxThreads, jint)
JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_getBootdisk(JNIEnv *env,jobject obj) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_bootdisk(JNIEnv *env,jobject obj, jstring disk) __attribute__((visibility("default")));