mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
Fix per-game screen effects preset persistence
This commit is contained in:
1 parent
8b1bf6bcd1
commit
5b8b16234f
4 files changed
+93
-15
No files matched your search
@@ -1372,6 +1372,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
WaylandCompositor.nativeSetUpscaler(m)
|
||||
WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name)
|
||||
},
|
||||
onPresetUpscaler = { m ->
|
||||
val target = effectsEditorTarget ?: screenEffectsTarget
|
||||
val profileId = screenEffectsProfileIdForTarget(target)
|
||||
SessionPrefs.setScreenEffectsUpscaler(this@SessionActivity, profileId, m)
|
||||
if (target == screenEffectsTarget && screenEffectsTargetAppliesToLiveOutput(target)) {
|
||||
upscaler = m
|
||||
WaylandCompositor.nativeSetUpscaler(m)
|
||||
WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name)
|
||||
}
|
||||
},
|
||||
onUpscaleSharpness = { pct ->
|
||||
SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct
|
||||
WaylandCompositor.nativeSetUpscaleSharpness(pct)
|
||||
@@ -1407,11 +1417,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
onScreenEffectsTarget = ::selectScreenEffectsTarget,
|
||||
onScreenEffectsReset = {
|
||||
val target = effectsEditorTarget ?: screenEffectsTarget
|
||||
if (target == screenEffectsTarget) resetScreenEffectsTarget(target)
|
||||
val profileStillMatches = target != SCREEN_EFFECTS_TARGET_AUTO ||
|
||||
SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity) == effectsEditorProfileId
|
||||
if (target == screenEffectsTarget && profileStillMatches) {
|
||||
resetScreenEffectsTarget(target)
|
||||
}
|
||||
},
|
||||
onScreenEffectsDelete = {
|
||||
val target = effectsEditorTarget ?: screenEffectsTarget
|
||||
if (target == screenEffectsTarget) deleteScreenEffectsTarget(target)
|
||||
val profileStillMatches = target != SCREEN_EFFECTS_TARGET_AUTO ||
|
||||
SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity) == effectsEditorProfileId
|
||||
if (target == screenEffectsTarget && profileStillMatches) {
|
||||
deleteScreenEffectsTarget(target)
|
||||
}
|
||||
},
|
||||
onScreenEffectsProfilesRefresh = {
|
||||
drawerGameInventoryRevision++
|
||||
@@ -2042,8 +2060,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
val profileId = SessionPrefs.activeScreenEffectsProfileId(this)
|
||||
observedScreenEffectsProfileId = profileId
|
||||
val activeEffects = SessionPrefs.screenEffects(this, profileId)
|
||||
if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) effects = activeEffects
|
||||
activeEffects.push(upscaler)
|
||||
val activeUpscaler = SessionPrefs.screenEffectsUpscaler(this, profileId)
|
||||
if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) {
|
||||
effects = activeEffects
|
||||
upscaler = activeUpscaler
|
||||
WaylandCompositor.nativeSetUpscaler(activeUpscaler)
|
||||
WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(activeEffects, activeUpscaler)?.name)
|
||||
}
|
||||
activeEffects.push(activeUpscaler)
|
||||
}
|
||||
|
||||
private fun screenEffectsProfileIdForTarget(target: String): String? = when (target) {
|
||||
@@ -2053,16 +2077,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
}
|
||||
|
||||
private fun screenEffectsTargetOptions(): List<Pair<String, String>> {
|
||||
val installed = drawerGameProfileRefresh.data?.profiles.orEmpty().associate { it.first.toString() to it.second }
|
||||
val installed = drawerGameProfileRefresh.data?.profiles.orEmpty()
|
||||
.associate { it.first.toULong().toString() to it.second }
|
||||
val ids = linkedSetOf<String>()
|
||||
ids.addAll(installed.keys)
|
||||
SessionPrefs.screenEffectsProfileIds(this).forEach { saved ->
|
||||
if (saved.startsWith("game:")) {
|
||||
saved.removePrefix("game:").toLongOrNull()?.let { ids.add(it.toString()) }
|
||||
saved.removePrefix("game:").toULongOrNull()?.let { ids.add(it.toString()) }
|
||||
}
|
||||
}
|
||||
currentScreenEffectsProfileId()?.takeIf { it.startsWith("game:") }
|
||||
?.removePrefix("game:")?.toLongOrNull()?.let { ids.add(it.toString()) }
|
||||
?.removePrefix("game:")?.toULongOrNull()?.let { ids.add(it.toString()) }
|
||||
|
||||
return buildList {
|
||||
add(SCREEN_EFFECTS_TARGET_AUTO to getString(R.string.screen_effects_target_auto))
|
||||
@@ -2087,8 +2112,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
syncActiveScreenEffectsProfile()
|
||||
return
|
||||
}
|
||||
effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(target))
|
||||
if (screenEffectsTargetAppliesToLiveOutput(target)) effects.push(upscaler)
|
||||
val profileId = screenEffectsProfileIdForTarget(target)
|
||||
val targetEffects = SessionPrefs.screenEffects(this, profileId)
|
||||
val targetUpscaler = SessionPrefs.screenEffectsUpscaler(this, profileId)
|
||||
effects = targetEffects
|
||||
upscaler = targetUpscaler
|
||||
if (screenEffectsTargetAppliesToLiveOutput(target)) {
|
||||
WaylandCompositor.nativeSetUpscaler(targetUpscaler)
|
||||
WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(targetEffects, targetUpscaler)?.name)
|
||||
targetEffects.push(targetUpscaler)
|
||||
}
|
||||
}
|
||||
|
||||
private fun selectScreenEffectsTarget(target: String) {
|
||||
@@ -2226,7 +2259,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
hudConfig = DroidDeckHudConfig.load(this)
|
||||
hudColor = SessionPrefs.hudColor(this)
|
||||
hudOpacity = SessionPrefs.hudOpacity(this)
|
||||
upscaler = SessionPrefs.upscaler(this)
|
||||
upscaler = SessionPrefs.screenEffectsUpscaler(this, screenEffectsProfileIdForTarget(screenEffectsTarget))
|
||||
upscaleSharpness = SessionPrefs.upscaleSharpness(this)
|
||||
effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget))
|
||||
applyCardboard(SessionPrefs.cardboard(this))
|
||||
@@ -5203,8 +5236,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this)
|
||||
readPrefs()
|
||||
observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this)
|
||||
effects = SessionPrefs.screenEffects(this, observedScreenEffectsProfileId)
|
||||
if (CompositorHost.isStarted) effects.push(upscaler)
|
||||
val activeEffects = SessionPrefs.screenEffects(this, observedScreenEffectsProfileId)
|
||||
if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) {
|
||||
effects = activeEffects
|
||||
} else {
|
||||
effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget))
|
||||
}
|
||||
if (CompositorHost.isStarted) activeEffects.push(upscaler)
|
||||
refreshInputProfile()
|
||||
refreshControls()
|
||||
if (::pip.isInitialized) pip.resumed()
|
||||
|
||||
@@ -13,6 +13,8 @@ import com.droiddeck.launcher.gpu.TurnipDriver
|
||||
import org.json.JSONObject
|
||||
import java.io.File
|
||||
|
||||
private const val SCREEN_EFFECTS_PROFILE_UPSCALER_KEY = "upscaler"
|
||||
|
||||
object SessionPrefs {
|
||||
data class GameTextureFiltering(val anisotropy: Int? = null, val lodBias: String? = null)
|
||||
|
||||
@@ -1485,7 +1487,44 @@ object SessionPrefs {
|
||||
val profiles = runCatching {
|
||||
JSONObject(sessionPrefs.getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}")
|
||||
}.getOrDefault(JSONObject())
|
||||
profiles.put(profileId, effects.encode())
|
||||
val encoded = effects.encode()
|
||||
profiles.optJSONObject(profileId)?.let { savedProfile ->
|
||||
if (savedProfile.has(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY)) {
|
||||
encoded.put(
|
||||
SCREEN_EFFECTS_PROFILE_UPSCALER_KEY,
|
||||
savedProfile.optInt(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY),
|
||||
)
|
||||
}
|
||||
}
|
||||
profiles.put(profileId, encoded)
|
||||
sessionPrefs.edit().putString(SCREEN_EFFECTS_PROFILES_KEY, profiles.toString()).apply()
|
||||
}
|
||||
|
||||
fun screenEffectsUpscaler(context: Context, profileId: String?): Int {
|
||||
if (profileId.isNullOrBlank()) return upscaler(context)
|
||||
val stored = runCatching {
|
||||
val profiles = JSONObject(prefs(context).getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}")
|
||||
val profile = profiles.optJSONObject(profileId)
|
||||
if (profile?.has(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY) == true) {
|
||||
profile.optInt(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY, -1)
|
||||
} else -1
|
||||
}.getOrDefault(-1)
|
||||
return if (stored >= 0) canonicalUpscaler(stored) else upscaler(context)
|
||||
}
|
||||
|
||||
fun setScreenEffectsUpscaler(context: Context, profileId: String?, mode: Int) {
|
||||
if (profileId.isNullOrBlank()) {
|
||||
setUpscaler(context, mode)
|
||||
return
|
||||
}
|
||||
val sessionPrefs = prefs(context)
|
||||
val profiles = runCatching {
|
||||
JSONObject(sessionPrefs.getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}")
|
||||
}.getOrDefault(JSONObject())
|
||||
val profile = profiles.optJSONObject(profileId)
|
||||
?: screenEffects(context, profileId).encode()
|
||||
profile.put(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY, canonicalUpscaler(mode))
|
||||
profiles.put(profileId, profile)
|
||||
sessionPrefs.edit().putString(SCREEN_EFFECTS_PROFILES_KEY, profiles.toString()).apply()
|
||||
}
|
||||
|
||||
|
||||
@@ -305,6 +305,7 @@ class DrawerActions(
|
||||
val onDirectHoldBehavior: (String) -> Unit = {},
|
||||
val onFexPreset: (String) -> Unit,
|
||||
val onUpscaler: (Int) -> Unit = {},
|
||||
val onPresetUpscaler: (Int) -> Unit = onUpscaler,
|
||||
val onUpscaleSharpness: (Int) -> Unit = {},
|
||||
val onEffects: (ScreenEffects) -> Unit = {},
|
||||
val onScreenEffectsTarget: (String) -> Unit = {},
|
||||
@@ -1097,7 +1098,7 @@ private fun ScreenEffectsGroup(
|
||||
if (preset == null) listOf(LOOK_CUSTOM to stringResource(R.string.drawer_look_custom)) + presets else presets,
|
||||
preset?.name ?: LOOK_CUSTOM, chipModifier = track("look")) { name ->
|
||||
ScreenEffectLooks.LOOKS.firstOrNull { it.name == name }?.let { picked ->
|
||||
picked.scalingMode?.let(a.onUpscaler)
|
||||
picked.scalingMode?.let(a.onPresetUpscaler)
|
||||
a.onEffects(picked.effects)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -767,7 +767,7 @@
|
||||
<string name="drawer_scaling_sharpness">Scaling sharpness</string>
|
||||
<string name="screen_effects_target">Edit profile</string>
|
||||
<string name="screen_effects_target_hint">Choose which profile to change screen effects for.</string>
|
||||
<string name="screen_effects_target_auto">Current game (automatic)</string>
|
||||
<string name="screen_effects_target_auto">Current session (automatic)</string>
|
||||
<string name="screen_effects_reset">Reset effects</string>
|
||||
<string name="screen_effects_reset_hint">Restore the default-off effect values for this profile.</string>
|
||||
<string name="screen_effects_delete">Delete saved override</string>
|
||||
|
||||
Reference in new issue
Block a user