fx

weihuoya · Jun 14, 2022 · 74a4af2 · 74a4af2
1 parent 9ba85c9
commit 74a4af2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/android/app/src/main/java/org/citra/emu/settings/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/emu/settings/SettingsAdapter.java
@@ -338,7 +338,6 @@ public void closeDialog() {
 
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        progress = seekBar.getMax() > 99 ? (progress / 5) * 5 : progress;
         mTextSliderValue.setText(String.valueOf(progress));
     }
 

diff --git a/src/android/jni/config/main_settings.cpp b/src/android/jni/config/main_settings.cpp
@@ -26,7 +26,6 @@ const ConfigInfo<u16> FRAME_LIMIT{{"Renderer", "frame_limit"}, 100};
 const ConfigInfo<u8> FACTOR_3D{{"Renderer", "factor_3d"}, 0};
 const ConfigInfo<bool> USE_FENCE_SYNC{{"Renderer", "use_fence_sync"}, false};
 const ConfigInfo<bool> CUSTOM_TEXTURES{{"Renderer", "custom_textures"}, false};
-const ConfigInfo<bool> PRELOAD_TEXTURES{{"Renderer", "preload_textures"}, false};
 const ConfigInfo<Settings::LayoutOption> LAYOUT_OPTION{{"Renderer", "layout_option"},
                                                        Settings::LayoutOption::Default};
 const ConfigInfo<std::string> POST_PROCESSING_SHADER{{"Renderer", "pp_shader_name"}, ""};
@@ -75,7 +74,7 @@ const ConfigInfo<std::string> BUTTON_DEBUG{{"Controls", "button_debug"}, "code:1
 const ConfigInfo<std::string> BUTTON_GPIO14{{"Controls", "button_gpio14"}, "code:112"};
 const ConfigInfo<std::string> BUTTON_ZL{{"Controls", "button_zl"}, "code:104"};
 const ConfigInfo<std::string> BUTTON_ZR{{"Controls", "button_zr"}, "code:105"};
-const ConfigInfo<std::string> BUTTON_HOME{{"Controls", "button_home"}, "code:106"};
+const ConfigInfo<std::string> BUTTON_HOME{{"Controls", "button_home"}, "code:113"};
 const ConfigInfo<std::string> CIRCLE_PAD_X{{"Controls", "circle_pad_x"}, "code:0"};
 const ConfigInfo<std::string> CIRCLE_PAD_Y{{"Controls", "circle_pad_y"}, "code:1"};
 const ConfigInfo<std::string> C_STICK_X{{"Controls", "c_stick_x"}, "code:11"};

diff --git a/src/android/jni/config/main_settings.h b/src/android/jni/config/main_settings.h
@@ -33,7 +33,6 @@ extern const ConfigInfo<u16> FRAME_LIMIT;
 extern const ConfigInfo<u8> FACTOR_3D;
 extern const ConfigInfo<bool> USE_FENCE_SYNC;
 extern const ConfigInfo<bool> CUSTOM_TEXTURES;
-extern const ConfigInfo<bool> PRELOAD_TEXTURES;
 extern const ConfigInfo<Settings::LayoutOption> LAYOUT_OPTION;
 extern const ConfigInfo<std::string> POST_PROCESSING_SHADER;
 extern const ConfigInfo<std::string> REMOTE_SHADER_HOST;

diff --git a/src/android/jni/main_android.cpp b/src/android/jni/main_android.cpp
@@ -450,7 +450,6 @@ JNIEXPORT void JNICALL Java_org_citra_emu_NativeLibrary_Run(JNIEnv* env, jclass
     Settings::values.resolution_factor = Config::Get(Config::RESOLUTION_FACTOR);
     Settings::values.factor_3d = Config::Get(Config::FACTOR_3D);
     Settings::values.custom_textures = Config::Get(Config::CUSTOM_TEXTURES);
-    Settings::values.preload_textures = Config::Get(Config::PRELOAD_TEXTURES);
     Settings::values.layout_option = Config::Get(Config::LAYOUT_OPTION);
     Settings::values.pp_shader_name = Config::Get(Config::POST_PROCESSING_SHADER);
     Settings::values.remote_shader_host = Config::Get(Config::REMOTE_SHADER_HOST);
@@ -814,7 +813,7 @@ JNIEXPORT jstring JNICALL Java_org_citra_emu_NativeLibrary_GetAppTitle(JNIEnv* e
 }
 
 JNIEXPORT jbyteArray JNICALL Java_org_citra_emu_NativeLibrary_GetAppIcon(JNIEnv* env, jclass obj,
-                                                                        jstring jPath) {
+                                                                         jstring jPath) {
     auto& icon = GetGameInfo(JniHelper::Unwrap(jPath)).icon;
     return JniHelper::Wrap(reinterpret_cast<const u8*>(icon.data()), icon.size() * 2);
 }
@@ -831,7 +830,7 @@ JNIEXPORT jboolean JNICALL Java_org_citra_emu_NativeLibrary_IsAppExecutable(JNIE
 }
 
 JNIEXPORT jboolean JNICALL Java_org_citra_emu_NativeLibrary_IsAppVisible(JNIEnv* env, jclass obj,
-                                                                            jstring jPath) {
+                                                                         jstring jPath) {
     return GetGameInfo(JniHelper::Unwrap(jPath)).icon.size() > 0;
 }
 
@@ -917,8 +916,8 @@ Java_org_citra_emu_utils_NetPlayManager_NetPlayRoomInfo(JNIEnv* env, jclass claz
     return JniHelper::Wrap(NetPlayRoomInfo());
 }
 
-JNIEXPORT jboolean JNICALL
-Java_org_citra_emu_utils_NetPlayManager_NetPlayIsJoined(JNIEnv* env, jclass clazz) {
+JNIEXPORT jboolean JNICALL Java_org_citra_emu_utils_NetPlayManager_NetPlayIsJoined(JNIEnv* env,
+                                                                                   jclass clazz) {
     return NetPlayIsJoined();
 }