Add per-game screen effects profiles

This commit is contained in:
EnzoDLofi committed 2026-11-13 22:17:28 -04:00
1 parent 39891f133f
commit 8b1bf6bcd1
5 files changed
+222 -36

No files matched your search

@@ -151,6 +151,9 @@ import com.droiddeck.launcher.ui.sessionDrawerPages
import com.droiddeck.launcher.ui.step
import kotlin.math.abs
private const val SCREEN_EFFECTS_TARGET_AUTO = "auto"
private const val SCREEN_EFFECTS_TARGET_GLOBAL = "global"
class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droiddeck.launcher.ui.AgentPetHost {
override fun attachBaseContext(newBase: android.content.Context) {
super.attachBaseContext(newBase)
@@ -504,6 +507,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
private var upscaleSharpness by mutableStateOf(75)
private var effects by mutableStateOf(ScreenEffects.OFF)
private var observedScreenEffectsProfileId by mutableStateOf<String?>(null)
private var screenEffectsTarget by mutableStateOf(SCREEN_EFFECTS_TARGET_AUTO)
private var cardboard by mutableStateOf(Cardboard.OFF)
private var headTracker: HeadTracker? = null
private var steamVrStatus by mutableStateOf<SteamVr.Status?>(null)
@@ -983,10 +987,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
defaultFocusHighlightEnabled = false
setContent {
val activeEffectsProfileId = currentScreenEffectsProfileId()
val effectsEditorProfileId = if (drawerOpen) activeEffectsProfileId else null
androidx.compose.runtime.LaunchedEffect(effectsEditorProfileId) {
if (effectsEditorProfileId != null) {
syncActiveScreenEffectsProfile()
val effectsEditorTarget = if (drawerOpen) screenEffectsTarget else null
val effectsEditorProfileId = activeEffectsProfileId.takeIf {
effectsEditorTarget == SCREEN_EFFECTS_TARGET_AUTO
}
androidx.compose.runtime.LaunchedEffect(effectsEditorTarget, effectsEditorProfileId) {
when (effectsEditorTarget) {
SCREEN_EFFECTS_TARGET_AUTO -> syncActiveScreenEffectsProfile()
null -> Unit
else -> syncScreenEffectsTarget(effectsEditorTarget)
}
}
val uiPointer = appUiOwnsPointer()
@@ -1230,7 +1239,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
onAndroidKeyboard = { pcKeyboardOpen = false; keyboard?.toggle() },
onClose = { pcKeyboardOpen = false },
)
if (!drawerDocked) SessionMenu(docked = false, effectsEditorProfileId = effectsEditorProfileId)
if (!drawerDocked) SessionMenu(
docked = false,
effectsEditorProfileId = effectsEditorProfileId,
effectsEditorTarget = effectsEditorTarget,
)
LaunchedEffect(achievementsOpen) {
if (achievementsOpen) {
releasePads()
@@ -1280,7 +1293,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
}
@androidx.compose.runtime.Composable
private fun SessionMenu(docked: Boolean, effectsEditorProfileId: String?) {
private fun SessionMenu(
docked: Boolean,
effectsEditorProfileId: String?,
effectsEditorTarget: String?,
) {
SessionDrawer(drawerOpen || (docked && drawerPinned), drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, docked = docked,
backRequest = drawerBackRequests, onLayerChange = { drawerLayerOpen = it }, a = DrawerActions(
steam = SessionState.mode == SessionService.MODE_STEAM,
@@ -1296,6 +1313,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
hudConfig = hudConfig,
upscaler = upscaler, upscaleSharpness = upscaleSharpness,
effects = effects,
screenEffectsTarget = screenEffectsTarget,
screenEffectsTargets = screenEffectsTargetOptions(),
screenEffectsCanDelete = screenEffectsProfileIdForTarget(screenEffectsTarget)?.let {
SessionPrefs.hasScreenEffectsOverride(this@SessionActivity, it)
} == true,
cardboard = cardboard,
cardboardSensor = hasRotationSensor,
onCardboard = { c -> SessionPrefs.setCardboard(this@SessionActivity, c); applyCardboard(c) },
@@ -1356,32 +1378,45 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
},
onEffects = { e ->
if (drawerOpen || (docked && drawerPinned)) {
val activeProfileId =
SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity)
if (activeProfileId != effectsEditorProfileId) {
Log.w(
TAG,
"Screen effects profile changed while editing; discarding stale edit",
)
val activeEffects =
SessionPrefs.screenEffects(this@SessionActivity, activeProfileId)
observedScreenEffectsProfileId = activeProfileId
effects = activeEffects
activeEffects.push(upscaler)
val editorTarget = effectsEditorTarget ?: screenEffectsTarget
if (editorTarget != screenEffectsTarget) {
syncScreenEffectsTarget(screenEffectsTarget)
} else if (editorTarget == SCREEN_EFFECTS_TARGET_AUTO) {
val activeProfileId =
SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity)
if (activeProfileId != effectsEditorProfileId) {
Log.w(TAG, "Screen effects profile changed while editing; discarding stale edit")
observedScreenEffectsProfileId = activeProfileId
val activeEffects = SessionPrefs.screenEffects(this@SessionActivity, activeProfileId)
effects = activeEffects
activeEffects.push(upscaler)
} else {
SessionPrefs.setScreenEffects(this@SessionActivity, activeProfileId, e)
observedScreenEffectsProfileId = activeProfileId
effects = e
e.push(upscaler)
}
} else {
SessionPrefs.setScreenEffects(
this@SessionActivity,
activeProfileId,
e,
)
observedScreenEffectsProfileId = activeProfileId
val profileId = screenEffectsProfileIdForTarget(editorTarget)
SessionPrefs.setScreenEffects(this@SessionActivity, profileId, e)
effects = e
e.push(upscaler)
if (screenEffectsTargetAppliesToLiveOutput(editorTarget)) e.push(upscaler)
}
}
},
onScreenEffectsTarget = ::selectScreenEffectsTarget,
onScreenEffectsReset = {
val target = effectsEditorTarget ?: screenEffectsTarget
if (target == screenEffectsTarget) resetScreenEffectsTarget(target)
},
onScreenEffectsDelete = {
val target = effectsEditorTarget ?: screenEffectsTarget
if (target == screenEffectsTarget) deleteScreenEffectsTarget(target)
},
onScreenEffectsProfilesRefresh = {
drawerGameInventoryRevision++
refreshDrawerGameProfile()
},
onTextureAnisotropy = { value ->
drawerGameProfileId?.let { appId ->
SessionPrefs.setGameTextureAnisotropy(this@SessionActivity, appId.toString(), value)
@@ -2006,8 +2041,73 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
private fun syncActiveScreenEffectsProfile() {
val profileId = SessionPrefs.activeScreenEffectsProfileId(this)
observedScreenEffectsProfileId = profileId
effects = SessionPrefs.screenEffects(this, profileId)
effects.push(upscaler)
val activeEffects = SessionPrefs.screenEffects(this, profileId)
if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) effects = activeEffects
activeEffects.push(upscaler)
}
private fun screenEffectsProfileIdForTarget(target: String): String? = when (target) {
SCREEN_EFFECTS_TARGET_AUTO -> currentScreenEffectsProfileId()
SCREEN_EFFECTS_TARGET_GLOBAL -> null
else -> target
}
private fun screenEffectsTargetOptions(): List<Pair<String, String>> {
val installed = drawerGameProfileRefresh.data?.profiles.orEmpty().associate { it.first.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()) }
}
}
currentScreenEffectsProfileId()?.takeIf { it.startsWith("game:") }
?.removePrefix("game:")?.toLongOrNull()?.let { ids.add(it.toString()) }
return buildList {
add(SCREEN_EFFECTS_TARGET_AUTO to getString(R.string.screen_effects_target_auto))
add(SCREEN_EFFECTS_TARGET_GLOBAL to getString(R.string.frame_gen_scope_global))
ids.sortedBy { installed[it]?.lowercase() ?: it }.forEach { id ->
add("game:$id" to (installed[id] ?: getString(R.string.game_env_profile, id)))
}
}
}
private fun screenEffectsTargetAppliesToLiveOutput(target: String): Boolean {
if (target == SCREEN_EFFECTS_TARGET_AUTO) return true
val selectedProfileId = screenEffectsProfileIdForTarget(target)
val activeProfileId = currentScreenEffectsProfileId()
if (selectedProfileId == activeProfileId) return true
return selectedProfileId == null &&
(activeProfileId == null || !SessionPrefs.hasScreenEffectsOverride(this, activeProfileId))
}
private fun syncScreenEffectsTarget(target: String) {
if (target == SCREEN_EFFECTS_TARGET_AUTO) {
syncActiveScreenEffectsProfile()
return
}
effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(target))
if (screenEffectsTargetAppliesToLiveOutput(target)) effects.push(upscaler)
}
private fun selectScreenEffectsTarget(target: String) {
if (target == screenEffectsTarget) return
screenEffectsTarget = target
syncScreenEffectsTarget(target)
}
private fun resetScreenEffectsTarget(target: String) {
if (target != screenEffectsTarget) return
SessionPrefs.resetScreenEffectsProfile(this, screenEffectsProfileIdForTarget(target))
syncScreenEffectsTarget(target)
}
private fun deleteScreenEffectsTarget(target: String) {
if (target != screenEffectsTarget) return
val profileId = screenEffectsProfileIdForTarget(target) ?: return
SessionPrefs.deleteScreenEffectsProfile(this, profileId)
syncScreenEffectsTarget(target)
}
private fun currentScreenEffectsProfileId(): String? {
@@ -2128,7 +2228,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
hudOpacity = SessionPrefs.hudOpacity(this)
upscaler = SessionPrefs.upscaler(this)
upscaleSharpness = SessionPrefs.upscaleSharpness(this)
effects = SessionPrefs.screenEffects(this, currentScreenEffectsProfileId())
effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget))
applyCardboard(SessionPrefs.cardboard(this))
if (SessionPrefs.cardboardSourceBeforeSteamVr(this) >= 0 && !steamVrSwitchedPicture) {
steamVrSwitchedPicture = true
@@ -3801,14 +3901,23 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
menu = {
DroidDeckTheme {
val activeEffectsProfileId = currentScreenEffectsProfileId()
val effectsEditorProfileId =
if (drawerOpen || drawerPinned) activeEffectsProfileId else null
androidx.compose.runtime.LaunchedEffect(effectsEditorProfileId) {
if (effectsEditorProfileId != null) {
syncActiveScreenEffectsProfile()
val effectsEditorTarget =
if (drawerOpen || drawerPinned) screenEffectsTarget else null
val effectsEditorProfileId = activeEffectsProfileId.takeIf {
effectsEditorTarget == SCREEN_EFFECTS_TARGET_AUTO
}
androidx.compose.runtime.LaunchedEffect(effectsEditorTarget, effectsEditorProfileId) {
when (effectsEditorTarget) {
SCREEN_EFFECTS_TARGET_AUTO -> syncActiveScreenEffectsProfile()
null -> Unit
else -> syncScreenEffectsTarget(effectsEditorTarget)
}
}
SessionMenu(docked = true, effectsEditorProfileId = effectsEditorProfileId)
SessionMenu(
docked = true,
effectsEditorProfileId = effectsEditorProfileId,
effectsEditorTarget = effectsEditorTarget,
)
}
},
onSwap = if (bottomSwapAvailable && com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null,
@@ -1489,6 +1489,39 @@ object SessionPrefs {
sessionPrefs.edit().putString(SCREEN_EFFECTS_PROFILES_KEY, profiles.toString()).apply()
}
fun screenEffectsProfileIds(context: Context): Set<String> {
val profiles = runCatching {
JSONObject(prefs(context).getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}")
}.getOrElse { JSONObject() }
return buildSet {
val keys = profiles.keys()
while (keys.hasNext()) add(keys.next())
}
}
fun hasScreenEffectsOverride(context: Context, profileId: String?): Boolean {
if (profileId.isNullOrBlank()) return prefs(context).contains("screenEffects")
return profileId in screenEffectsProfileIds(context)
}
fun resetScreenEffectsProfile(context: Context, profileId: String?) {
setScreenEffects(context, profileId, ScreenEffects.OFF)
}
fun deleteScreenEffectsProfile(context: Context, profileId: String?) {
if (profileId.isNullOrBlank()) return
val sessionPrefs = prefs(context)
val profiles = runCatching {
JSONObject(sessionPrefs.getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}")
}.getOrElse { JSONObject() }
if (!profiles.has(profileId)) return
profiles.remove(profileId)
sessionPrefs.edit().apply {
if (profiles.length() == 0) remove(SCREEN_EFFECTS_PROFILES_KEY)
else putString(SCREEN_EFFECTS_PROFILES_KEY, profiles.toString())
}.apply()
}
const val CARDBOARD_KEY = "cardboard"
fun cardboard(context: Context): Cardboard {
@@ -243,6 +243,9 @@ class DrawerActions(
val upscaler: Int = 0,
val upscaleSharpness: Int = 75,
val effects: ScreenEffects = ScreenEffects.OFF,
val screenEffectsTarget: String = "auto",
val screenEffectsTargets: List<Pair<String, String>> = emptyList(),
val screenEffectsCanDelete: Boolean = false,
val cardboard: Cardboard = Cardboard.OFF,
val cardboardSensor: Boolean = false,
val steamVr: SteamVr.Status? = null,
@@ -304,6 +307,10 @@ class DrawerActions(
val onUpscaler: (Int) -> Unit = {},
val onUpscaleSharpness: (Int) -> Unit = {},
val onEffects: (ScreenEffects) -> Unit = {},
val onScreenEffectsTarget: (String) -> Unit = {},
val onScreenEffectsReset: () -> Unit = {},
val onScreenEffectsDelete: () -> Unit = {},
val onScreenEffectsProfilesRefresh: () -> Unit = {},
val onCardboard: (Cardboard) -> Unit = {},
val onCardboardRecenter: () -> Unit = {},
val onGlassesRecenter: () -> Unit = {},
@@ -420,6 +427,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
}
}
}
LaunchedEffect(open, page) {
if (open && page == SessionDrawerPage.EFFECTS) a.onScreenEffectsProfilesRefresh()
}
LaunchedEffect(open, controllerActive) {
if (open && !controllerActive) focusManager.clearFocus(force = true)
}
@@ -1062,6 +1072,26 @@ private fun ScreenEffectsGroup(
val colors = MaterialTheme.colorScheme
val pal = LocalPalette.current
SettingsGroup(stringResource(R.string.drawer_effects)) {
ChoiceRow(
host, "effects-profile", stringResource(R.string.screen_effects_target),
stringResource(R.string.screen_effects_target_hint), a.screenEffectsTargets,
a.screenEffectsTarget, chipModifier = track("effects-profile"),
onPick = a.onScreenEffectsTarget,
)
ActionRow(
stringResource(R.string.screen_effects_reset),
stringResource(R.string.screen_effects_reset_hint),
stringResource(R.string.hud_reset_button),
a.onScreenEffectsReset,
modifier = track("effects-reset"),
)
if (a.screenEffectsCanDelete) ActionRow(
stringResource(R.string.screen_effects_delete),
stringResource(R.string.screen_effects_delete_hint),
stringResource(R.string.common_delete),
a.onScreenEffectsDelete,
modifier = track("effects-delete"),
)
val presets = ScreenEffectLooks.LOOKS.map { it.name to stringResource(it.label) }
ChoiceRow(host, "look", stringResource(R.string.drawer_look), null,
if (preset == null) listOf(LOOK_CUSTOM to stringResource(R.string.drawer_look_custom)) + presets else presets,
+7
View File
@@ -716,6 +716,13 @@
<string name="hud_reset_button">Redefinir</string>
<string name="drawer_scaling">Modo de escala</string>
<string name="drawer_scaling_sharpness">Nitidez da escala</string>
<string name="screen_effects_target">Perfil de efeitos</string>
<string name="screen_effects_target_hint">Escolha qual perfil terá os efeitos de tela editados.</string>
<string name="screen_effects_target_auto">Jogo atual (automático)</string>
<string name="screen_effects_reset">Redefinir efeitos</string>
<string name="screen_effects_reset_hint">Define os efeitos deste perfil como desativados por padrão.</string>
<string name="screen_effects_delete">Excluir configuração salva</string>
<string name="screen_effects_delete_hint">Remove os efeitos salvos deste jogo para ele herdar o perfil padrão.</string>
<string name="drawer_effects">Efeitos de tela</string>
<string name="drawer_effects_hint">Em tempo real. Custa um pouco de tempo de GPU enquanto algum efeito estiver ativado.</string>
<string name="drawer_look">Predefinições</string>
+7
View File
@@ -765,6 +765,13 @@
<string name="hud_reset_button">Reset</string>
<string name="drawer_scaling">Scaling mode</string>
<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_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>
<string name="screen_effects_delete_hint">Remove saved effects for this game so it inherits the Default profile.</string>
<string name="drawer_effects">Screen effects</string>
<string name="drawer_effects_hint">Live. Costs a little GPU time while any effect is on.</string>
<string name="drawer_look">Presets</string>