emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-13 17:22:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge efe15fb4ac8eb2b2b3df2fa857e474fcf57a3412 into 26ce7e4f2844a445bf77b4b14977d62e6434df08

Browse Source
This commit is contained in:
Kleidis 2025-03-12 11:52:05 +07:00 committed by GitHub
commit 69c3c21fab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 87 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt
View File

@ -15,7 +15,25 @@ enum class BooleanSetting(
ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true), ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false), SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false), INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false); CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
LLE_APPLETS("lle_applets", Settings.SECTION_SYSTEM, false),
NEW_3DS("is_new_3ds", Settings.SECTION_SYSTEM, true),
LINEAR_FILTERING("filter_mode", Settings.SECTION_RENDERER, true),
SHADERS_ACCURATE_MUL("shaders_accurate_mul", Settings.SECTION_RENDERER, false),
DISK_SHADER_CACHE("use_disk_shader_cache", Settings.SECTION_RENDERER, true),
DUMP_TEXTURES("dump_textures", Settings.SECTION_UTILITY, false),
CUSTOM_TEXTURES("custom_textures", Settings.SECTION_UTILITY, false),
ASYNC_CUSTOM_LOADING("async_custom_loading", Settings.SECTION_UTILITY, true),
PRELOAD_TEXTURES("preload_textures", Settings.SECTION_UTILITY, false),
ENABLE_AUDIO_STRETCHING("enable_audio_stretching", Settings.SECTION_AUDIO, true),
ENABLE_REALTIME_AUDIO("enable_realtime_audio", Settings.SECTION_AUDIO, false),
CPU_JIT("use_cpu_jit", Settings.SECTION_CORE, true),
HW_SHADER("use_hw_shader", Settings.SECTION_RENDERER, true),
VSYNC("use_vsync_new", Settings.SECTION_RENDERER, true),
USE_FRAME_LIMIT("use_frame_limit", Settings.SECTION_RENDERER, true),
DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, false),
DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, false),
USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, false);
override var boolean: Boolean = defaultValue override var boolean: Boolean = defaultValue
@ -36,7 +54,15 @@ enum class BooleanSetting(
private val NOT_RUNTIME_EDITABLE = listOf( private val NOT_RUNTIME_EDITABLE = listOf(
PLUGIN_LOADER, PLUGIN_LOADER,
ALLOW_PLUGIN_LOADER, ALLOW_PLUGIN_LOADER,
ASYNC_SHADERS ASYNC_SHADERS,
NEW_3DS,
LLE_APPLETS,
VSYNC,
DEBUG_RENDERER,
CPU_JIT,
ASYNC_CUSTOM_LOADING,
SHADERS_ACCURATE_MUL,
USE_ARTIC_BASE_CONTROLLER
) )
fun from(key: String): BooleanSetting? = fun from(key: String): BooleanSetting? =

28
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.kt
View File

@ -43,28 +43,10 @@ enum class IntSetting(
PORTRAIT_BOTTOM_WIDTH("custom_portrait_bottom_width",Settings.SECTION_LAYOUT,640), PORTRAIT_BOTTOM_WIDTH("custom_portrait_bottom_width",Settings.SECTION_LAYOUT,640),
PORTRAIT_BOTTOM_HEIGHT("custom_portrait_bottom_height",Settings.SECTION_LAYOUT,480), PORTRAIT_BOTTOM_HEIGHT("custom_portrait_bottom_height",Settings.SECTION_LAYOUT,480),
AUDIO_INPUT_TYPE("output_type", Settings.SECTION_AUDIO, 0), AUDIO_INPUT_TYPE("output_type", Settings.SECTION_AUDIO, 0),
NEW_3DS("is_new_3ds", Settings.SECTION_SYSTEM, 1),
LLE_APPLETS("lle_applets", Settings.SECTION_SYSTEM, 0),
CPU_CLOCK_SPEED("cpu_clock_percentage", Settings.SECTION_CORE, 100), CPU_CLOCK_SPEED("cpu_clock_percentage", Settings.SECTION_CORE, 100),
LINEAR_FILTERING("filter_mode", Settings.SECTION_RENDERER, 1),
SHADERS_ACCURATE_MUL("shaders_accurate_mul", Settings.SECTION_RENDERER, 0),
DISK_SHADER_CACHE("use_disk_shader_cache", Settings.SECTION_RENDERER, 1),
DUMP_TEXTURES("dump_textures", Settings.SECTION_UTILITY, 0),
CUSTOM_TEXTURES("custom_textures", Settings.SECTION_UTILITY, 0),
ASYNC_CUSTOM_LOADING("async_custom_loading", Settings.SECTION_UTILITY, 1),
PRELOAD_TEXTURES("preload_textures", Settings.SECTION_UTILITY, 0),
ENABLE_AUDIO_STRETCHING("enable_audio_stretching", Settings.SECTION_AUDIO, 1),
ENABLE_REALTIME_AUDIO("enable_realtime_audio", Settings.SECTION_AUDIO, 0),
CPU_JIT("use_cpu_jit", Settings.SECTION_CORE, 1),
HW_SHADER("use_hw_shader", Settings.SECTION_RENDERER, 1),
VSYNC("use_vsync_new", Settings.SECTION_RENDERER, 1),
DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, 0),
TEXTURE_FILTER("texture_filter", Settings.SECTION_RENDERER, 0), TEXTURE_FILTER("texture_filter", Settings.SECTION_RENDERER, 0),
USE_FRAME_LIMIT("use_frame_limit", Settings.SECTION_RENDERER, 1),
DELAY_RENDER_THREAD_US("delay_game_render_thread_us", Settings.SECTION_RENDERER, 0), DELAY_RENDER_THREAD_US("delay_game_render_thread_us", Settings.SECTION_RENDERER, 0),
USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, 0), ORIENTATION_OPTION("screen_orientation", Settings.SECTION_LAYOUT, 2);
ORIENTATION_OPTION("screen_orientation", Settings.SECTION_LAYOUT, 2),
DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, 0);
override var int: Int = defaultValue override var int: Int = defaultValue
override val valueAsString: String override val valueAsString: String
@ -84,16 +66,8 @@ enum class IntSetting(
private val NOT_RUNTIME_EDITABLE = listOf( private val NOT_RUNTIME_EDITABLE = listOf(
EMULATED_REGION, EMULATED_REGION,
INIT_CLOCK, INIT_CLOCK,
NEW_3DS,
LLE_APPLETS,
GRAPHICS_API, GRAPHICS_API,
VSYNC,
DEBUG_RENDERER,
CPU_JIT,
ASYNC_CUSTOM_LOADING,
AUDIO_INPUT_TYPE, AUDIO_INPUT_TYPE,
USE_ARTIC_BASE_CONTROLLER,
SHADERS_ACCURATE_MUL,
) )
fun from(key: String): IntSetting? = IntSetting.values().firstOrNull { it.key == key } fun from(key: String): IntSetting? = IntSetting.values().firstOrNull { it.key == key }

33
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SwitchSetting.kt
View File

@ -9,53 +9,30 @@ import org.citra.citra_emu.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting import org.citra.citra_emu.features.settings.model.AbstractSetting
class SwitchSetting( class SwitchSetting(
setting: AbstractSetting, setting: AbstractBooleanSetting,
titleId: Int, titleId: Int,
descriptionId: Int, descriptionId: Int,
val key: String? = null, val key: String? = null,
val defaultValue: Any? = null val defaultValue: Boolean = false
) : SettingsItem(setting, titleId, descriptionId) { ) : SettingsItem(setting, titleId, descriptionId) {
override val type = TYPE_SWITCH override val type = TYPE_SWITCH
val isChecked: Boolean val isChecked: Boolean
get() { get() {
if (setting == null) { if (setting == null) {
return defaultValue as Boolean return defaultValue
} }
// Try integer setting
try {
val setting = setting as AbstractIntSetting
return setting.int == 1
} catch (_: ClassCastException) {
}
// Try boolean setting
try {
val setting = setting as AbstractBooleanSetting val setting = setting as AbstractBooleanSetting
return setting.boolean return setting.boolean
} catch (_: ClassCastException) {
}
return defaultValue as Boolean
} }
/** /**
* Write a value to the backing boolean. If that boolean was previously null, * Write a value to the backing boolean.
* initializes a new one and returns it, so it can be added to the Hashmap.
* *
* @param checked Pretty self explanatory. * @param checked Pretty self explanatory.
* @return the existing setting with the new value applied. * @return the existing setting with the new value applied.
*/ */
fun setChecked(checked: Boolean): AbstractSetting { fun setChecked(checked: Boolean): AbstractBooleanSetting {
// Try integer setting
try {
val setting = setting as AbstractIntSetting
setting.int = if (checked) 1 else 0
return setting
} catch (_: ClassCastException) {
}
// Try boolean setting
val setting = setting as AbstractBooleanSetting val setting = setting as AbstractBooleanSetting
setting.boolean = checked setting.boolean = checked
return setting return setting

102
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -217,11 +217,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
sl.apply { sl.apply {
add( add(
SwitchSetting( SwitchSetting(
IntSetting.USE_FRAME_LIMIT, BooleanSetting.USE_FRAME_LIMIT,
R.string.frame_limit_enable, R.string.frame_limit_enable,
R.string.frame_limit_enable_description, R.string.frame_limit_enable_description,
IntSetting.USE_FRAME_LIMIT.key, BooleanSetting.USE_FRAME_LIMIT.key,
IntSetting.USE_FRAME_LIMIT.defaultValue BooleanSetting.USE_FRAME_LIMIT.defaultValue
) )
) )
add( add(
@ -689,11 +689,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
add(HeaderSetting(R.string.miscellaneous)) add(HeaderSetting(R.string.miscellaneous))
add( add(
SwitchSetting( SwitchSetting(
IntSetting.USE_ARTIC_BASE_CONTROLLER, BooleanSetting.USE_ARTIC_BASE_CONTROLLER,
R.string.use_artic_base_controller, R.string.use_artic_base_controller,
R.string.use_artic_base_controller_desc, R.string.use_artic_base_controller_desc,
IntSetting.USE_ARTIC_BASE_CONTROLLER.key, BooleanSetting.USE_ARTIC_BASE_CONTROLLER.key,
IntSetting.USE_ARTIC_BASE_CONTROLLER.defaultValue BooleanSetting.USE_ARTIC_BASE_CONTROLLER.defaultValue
) )
) )
} }
@ -762,29 +762,29 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.LINEAR_FILTERING, BooleanSetting.LINEAR_FILTERING,
R.string.linear_filtering, R.string.linear_filtering,
R.string.linear_filtering_description, R.string.linear_filtering_description,
IntSetting.LINEAR_FILTERING.key, BooleanSetting.LINEAR_FILTERING.key,
IntSetting.LINEAR_FILTERING.defaultValue BooleanSetting.LINEAR_FILTERING.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.SHADERS_ACCURATE_MUL, BooleanSetting.ASYNC_SHADERS,
R.string.shaders_accurate_mul, R.string.shaders_accurate_mul,
R.string.shaders_accurate_mul_description, R.string.shaders_accurate_mul_description,
IntSetting.SHADERS_ACCURATE_MUL.key, BooleanSetting.SHADERS_ACCURATE_MUL.key,
IntSetting.SHADERS_ACCURATE_MUL.defaultValue BooleanSetting.SHADERS_ACCURATE_MUL.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.DISK_SHADER_CACHE, BooleanSetting.DISK_SHADER_CACHE,
R.string.use_disk_shader_cache, R.string.use_disk_shader_cache,
R.string.use_disk_shader_cache_description, R.string.use_disk_shader_cache_description,
IntSetting.DISK_SHADER_CACHE.key, BooleanSetting.DISK_SHADER_CACHE.key,
IntSetting.DISK_SHADER_CACHE.defaultValue BooleanSetting.DISK_SHADER_CACHE.defaultValue
) )
) )
add( add(
@ -837,11 +837,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.DISABLE_RIGHT_EYE_RENDER, BooleanSetting.DISABLE_RIGHT_EYE_RENDER,
R.string.disable_right_eye_render, R.string.disable_right_eye_render,
R.string.disable_right_eye_render_description, R.string.disable_right_eye_render_description,
IntSetting.DISABLE_RIGHT_EYE_RENDER.key, BooleanSetting.DISABLE_RIGHT_EYE_RENDER.key,
IntSetting.DISABLE_RIGHT_EYE_RENDER.defaultValue BooleanSetting.DISABLE_RIGHT_EYE_RENDER.defaultValue
) )
) )
@ -886,29 +886,29 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
add(HeaderSetting(R.string.utility)) add(HeaderSetting(R.string.utility))
add( add(
SwitchSetting( SwitchSetting(
IntSetting.DUMP_TEXTURES, BooleanSetting.DUMP_TEXTURES,
R.string.dump_textures, R.string.dump_textures,
R.string.dump_textures_description, R.string.dump_textures_description,
IntSetting.DUMP_TEXTURES.key, BooleanSetting.DUMP_TEXTURES.key,
IntSetting.DUMP_TEXTURES.defaultValue BooleanSetting.DUMP_TEXTURES.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.CUSTOM_TEXTURES, BooleanSetting.CUSTOM_TEXTURES,
R.string.custom_textures, R.string.custom_textures,
R.string.custom_textures_description, R.string.custom_textures_description,
IntSetting.CUSTOM_TEXTURES.key, BooleanSetting.CUSTOM_TEXTURES.key,
IntSetting.CUSTOM_TEXTURES.defaultValue BooleanSetting.CUSTOM_TEXTURES.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.ASYNC_CUSTOM_LOADING, BooleanSetting.ASYNC_CUSTOM_LOADING,
R.string.async_custom_loading, R.string.async_custom_loading,
R.string.async_custom_loading_description, R.string.async_custom_loading_description,
IntSetting.ASYNC_CUSTOM_LOADING.key, BooleanSetting.ASYNC_CUSTOM_LOADING.key,
IntSetting.ASYNC_CUSTOM_LOADING.defaultValue BooleanSetting.ASYNC_CUSTOM_LOADING.defaultValue
) )
) )
@ -1231,20 +1231,20 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.ENABLE_AUDIO_STRETCHING, BooleanSetting.ENABLE_AUDIO_STRETCHING,
R.string.audio_stretch, R.string.audio_stretch,
R.string.audio_stretch_description, R.string.audio_stretch_description,
IntSetting.ENABLE_AUDIO_STRETCHING.key, BooleanSetting.ENABLE_AUDIO_STRETCHING.key,
IntSetting.ENABLE_AUDIO_STRETCHING.defaultValue BooleanSetting.ENABLE_AUDIO_STRETCHING.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.ENABLE_REALTIME_AUDIO, BooleanSetting.ENABLE_REALTIME_AUDIO,
R.string.realtime_audio, R.string.realtime_audio,
R.string.realtime_audio_description, R.string.realtime_audio_description,
IntSetting.ENABLE_REALTIME_AUDIO.key, BooleanSetting.ENABLE_REALTIME_AUDIO.key,
IntSetting.ENABLE_REALTIME_AUDIO.defaultValue BooleanSetting.ENABLE_REALTIME_AUDIO.defaultValue
) )
) )
add( add(
@ -1287,20 +1287,20 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
add(HeaderSetting(R.string.debug_warning)) add(HeaderSetting(R.string.debug_warning))
add( add(
SwitchSetting( SwitchSetting(
IntSetting.NEW_3DS, BooleanSetting.NEW_3DS,
R.string.new_3ds, R.string.new_3ds,
0, 0,
IntSetting.NEW_3DS.key, BooleanSetting.NEW_3DS.key,
IntSetting.NEW_3DS.defaultValue BooleanSetting.NEW_3DS.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.LLE_APPLETS, BooleanSetting.LLE_APPLETS,
R.string.lle_applets, R.string.lle_applets,
0, 0,
IntSetting.LLE_APPLETS.key, BooleanSetting.LLE_APPLETS.key,
IntSetting.LLE_APPLETS.defaultValue BooleanSetting.LLE_APPLETS.defaultValue
) )
) )
add( add(
@ -1317,38 +1317,38 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.CPU_JIT, BooleanSetting.CPU_JIT,
R.string.cpu_jit, R.string.cpu_jit,
R.string.cpu_jit_description, R.string.cpu_jit_description,
IntSetting.CPU_JIT.key, BooleanSetting.CPU_JIT.key,
IntSetting.CPU_JIT.defaultValue BooleanSetting.CPU_JIT.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.HW_SHADER, BooleanSetting.HW_SHADER,
R.string.hw_shaders, R.string.hw_shaders,
R.string.hw_shaders_description, R.string.hw_shaders_description,
IntSetting.HW_SHADER.key, BooleanSetting.HW_SHADER.key,
IntSetting.HW_SHADER.defaultValue BooleanSetting.HW_SHADER.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.VSYNC, BooleanSetting.VSYNC,
R.string.vsync, R.string.vsync,
R.string.vsync_description, R.string.vsync_description,
IntSetting.VSYNC.key, BooleanSetting.VSYNC.key,
IntSetting.VSYNC.defaultValue BooleanSetting.VSYNC.defaultValue
) )
) )
add( add(
SwitchSetting( SwitchSetting(
IntSetting.DEBUG_RENDERER, BooleanSetting.DEBUG_RENDERER,
R.string.renderer_debug, R.string.renderer_debug,
R.string.renderer_debug_description, R.string.renderer_debug_description,
IntSetting.DEBUG_RENDERER.key, BooleanSetting.DEBUG_RENDERER.key,
IntSetting.DEBUG_RENDERER.defaultValue BooleanSetting.DEBUG_RENDERER.defaultValue
) )
) )
add( add(