From da26822714fdeb7f4a1388a9e2090a1c06b9bcf1 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 21 Oct 2026 17:22:21 -0400 Subject: [PATCH] feat: SteamVR controller types, phone controls on glasses, flat games as VR panels (#1268) --- .github/workflows/build.yml | 2 + .../com/droiddeck/launcher/SessionActivity.kt | 57 ++++- .../droiddeck/launcher/input/VrControllers.kt | 58 +++++ .../launcher/session/SessionFiles.kt | 1 + .../com/droiddeck/launcher/ui/GlassesPanel.kt | 37 +++- .../launcher/ui/GlassesPhonePanel.kt | 85 ++++++++ .../droiddeck/launcher/ui/SessionOverlay.kt | 6 +- .../com/droiddeck/launcher/ui/SteamHome.kt | 5 +- app/src/main/res/values-ar/strings.xml | 9 + app/src/main/res/values-b+es+419/strings.xml | 9 + app/src/main/res/values-bg/strings.xml | 9 + app/src/main/res/values-cs/strings.xml | 9 + app/src/main/res/values-da/strings.xml | 9 + app/src/main/res/values-de/strings.xml | 9 + app/src/main/res/values-el/strings.xml | 9 + app/src/main/res/values-es/strings.xml | 9 + app/src/main/res/values-fi/strings.xml | 9 + app/src/main/res/values-fr/strings.xml | 9 + app/src/main/res/values-hi/strings.xml | 9 + app/src/main/res/values-hu/strings.xml | 9 + app/src/main/res/values-in/strings.xml | 9 + app/src/main/res/values-it/strings.xml | 9 + app/src/main/res/values-ja/strings.xml | 9 + app/src/main/res/values-ko/strings.xml | 9 + app/src/main/res/values-ms/strings.xml | 9 + app/src/main/res/values-nb/strings.xml | 9 + app/src/main/res/values-nl/strings.xml | 9 + app/src/main/res/values-pl/strings.xml | 9 + app/src/main/res/values-pt-rPT/strings.xml | 9 + app/src/main/res/values-pt/strings.xml | 9 + app/src/main/res/values-ro/strings.xml | 9 + app/src/main/res/values-ru/strings.xml | 9 + app/src/main/res/values-sv/strings.xml | 9 + app/src/main/res/values-th/strings.xml | 9 + app/src/main/res/values-tr/strings.xml | 9 + app/src/main/res/values-uk/strings.xml | 9 + app/src/main/res/values-vi/strings.xml | 9 + app/src/main/res/values-zh-rCN/strings.xml | 9 + app/src/main/res/values-zh-rHK/strings.xml | 9 + app/src/main/res/values-zh-rTW/strings.xml | 9 + app/src/main/res/values/strings.xml | 25 +++ .../launcher/input/VrControllersTest.kt | 13 ++ docs/cardboard-vr.md | 37 ++-- docs/development/cardboard-vr-learnings.md | 5 +- docs/quest.md | 8 +- .../overlay/usr/local/bin/droiddeck-agent | 18 ++ .../usr/local/bin/droiddeck-steamvr-flat | 13 ++ .../usr/local/bin/droiddeck-steamvr-game | 2 + .../overlay/usr/local/bin/steam-compatibility | 6 + tools/tests/test_droiddeck_agent.py | 12 ++ tools/vr/src/driver_droiddeck.cpp | 200 +++++++++++++----- tools/vr/src/pad_controller_config.h | 54 +++++ tools/vr/tests/test_optical_controller.cpp | 43 ++++ tools/vr/tests/test_pad_controller_config.cpp | 19 ++ 54 files changed, 908 insertions(+), 86 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/VrControllersTest.kt create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat create mode 100644 tools/vr/src/pad_controller_config.h create mode 100644 tools/vr/tests/test_pad_controller_config.cpp diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24c5af98ca..0dc1289e59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -489,6 +489,8 @@ jobs: /tmp/test-xr-tracking g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_xr_touch.cpp -o /tmp/test-xr-touch /tmp/test-xr-touch + g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_pad_controller_config.cpp -o /tmp/test-pad-controller-config + /tmp/test-pad-controller-config g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_vsync.cpp -o /tmp/test-xr-vsync /tmp/test-xr-vsync g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_frames.cpp -o /tmp/test-xr-frames diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 9488cf62fd..93f4c4c53b 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -29,6 +29,7 @@ import androidx.activity.ComponentActivity import androidx.activity.OnBackPressedCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -644,7 +645,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (hud.text.isNotEmpty() || hud.graph.size >= 2) HudText(hud.text, hud.graph, hudColor, hudOpacity) - if (glassesOutputActive && !loading.visible) com.droiddeck.launcher.ui.GlassesPlayingHint(glasses.model) + val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen + if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { androidx.compose.ui.viewinterop.AndroidView( factory = { com.droiddeck.launcher.ui.TrackingRecoveryView(it) }, @@ -652,14 +654,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { update = { it.update(trackingRecovery, !glassesOutputActive && glasses.usable && glasses.sbs) }, ) } - if (GlassesRendering.usesGlasses(glasses, glassesOutputActive, steamVrStatus == SteamVr.Status.RUNNING) && + if (!phonePanel && GlassesRendering.usesGlasses(glasses, glassesOutputActive, steamVrStatus == SteamVr.Status.RUNNING) && headTracking && !drawerOpen && !pcKeyboardOpen && !loading.visible) com.droiddeck.launcher.ui.GlassesRecenterButton( controllerSettings?.tint ?: android.graphics.Color.rgb(90, 160, 255), controllerSettings?.opacity ?: 100, onRecenterJoyCons = if (steamVrStatus == SteamVr.Status.RUNNING && glasses.usesSpatialControllers(glassesSettings) && glassesSettings.joyConTracking) joyConVr?.let { { it.recenter() } } else null, ) { headTracker?.recenter() } - if (glasses.present && !drawerOpen && !pcKeyboardOpen && !loading.visible) com.droiddeck.launcher.ui.GlassesCornerButton(glassesSlot, + if (!phonePanel && glasses.present && !drawerOpen && !pcKeyboardOpen && !loading.visible) com.droiddeck.launcher.ui.GlassesCornerButton(glassesSlot, controllerSettings?.tint ?: android.graphics.Color.rgb(90, 160, 255), controllerSettings?.opacity ?: 100) { drawerPage = com.droiddeck.launcher.ui.SessionDrawerPage.GLASSES drawerOpen = true @@ -1013,6 +1015,54 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, 90) } + @androidx.compose.runtime.Composable + private fun GlassesPhonePanel(glasses: com.droiddeck.launcher.glasses.GlassesState, vr: Boolean, headTracking: Boolean) { + val battery by androidx.compose.runtime.produceState(null) { + while (true) { + val b = registerReceiver(null, android.content.IntentFilter(android.content.Intent.ACTION_BATTERY_CHANGED)) + val level = b?.getIntExtra(android.os.BatteryManager.EXTRA_LEVEL, -1) ?: -1 + val scale = b?.getIntExtra(android.os.BatteryManager.EXTRA_SCALE, 100) ?: 100 + val tenths = b?.getIntExtra(android.os.BatteryManager.EXTRA_TEMPERATURE, -1) ?: -1 + value = if (level < 0) null else getString(R.string.glasses_phone_battery, level * 100 / scale.coerceAtLeast(1), tenths / 10) + kotlinx.coroutines.delay(30_000) + } + } + val pads = com.droiddeck.launcher.input.VrControllers.settings.collectAsState().value + com.droiddeck.launcher.ui.GlassesPhonePanel(glasses.model, battery, com.droiddeck.launcher.ui.GlassesPhoneActions( + onRecenter = if (headTracking) ({ headTracker?.recenter() }) else null, + onRecenterJoyCons = if (vr && glasses.usesSpatialControllers(glassesSettings) && glassesSettings.joyConTracking) + joyConVr?.let { { it.recenter() } } else null, + onSteamVrMenu = if (vr && SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null, + onSwitchSticks = if (vr && pads.emulate != com.droiddeck.launcher.input.VrControllers.Emulate.OFF) ({ switchVrSticks() }) else null, + controllers = getString(when (pads.emulate) { + com.droiddeck.launcher.input.VrControllers.Emulate.OFF -> R.string.vr_controllers_off + com.droiddeck.launcher.input.VrControllers.Emulate.INDEX -> R.string.vr_controllers_index + com.droiddeck.launcher.input.VrControllers.Emulate.TOUCH -> R.string.vr_controllers_touch + com.droiddeck.launcher.input.VrControllers.Emulate.VIVE -> R.string.vr_controllers_vive + }), + onNextControllers = if (vr) ({ + val all = com.droiddeck.launcher.input.VrControllers.Emulate.entries + com.droiddeck.launcher.input.VrControllers.setEmulate(this, all[(pads.emulate.ordinal + 1) % all.size]) + }) else null, + onKeyboard = { keyboard?.toggle() }, + onSessionMenu = { drawerOpen = true }, + onStopSteamVr = if (vr) ({ steamVrAction("stop") }) else null, + brightness = glasses.brightness, + brightnessMax = glasses.brightnessMax, + onBrightness = if (glasses.canControl && glasses.hardwareControls) Glasses::setBrightness else null, + )) + } + + /** The SteamVR driver switches pad sticks between hands and game on both stick clicks together. */ + private fun switchVrSticks() { + val chord = { down: Boolean -> padBridge?.applyTouch { state -> + state.press(com.droiddeck.launcher.input.PadState.L3, down) + state.press(com.droiddeck.launcher.input.PadState.R3, down) + } } + chord(true) + uiHandler.postDelayed({ chord(false) }, 120) + } + private fun triggerSteamQam() { drawerOpen = false padBridge?.triggerQam() @@ -1545,6 +1595,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } val runtimeDir = File(filesDir, ".wayland-rt").apply { mkdirs() } FileUtils.copyAsset(this, "wayland/keymap.xkb", File(runtimeDir, "keymap.xkb")) + com.droiddeck.launcher.input.VrControllers.publish(this) val turnip = TurnipDriver(this) com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "surface.driver-setup") diff --git a/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt b/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt new file mode 100644 index 0000000000..343d18bdd4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import java.io.File + +/** What SteamVR sees for the game pad. The driver reads the file once, when SteamVR starts. */ +object VrControllers { + enum class Emulate(val key: String) { OFF("off"), INDEX("index"), TOUCH("touch"), VIVE("vive") } + + data class Settings(val emulate: Emulate = Emulate.INDEX, val sticksMoveHands: Boolean = false) + + const val FILE = "droiddeck-vr-controllers" + private const val PREFS = "vr_controllers" + + private val _settings = MutableStateFlow(Settings()) + val settings: StateFlow = _settings.asStateFlow() + private var loaded = false + + fun load(context: Context): Settings { + if (!loaded) { + val p = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + _settings.value = Settings( + emulate = Emulate.entries.firstOrNull { it.key == p.getString("emulate", null) } ?: Emulate.INDEX, + sticksMoveHands = p.getBoolean("sticksMoveHands", false), + ) + loaded = true + } + return _settings.value + } + + fun setEmulate(context: Context, emulate: Emulate) = save(context, load(context).copy(emulate = emulate)) + fun setSticksMoveHands(context: Context, on: Boolean) = save(context, load(context).copy(sticksMoveHands = on)) + + private fun save(context: Context, settings: Settings) { + _settings.value = settings + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .putString("emulate", settings.emulate.key) + .putBoolean("sticksMoveHands", settings.sticksMoveHands) + .apply() + publish(context) + } + + fun encode(settings: Settings): String = + "emulate=${settings.emulate.key}\nsticks=${if (settings.sticksMoveHands) "hands" else "game"}\n" + + /** Writes into the session's runtime dir, which the guest sees as /run/droiddeck. */ + fun publish(context: Context) { + runCatching { + val dir = File(context.filesDir, ".wayland-rt").apply { mkdirs() } + val tmp = File(dir, "$FILE.tmp") + tmp.writeText(encode(load(context))) + tmp.renameTo(File(dir, FILE)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index d471f776e6..6158713f81 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -85,6 +85,7 @@ object SessionFiles { "usr/local/bin/droiddeck-pipewire" to "usr/local/bin/droiddeck-pipewire", "usr/local/bin/droiddeck-steamvr-settings" to "usr/local/bin/droiddeck-steamvr-settings", "usr/local/bin/droiddeck-steamvr-game" to "usr/local/bin/droiddeck-steamvr-game", + "usr/local/bin/droiddeck-steamvr-flat" to "usr/local/bin/droiddeck-steamvr-flat", "usr/local/bin/droiddeck-bwrap" to "usr/local/bin/droiddeck-bwrap", "usr/local/bin/droiddeck-flatpak" to "usr/local/bin/droiddeck-flatpak", "usr/local/bin/droiddeck-flatpak-setup" to "usr/local/bin/droiddeck-flatpak-setup", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt index 0d06087307..50ce39b29a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt @@ -79,6 +79,33 @@ internal object GlassesTab { const val VR = "vr" const val HARDWARE = "hardware" const val TRACKING = "tracking" + const val CONTROLLERS = "controllers" +} + +@Composable +internal fun VrControllerGroups(host: MenuHost, track: (String) -> Modifier = { Modifier }) { + val context = androidx.compose.ui.platform.LocalContext.current + androidx.compose.runtime.LaunchedEffect(Unit) { com.droiddeck.launcher.input.VrControllers.load(context) } + val c by com.droiddeck.launcher.input.VrControllers.settings.collectAsState() + val emulate = com.droiddeck.launcher.input.VrControllers.Emulate.entries + SettingsGroup(stringResource(R.string.vr_controllers_group)) { + ChoiceRow(host, "vr-emulate", stringResource(R.string.vr_controllers_emulate), stringResource(R.string.vr_controllers_emulate_hint), + emulate.map { it to stringResource(when (it) { + com.droiddeck.launcher.input.VrControllers.Emulate.OFF -> R.string.vr_controllers_off + com.droiddeck.launcher.input.VrControllers.Emulate.INDEX -> R.string.vr_controllers_index + com.droiddeck.launcher.input.VrControllers.Emulate.TOUCH -> R.string.vr_controllers_touch + com.droiddeck.launcher.input.VrControllers.Emulate.VIVE -> R.string.vr_controllers_vive + }) }, c.emulate, chipModifier = track("vr-emulate")) { com.droiddeck.launcher.input.VrControllers.setEmulate(context, it) } + if (c.emulate != com.droiddeck.launcher.input.VrControllers.Emulate.OFF) ChoiceRow(host, "vr-sticks", + stringResource(R.string.vr_controllers_sticks), stringResource(R.string.vr_controllers_sticks_hint), + listOf(false to stringResource(R.string.vr_controllers_sticks_game), true to stringResource(R.string.vr_controllers_sticks_hands)), + c.sticksMoveHands, chipModifier = track("vr-sticks")) { com.droiddeck.launcher.input.VrControllers.setSticksMoveHands(context, it) } + SettingsRow(stringResource(R.string.vr_controllers_buttons), stringResource(when (c.emulate) { + com.droiddeck.launcher.input.VrControllers.Emulate.OFF -> R.string.vr_controllers_buttons_off + com.droiddeck.launcher.input.VrControllers.Emulate.VIVE -> R.string.vr_controllers_buttons_vive + else -> R.string.vr_controllers_buttons_stick + }), hintLines = 6) {} + } } @Composable @@ -362,13 +389,3 @@ private fun GlassesRecenterAction(label: String, tag: String, tint: Int, opacity } } -@Composable -internal fun GlassesPlayingHint(model: String) { - Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - Icon(GlassesIcon, null, tint = Color.White.copy(alpha = 0.35f), modifier = Modifier.size(56.dp)) - Spacer(Modifier.height(10.dp)) - Text(stringResource(R.string.glasses_playing, model), color = Color.White.copy(alpha = 0.45f), fontSize = 15.sp) - } - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt new file mode 100644 index 0000000000..625c30efb8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.displayCutout +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +/** Actions for the phone while the picture is on the glasses. Null hides the button. */ +internal class GlassesPhoneActions( + val onRecenter: (() -> Unit)?, + val onRecenterJoyCons: (() -> Unit)?, + val onSteamVrMenu: (() -> Unit)?, + val onSwitchSticks: (() -> Unit)?, + val controllers: String?, + val onNextControllers: (() -> Unit)?, + val onKeyboard: () -> Unit, + val onSessionMenu: () -> Unit, + val onStopSteamVr: (() -> Unit)?, + val brightness: Int, + val brightnessMax: Int, + val onBrightness: ((Int) -> Unit)?, +) + +@OptIn(ExperimentalLayoutApi::class) +@Composable +internal fun GlassesPhonePanel(model: String, status: String?, a: GlassesPhoneActions) { + Box(Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.displayCutout).padding(16.dp), contentAlignment = Alignment.Center) { + Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.widthIn(max = 640.dp)) { + Icon(GlassesIcon, null, tint = Color.White.copy(alpha = 0.35f), modifier = Modifier.size(40.dp)) + Spacer(Modifier.height(6.dp)) + Text(stringResource(R.string.glasses_playing, model), color = Color.White.copy(alpha = 0.6f), fontSize = 15.sp) + if (status != null) Text(status, color = Color.White.copy(alpha = 0.4f), fontSize = 13.sp, textAlign = TextAlign.Center) + Spacer(Modifier.height(16.dp)) + FlowRow(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterHorizontally), + verticalArrangement = Arrangement.spacedBy(10.dp)) { + a.onRecenter?.let { PanelButton(stringResource(R.string.glasses_phone_recenter), "phone-recenter", it) } + a.onRecenterJoyCons?.let { PanelButton(stringResource(R.string.glasses_recenter_joycons_button), "phone-recenter-joycons", it) } + a.onSteamVrMenu?.let { PanelButton(stringResource(R.string.glasses_phone_steamvr_menu), "phone-steamvr-menu", it) } + a.onNextControllers?.let { next -> a.controllers?.let { + PanelButton(stringResource(R.string.glasses_phone_controllers, it), "phone-controllers", next) } } + a.onSwitchSticks?.let { PanelButton(stringResource(R.string.glasses_phone_switch_sticks), "phone-switch-sticks", it) } + PanelButton(stringResource(R.string.glasses_phone_keyboard), "phone-keyboard", a.onKeyboard) + PanelButton(stringResource(R.string.glasses_phone_session_menu), "phone-session-menu", a.onSessionMenu) + a.onStopSteamVr?.let { PanelButton(stringResource(R.string.glasses_phone_stop_steamvr), "phone-stop-steamvr", it) } + } + val setBrightness = a.onBrightness + if (setBrightness != null && a.brightnessMax > 0) { + Spacer(Modifier.height(14.dp)) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + PanelButton("−", "phone-brightness-down") { setBrightness((a.brightness - 1).coerceAtLeast(0)) } + Text(stringResource(R.string.glasses_phone_brightness, a.brightness.coerceAtLeast(0), a.brightnessMax), + color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + PanelButton("+", "phone-brightness-up") { setBrightness((a.brightness + 1).coerceAtMost(a.brightnessMax)) } + } + } + } + } +} + +@Composable +private fun PanelButton(label: String, tag: String, onClick: () -> Unit) = + SecondaryButton(label, compact = true, modifier = Modifier.testTag(tag), onClick = onClick) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 82425814c2..5af4381e86 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -318,7 +318,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val pal = LocalPalette.current val host = rememberMenuHost() val (glasses, glassesSettings) = rememberGlasses() - val glassesPages = glassesTabs(glasses) + val glassesPages = glassesTabs(glasses) + (GlassesTab.CONTROLLERS to stringResource(R.string.vr_controllers_tab)) var selectedGlassesTab by rememberSaveable { mutableStateOf(GlassesTab.DISPLAY) } val glassesTab = selectedGlassesTab.takeIf { key -> glassesPages.any { it.first == key } } ?: GlassesTab.DISPLAY var androidAppsExpanded by rememberSaveable { mutableStateOf(false) } @@ -591,7 +591,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SessionDrawerPage.SECOND_SCREEN -> { SecondScreenGroup(host, a) { key -> focus.track(page, key) } } - SessionDrawerPage.GLASSES -> { + SessionDrawerPage.GLASSES -> if (glassesTab == GlassesTab.CONTROLLERS) { + VrControllerGroups(host) { key -> focus.track(page, key) } + } else { GlassesGroups(host, glasses, glassesSettings, { key -> focus.track(page, key) }, onRecenter = a.onGlassesRecenter, tab = glassesTab, outputActive = a.glassesOutput, steamVrRunning = a.steamVr == SteamVr.Status.RUNNING, steamVr = { SteamVrRow(a) }) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 5dafd24280..dfb6d2525d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -115,13 +115,14 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) drop = drop.takeIf { headset }, overlay = { lifted -> if (headset) DropSheet( - drop, glassesTabs(glasses), covered = lifted, + drop, glassesTabs(glasses) + (GlassesTab.CONTROLLERS to stringResource(R.string.vr_controllers_tab)), covered = lifted, button = { enabled -> PrimaryButton(stringResource(R.string.games_play_steamvr), enabled = !s.busy && glasses.usable, large = true, icon = Icons.Filled.PlayArrow, fill = true, modifier = Modifier.fillMaxWidth().testTag("play-steamvr")) { if (enabled) { drop.open = false; a.onPlaySteamVr() } } }, ) { tab -> - GlassesGroups(rememberMenuHost(), glasses, glassesSettings, + if (tab == GlassesTab.CONTROLLERS) VrControllerGroups(rememberMenuHost()) + else GlassesGroups(rememberMenuHost(), glasses, glassesSettings, onRecenter = GlassesMenuMirror::recenter, inSession = false, tab = tab) } }, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index df1ed3e76b..ab19b8be3e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2530,6 +2530,15 @@ مجال رؤية SteamVR القيمة الأقل تقرّب SteamVR وتملأ النظارة؛ والأعلى تُظهر المزيد مما حولك. جارٍ اللعب على %1$s + إعادة التوسيط + قائمة SteamVR + العصي: اليدان ⇄ اللعبة + وحدات التحكم: %1$s + لوحة المفاتيح + قائمة الجلسة + إيقاف SteamVR + السطوع %1$d / %2$d + البطارية %1$d%% · %2$d °C معايرة التتبّع يقلّل الانجراف ويضبط المرجع الأفقي. تُطبَّق المعايرة المحفوظة على هذه النظارة. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 8c6856fc68..d8b12c4653 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2468,6 +2468,15 @@ Campo de visión de SteamVR Más bajo acerca SteamVR y llena las gafas; más alto muestra más a tu alrededor. Jugando en %1$s + Recentrar + Menú de SteamVR + Sticks: manos ⇄ juego + Controles: %1$s + Teclado + Menú de sesión + Detener SteamVR + Brillo %1$d / %2$d + Batería %1$d%% · %2$d °C Calibración del seguimiento Reduce la deriva y alinea la referencia horizontal. Estas gafas usan la calibración guardada. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9d8a813846..ac4bfb1034 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2430,6 +2430,15 @@ Зрително поле на SteamVR По-ниско приближава SteamVR и запълва очилата; по-високо показва повече около вас. Играете на %1$s + Центриране отново + Меню на SteamVR + Стикове: ръце ⇄ игра + Контролери: %1$s + Клавиатура + Меню на сесията + Спиране на SteamVR + Яркост %1$d / %2$d + Батерия %1$d%% · %2$d °C Калибриране на проследяването Намалява дрейфа и подравнява хоризонта. За тези очила се прилага запазено калибриране. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 87e03f749c..adc83ae753 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2480,6 +2480,15 @@ Zorné pole SteamVR Nižší hodnota přiblíží SteamVR a vyplní brýle; vyšší ukáže víc z okolí. Hraje se na %1$s + Znovu vycentrovat + Nabídka SteamVR + Páčky: ruce ⇄ hra + Ovladače: %1$s + Klávesnice + Nabídka relace + Zastavit SteamVR + Jas %1$d / %2$d + Baterie %1$d%% · %2$d °C Kalibrace sledování Sníží drift a vyrovná vodorovnou referenci. Pro tyto brýle se používá uložená kalibrace. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a5da9e3ef0..79d25b5faa 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2430,6 +2430,15 @@ SteamVR-synsfelt Lavere bringer SteamVR tættere på og fylder brillen; højere viser mere omkring dig. Spiller på %1$s + Centrér igen + SteamVR-menu + Pinde: hænder ⇄ spil + Controllere: %1$s + Tastatur + Sessionsmenu + Stop SteamVR + Lysstyrke %1$d / %2$d + Batteri %1$d%% · %2$d °C Sporingskalibrering Mindsker drift og justerer den vandrette reference. Gemt kalibrering anvendes på denne brille. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a477da4760..8ea85cf579 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2416,6 +2416,15 @@ SteamVR-Sichtfeld Niedriger holt SteamVR näher heran und füllt die Brille; höher zeigt mehr von deiner Umgebung. Spiel läuft auf %1$s + Neu zentrieren + SteamVR-Menü + Sticks: Hände ⇄ Spiel + Controller: %1$s + Tastatur + Sitzungsmenü + SteamVR beenden + Helligkeit %1$d / %2$d + Akku %1$d%% · %2$d °C Tracking-Kalibrierung Verringert Drift und richtet die waagerechte Referenz aus. Für diese Brille wird eine gespeicherte Kalibrierung verwendet. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 49fbc0dae2..e4674d8f23 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2430,6 +2430,15 @@ Οπτικό πεδίο SteamVR Χαμηλότερο: το SteamVR έρχεται πιο κοντά και γεμίζει τα γυαλιά· υψηλότερο: βλέπετε περισσότερα γύρω σας. Παίζετε στα %1$s + Επανακεντράρισμα + Μενού SteamVR + Μοχλοί: χέρια ⇄ παιχνίδι + Χειριστήρια: %1$s + Πληκτρολόγιο + Μενού συνεδρίας + Διακοπή SteamVR + Φωτεινότητα %1$d / %2$d + Μπαταρία %1$d%% · %2$d °C Βαθμονόμηση παρακολούθησης Μειώνει την ολίσθηση και ευθυγραμμίζει την οριζόντια αναφορά. Σε αυτά τα γυαλιά εφαρμόζεται αποθηκευμένη βαθμονόμηση. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f4b00b45a6..f6494af6d8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2438,6 +2438,15 @@ Campo de visión de SteamVR Más bajo acerca SteamVR y llena las gafas; más alto muestra más a tu alrededor. Jugando en %1$s + Recentrar + Menú de SteamVR + Sticks: manos ⇄ juego + Mandos: %1$s + Teclado + Menú de sesión + Detener SteamVR + Brillo %1$d / %2$d + Batería %1$d%% · %2$d °C Calibración del seguimiento Reduce la deriva y alinea la referencia horizontal. Estas gafas usan la calibración guardada. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index bd93642848..2c49eb23e0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2430,6 +2430,15 @@ SteamVR:n näkökenttä Pienempi tuo SteamVR:n lähemmäs ja täyttää lasit; suurempi näyttää enemmän ympäriltäsi. Pelataan laitteella %1$s + Keskitä uudelleen + SteamVR-valikko + Sauvat: kädet ⇄ peli + Ohjaimet: %1$s + Näppäimistö + Istuntovalikko + Pysäytä SteamVR + Kirkkaus %1$d / %2$d + Akku %1$d%% · %2$d °C Seurannan kalibrointi Vähentää ryömintää ja kohdistaa vaakatason. Tallennettu kalibrointi on käytössä näissä laseissa. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 42856242d1..23084bf78d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2449,6 +2449,15 @@ Champ de vision SteamVR Plus bas rapproche SteamVR et remplit les lunettes ; plus haut montre davantage autour de vous. En jeu sur %1$s + Recentrer + Menu SteamVR + Sticks : mains ⇄ jeu + Manettes : %1$s + Clavier + Menu de session + Arrêter SteamVR + Luminosité %1$d / %2$d + Batterie %1$d%% · %2$d °C Calibrage du suivi Réduit la dérive et aligne la référence horizontale. Le calibrage enregistré est appliqué à ces lunettes. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 38e9854439..9557c02f84 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2430,6 +2430,15 @@ SteamVR फ़ील्ड ऑफ़ व्यू कम करने पर SteamVR पास आता है और चश्मा भर देता है; ज़्यादा करने पर आपके आस-पास ज़्यादा दिखता है। %1$s पर खेल रहे हैं + फिर से केंद्रित करें + SteamVR मेनू + स्टिक: हाथ ⇄ गेम + कंट्रोलर: %1$s + कीबोर्ड + सत्र मेनू + SteamVR रोकें + चमक %1$d / %2$d + बैटरी %1$d%% · %2$d °C ट्रैकिंग कैलिब्रेशन ड्रिफ़्ट कम करता है और क्षैतिज संदर्भ को सीध में लाता है। इस चश्मे पर सेव किया गया कैलिब्रेशन लागू है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5c49ae3b46..add9dfdddf 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2430,6 +2430,15 @@ SteamVR látómező Kisebb érték közelebb hozza a SteamVR-t és kitölti a szemüveget; nagyobb többet mutat a környezetéből. Játék ezen: %1$s + Középre igazítás + SteamVR menü + Karok: kezek ⇄ játék + Kontrollerek: %1$s + Billentyűzet + Munkamenet menü + SteamVR leállítása + Fényerő %1$d / %2$d + Akkumulátor %1$d%% · %2$d °C Követés kalibrálása Csökkenti a sodródást, és beállítja a vízszintes referenciát. A szemüveg a mentett kalibrációt használja. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 46ee60053d..cceb3c540c 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2405,6 +2405,15 @@ Bidang pandang SteamVR Lebih rendah membawa SteamVR lebih dekat dan memenuhi kacamata; lebih tinggi menampilkan lebih banyak di sekitar Anda. Bermain di %1$s + Pusatkan ulang + Menu SteamVR + Stik: tangan ⇄ game + Kontroler: %1$s + Keyboard + Menu sesi + Hentikan SteamVR + Kecerahan %1$d / %2$d + Baterai %1$d%% · %2$d °C Kalibrasi pelacakan Mengurangi drift dan menyelaraskan acuan horizontal. Kalibrasi tersimpan diterapkan ke kacamata ini. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c29d4964d6..b98751afe4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2441,6 +2441,15 @@ Campo visivo di SteamVR Più basso avvicina SteamVR e riempie gli occhiali; più alto mostra di più intorno a te. Gioco in corso su %1$s + Ricentra + Menu di SteamVR + Levette: mani ⇄ gioco + Controller: %1$s + Tastiera + Menu della sessione + Arresta SteamVR + Luminosità %1$d / %2$d + Batteria %1$d%% · %2$d °C Calibrazione del tracciamento Riduce la deriva e allinea il riferimento orizzontale. La calibrazione salvata è applicata a questi occhiali. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7f77f84b42..0adf7aa359 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2405,6 +2405,15 @@ SteamVR の視野角 小さくすると SteamVR が近くなりグラスいっぱいに広がり、大きくすると周囲が広く見えます。 %1$s でプレイ中 + 中心をリセット + SteamVR メニュー + スティック: 手 ⇄ ゲーム + コントローラー: %1$s + キーボード + セッションメニュー + SteamVR を停止 + 明るさ %1$d / %2$d + バッテリー %1$d%% · %2$d °C トラッキングのキャリブレーション ドリフトを減らし、水平の基準を合わせます。 保存したキャリブレーションをこのグラスに適用しています。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1df2c7fa1a..f024bd09de 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2405,6 +2405,15 @@ SteamVR 시야각 낮추면 SteamVR이 가까워져 안경을 가득 채우고, 높이면 주변이 더 넓게 보입니다. %1$s에서 플레이 중 + 중앙 재설정 + SteamVR 메뉴 + 스틱: 손 ⇄ 게임 + 컨트롤러: %1$s + 키보드 + 세션 메뉴 + SteamVR 중지 + 밝기 %1$d / %2$d + 배터리 %1$d%% · %2$d °C 트래킹 보정 드리프트를 줄이고 수평 기준을 맞춥니다. 저장된 보정이 이 안경에 적용되어 있습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 9423492810..f5514e9877 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2405,6 +2405,15 @@ Medan pandangan SteamVR Lebih rendah mendekatkan SteamVR dan memenuhi cermin mata; lebih tinggi menunjukkan lebih banyak di sekeliling anda. Bermain pada %1$s + Pusatkan semula + Menu SteamVR + Kayu bedik: tangan ⇄ permainan + Pengawal: %1$s + Papan kekunci + Menu sesi + Hentikan SteamVR + Kecerahan %1$d / %2$d + Bateri %1$d%% · %2$d °C Penentukuran penjejakan Mengurangkan hanyutan dan menjajarkan rujukan mendatar. Penentukuran yang disimpan digunakan pada cermin mata ini. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 1ae9854564..53c5aa2f53 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2430,6 +2430,15 @@ SteamVR-synsfelt Lavere bringer SteamVR nærmere og fyller brillene; høyere viser mer rundt deg. Spiller på %1$s + Sentrer på nytt + SteamVR-meny + Spaker: hender ⇄ spill + Kontrollere: %1$s + Tastatur + Øktmeny + Stopp SteamVR + Lysstyrke %1$d / %2$d + Batteri %1$d%% · %2$d °C Sporingskalibrering Reduserer avdrift og retter inn horisontreferansen. Lagret kalibrering brukes for disse brillene. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a31b6227c4..e994c2b87e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2430,6 +2430,15 @@ SteamVR-gezichtsveld Lager brengt SteamVR dichterbij en vult de bril; hoger toont meer om je heen. Je speelt op %1$s + Opnieuw centreren + SteamVR-menu + Sticks: handen ⇄ spel + Controllers: %1$s + Toetsenbord + Sessiemenu + SteamVR stoppen + Helderheid %1$d / %2$d + Batterij %1$d%% · %2$d °C Trackingkalibratie Vermindert drift en lijnt de horizontale referentie uit. De opgeslagen kalibratie wordt op deze bril toegepast. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4c5d60c66a..5f08cd038a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2480,6 +2480,15 @@ Pole widzenia SteamVR Mniejsze przybliża SteamVR i wypełnia okulary; większe pokazuje więcej dookoła. Grasz na: %1$s + Wyśrodkuj ponownie + Menu SteamVR + Gałki: dłonie ⇄ gra + Kontrolery: %1$s + Klawiatura + Menu sesji + Zatrzymaj SteamVR + Jasność %1$d / %2$d + Bateria %1$d%% · %2$d °C Kalibracja śledzenia Ogranicza dryf i wyrównuje poziom odniesienia. Dla tych okularów używana jest zapisana kalibracja. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2e1f6425ff..9928b1691b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2441,6 +2441,15 @@ Campo de visão do SteamVR Mais baixo aproxima o SteamVR e preenche os óculos; mais alto mostra mais à sua volta. A jogar em %1$s + Recentrar + Menu do SteamVR + Manípulos: mãos ⇄ jogo + Comandos: %1$s + Teclado + Menu da sessão + Parar o SteamVR + Brilho %1$d / %2$d + Bateria %1$d%% · %2$d °C Calibração do seguimento Reduz a deriva e alinha a referência de nível. A calibração guardada é aplicada a estes óculos. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 73d6239a3f..a11ab80e23 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2441,6 +2441,15 @@ Campo de visão do SteamVR Menor aproxima o SteamVR e preenche os óculos; maior mostra mais ao seu redor. Jogando em %1$s + Recentralizar + Menu do SteamVR + Analógicos: mãos ⇄ jogo + Controles: %1$s + Teclado + Menu da sessão + Parar o SteamVR + Brilho %1$d / %2$d + Bateria %1$d%% · %2$d °C Calibração do rastreamento Reduz a deriva e alinha a referência de nível. A calibração salva é aplicada a estes óculos. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index e02c7b2490..8a9f494875 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2455,6 +2455,15 @@ Câmp vizual SteamVR Mai mic aduce SteamVR mai aproape și umple ochelarii; mai mare arată mai mult din jurul tău. Se joacă pe %1$s + Recentrează + Meniu SteamVR + Stickuri: mâini ⇄ joc + Controlere: %1$s + Tastatură + Meniul sesiunii + Oprește SteamVR + Luminozitate %1$d / %2$d + Baterie %1$d%% · %2$d °C Calibrarea urmăririi Reduce deriva și aliniază referința de nivel. Calibrarea salvată se aplică acestor ochelari. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 71da72cf7a..d4059d29d3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2474,6 +2474,15 @@ Поле зрения SteamVR Меньше — SteamVR ближе и заполняет очки; больше — шире обзор вокруг. Игра на %1$s + Перецентрировать + Меню SteamVR + Стики: руки ⇄ игра + Контроллеры: %1$s + Клавиатура + Меню сеанса + Остановить SteamVR + Яркость %1$d / %2$d + Батарея %1$d%% · %2$d °C Калибровка отслеживания Уменьшает дрейф и выравнивает опорный горизонт. Для этих очков применяется сохранённая калибровка. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0f84b8f48a..6dcd74542b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2430,6 +2430,15 @@ SteamVR-synfält Lägre för SteamVR närmare och fyller glasögonen; högre visar mer runt dig. Spelar på %1$s + Centrera om + SteamVR-meny + Spakar: händer ⇄ spel + Handkontroller: %1$s + Tangentbord + Sessionsmeny + Stoppa SteamVR + Ljusstyrka %1$d / %2$d + Batteri %1$d%% · %2$d °C Spårningskalibrering Minskar drift och justerar horisontreferensen. Sparad kalibrering används för de här glasögonen. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 7dceea5bfb..6415ac1d5b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2405,6 +2405,15 @@ ขอบเขตการมองเห็นของ SteamVR ค่าต่ำจะดึง SteamVR เข้ามาใกล้และเต็มแว่นตา ค่าสูงจะแสดงสิ่งรอบตัวคุณได้มากขึ้น กำลังเล่นบน %1$s + จัดกึ่งกลางใหม่ + เมนู SteamVR + สติ๊ก: มือ ⇄ เกม + คอนโทรลเลอร์: %1$s + แป้นพิมพ์ + เมนูเซสชัน + หยุด SteamVR + ความสว่าง %1$d / %2$d + แบตเตอรี่ %1$d%% · %2$d °C การปรับเทียบการติดตาม ลดการดริฟต์และปรับแนวระดับอ้างอิงให้ตรง ใช้การปรับเทียบที่บันทึกไว้กับแว่นตานี้แล้ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ba7d16b0d5..f32e89a652 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2416,6 +2416,15 @@ SteamVR görüş alanı Düşük değer SteamVR\'ı yaklaştırır ve gözlüğü doldurur; yüksek değer çevrenizi daha çok gösterir. %1$s ile oynanıyor + Yeniden ortala + SteamVR menüsü + Çubuklar: eller ⇄ oyun + Kumandalar: %1$s + Klavye + Oturum menüsü + SteamVR’ı durdur + Parlaklık %1$d / %2$d + Pil %1$d%% · %2$d °C Takip kalibrasyonu Kaymayı azaltır ve yatay düzlem referansını hizalar. Kayıtlı kalibrasyon bu gözlüğe uygulanır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a3938e2901..01e625f54d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2480,6 +2480,15 @@ Поле зору SteamVR Нижче значення наближає SteamVR і заповнює окуляри; вище — показує більше навколо вас. Гра на %1$s + Перецентрувати + Меню SteamVR + Стіки: руки ⇄ гра + Контролери: %1$s + Клавіатура + Меню сеансу + Зупинити SteamVR + Яскравість %1$d / %2$d + Акумулятор %1$d%% · %2$d °C Калібрування відстеження Зменшує дрейф і вирівнює опорний горизонт. До цих окулярів застосовано збережене калібрування. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a8e738e09d..407b2bf634 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2405,6 +2405,15 @@ Trường nhìn của SteamVR Thấp hơn sẽ đưa SteamVR lại gần và lấp đầy kính; cao hơn cho thấy nhiều hơn xung quanh bạn. Đang chơi trên %1$s + Căn giữa lại + Menu SteamVR + Cần: tay ⇄ trò chơi + Tay cầm: %1$s + Bàn phím + Menu phiên + Dừng SteamVR + Độ sáng %1$d / %2$d + Pin %1$d%% · %2$d °C Hiệu chỉnh theo dõi Giảm hiện tượng trôi và căn lại mốc thăng bằng. Hiệu chỉnh đã lưu đang được áp dụng cho kính này. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ebad970f53..814f12e9cd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2405,6 +2405,15 @@ SteamVR 视场角 调低让 SteamVR 更近并填满眼镜;调高可看到更多周围内容。 正在 %1$s 上游玩 + 重新居中 + SteamVR 菜单 + 摇杆:双手 ⇄ 游戏 + 控制器:%1$s + 键盘 + 会话菜单 + 停止 SteamVR + 亮度 %1$d / %2$d + 电池 %1$d%% · %2$d °C 追踪校准 减少漂移并对齐水平基准。 这副眼镜已应用保存的校准。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b512870a5e..1ef76a2938 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2405,6 +2405,15 @@ SteamVR 視場角 調低令 SteamVR 更近並填滿眼鏡;調高可看到更多周圍內容。 正在 %1$s 上遊玩 + 重新置中 + SteamVR 選單 + 搖桿:雙手 ⇄ 遊戲 + 控制器:%1$s + 鍵盤 + 工作階段選單 + 停止 SteamVR + 亮度 %1$d / %2$d + 電池 %1$d%% · %2$d °C 追蹤校準 減少漂移並對齊水平基準。 這副眼鏡已套用儲存的校準。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 26b6d88219..70c0814fdf 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2405,6 +2405,15 @@ SteamVR 視野角度 調低讓 SteamVR 更近並填滿眼鏡;調高可看到更多周圍內容。 正在 %1$s 上遊玩 + 重新置中 + SteamVR 選單 + 搖桿:雙手 ⇄ 遊戲 + 控制器:%1$s + 鍵盤 + 工作階段選單 + 停止 SteamVR + 亮度 %1$d / %2$d + 電池 %1$d%% · %2$d °C 追蹤校正 減少漂移並對齊水平基準。 這副眼鏡已套用儲存的校正資料。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8f5d77f4e..bec96f5c70 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2515,6 +2515,22 @@ Automatic keeps this 2D game fixed in view. Choose Virtual screen in Display to use head tracking. Head tracking applies to a virtual screen or a running SteamVR game. Device + Controllers + SteamVR controllers + Game pad in VR + The two VR hands your controller plays as. Changes apply right away, also while SteamVR runs. Joy-Cons and tracked hands still take over their side. + Regular game pad + Valve Index controllers + Meta Quest 3 controllers + HTC Vive wands + Sticks start by + Press both sticks in together during VR to switch. + Moving you in the game + Moving the hands + Buttons + Triggers are triggers, bumpers grip, A/B and X/Y are each hand\'s face buttons, stick clicks click the thumbsticks, Guide opens the SteamVR menu. D-pad up and down move the hands closer or farther. + The sticks are trackpads; A/X or a stick click presses them. Triggers are triggers, bumpers grip, Start and Select are menu, Guide opens the SteamVR menu. + No VR hands. Games that support a game pad, and the SteamVR menu, get your controller as usual. Brightness Volume Sunblock @@ -2532,6 +2548,15 @@ SteamVR field of view Lower brings SteamVR closer and fills the glasses; higher shows more around you. Playing on %1$s + Recenter + SteamVR menu + Sticks: hands ⇄ game + Controllers: %1$s + Keyboard + Session menu + Stop SteamVR + Brightness %1$d / %2$d + Battery %1$d%% · %2$d °C Tracking calibration Reduce drift and align the level reference. Saved calibration is applied to these glasses. diff --git a/app/src/test/java/com/droiddeck/launcher/input/VrControllersTest.kt b/app/src/test/java/com/droiddeck/launcher/input/VrControllersTest.kt new file mode 100644 index 0000000000..3f74f20fcb --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/VrControllersTest.kt @@ -0,0 +1,13 @@ +package com.droiddeck.launcher.input + +import org.junit.Assert.assertEquals +import org.junit.Test + +class VrControllersTest { + @Test fun encodesTheKeysTheSteamVrDriverReads() { + assertEquals("emulate=index\nsticks=game\n", VrControllers.encode(VrControllers.Settings())) + assertEquals("emulate=touch\nsticks=hands\n", + VrControllers.encode(VrControllers.Settings(VrControllers.Emulate.TOUCH, sticksMoveHands = true))) + assertEquals(listOf("off", "index", "touch", "vive"), VrControllers.Emulate.entries.map { it.key }) + } +} diff --git a/docs/cardboard-vr.md b/docs/cardboard-vr.md index 9f53acf980..8fd74154db 100644 --- a/docs/cardboard-vr.md +++ b/docs/cardboard-vr.md @@ -465,20 +465,31 @@ results, app recovery behavior, and the unverified powered-adapter design. ### Not done yet -- **Controllers**: the driver adds two Vive-profile hands driven by the session's game pad. It reads +- **Controllers**: the driver adds two hands driven by the session's game pad. It reads the absolute-state snapshot the app already publishes in fake input ring 0 - (`FAKE_EVDEV_MEMFD_PATHS`), so the app needs no new plumbing. They rest low in front of each side and - point where the head looks. Each stick moves its hand sideways (40 cm), up (50 cm) and down (30 cm) - and turns it as if from an elbow 45 cm behind, so pointers and aim follow it too; the hand eases - back when the stick is let go. The d-pad's up and down move both hands in and out; while a hand's - trigger or grip is held they move only that hand (a slingshot or bow pulled back), and it eases back - on release. Clicking the left stick hands the sticks to the game as trackpads (walking, turning, - teleport) and back. Mapping, right hand: A/R3 = trackpad click, RT = trigger, RB = grip, Start = menu, guide = - system. Left hand: X, LT, LB, Select. Both hands activate in SteamVR and their laser shows on the - dashboard; guide, Start and A presses show up in the ring the driver reads. They are drawn as Index - controllers and switch off while another driver's controller is connected. A Joy-Con hand replaces - the pad hand on its side, and bare camera hands replace both while no controller is connected - (above). + (`FAKE_EVDEV_MEMFD_PATHS`), so the app needs no new plumbing. **Play SteamVR → Settings → Controllers** + chooses what they are; the app writes the choice to `/run/droiddeck/droiddeck-vr-controllers` + (`emulate=index|touch|vive|off`, `sticks=game|hands`). The same choice is in the session menu's glasses page + and on the phone while the picture is on the glasses. The driver checks the file every second and switches + while SteamVR runs: SteamVR fixes a device's input profile when it activates, so each type gets its own pair + of devices, added the first time it is chosen, and the pair it replaces is disconnected: + - **Valve Index** (default) and **Meta Quest 3** (Touch Plus) are thumbstick controllers with the + stock input profiles, so games use their own Index or Touch bindings. Triggers are triggers, bumpers + grip, A/B and X/Y are each hand's face buttons, stick clicks are thumbstick clicks and Guide is system. + Quest's left menu button is Start or Select. + - **HTC Vive wands** keep the older layout: the sticks are trackpads, A/X or a stick click presses them, + Start and Select are menu. + - **Regular game pad** adds no hands, for games that play with a game pad. + + The hands rest low in front of each side and point where the head looks. By default the sticks move you + in the game; pressing both sticks in together switches them to moving the hands and back. Each stick then + moves its hand sideways (40 cm), up (50 cm) and down (30 cm) and turns it as if from an elbow 45 cm + behind, so pointers and aim follow it too; the hand eases back when the stick is let go. The d-pad's up + and down move both hands in and out; while a hand's trigger or grip is held they move only that hand + (a slingshot or bow pulled back), and it eases back on release. Both hands activate in SteamVR and their + laser shows on the dashboard. They switch off while another driver's controller is connected. A Joy-Con + hand replaces the pad hand on its side, and bare camera hands replace both while no controller is + connected (above). - **Layers**: only the first layer of each frame is drawn. SteamVR's compositor composites the dashboard into it, so this has not mattered yet. - **Timing**: no reprojection. The presenter blits the frame submitted last once `vrcompositor`'s GPU diff --git a/docs/development/cardboard-vr-learnings.md b/docs/development/cardboard-vr-learnings.md index 202f57d404..15ca47b024 100644 --- a/docs/development/cardboard-vr-learnings.md +++ b/docs/development/cardboard-vr-learnings.md @@ -133,7 +133,10 @@ OpenVR to SteamVR's ARM64 `vrclient.so`, so no x86 SteamVR is involved. waits for its blit before it presents. - **Flat games under SteamVR.** With SteamVR running, Steam lists a flat game after its own window in gamescope's base layer, so Big Picture keeps the focus and the game never shows, theatre setting or - not. SteamVR is therefore started only by Play SteamVR, never with the glasses alone. + not. SteamVR is therefore started only by Play SteamVR, never with the glasses alone. A flat game + launched while SteamVR runs now opens as a SteamVR panel instead (`droiddeck-steamvr-flat`). Games + launched from the SteamVR dashboard do not pass through a `SteamClient.Apps.RunGame` hook installed + later, so the launcher asks Steam at run time rather than marking the click. - **A new projection needs an event.** `SetDisplayProjectionRaw` changed what `vrserver` reports, but `vrcompositor` kept the frustum it started with, so the glasses' field of view did nothing until SteamVR restarted. The driver now follows it with `VREvent_LensDistortionChanged`. diff --git a/docs/quest.md b/docs/quest.md index 067b708921..2f7da2e80c 100644 --- a/docs/quest.md +++ b/docs/quest.md @@ -195,8 +195,12 @@ rendering changes. ### Experimental flat games in SteamVR -Start SteamVR first, then add `droiddeck-steamvr-game %command%` to a flat -game's Steam launch options. Remove that prefix to restore normal panel launch. +A game Steam lists without any VR support, launched while SteamVR runs, opens as +a SteamVR panel automatically: the Proton and FEX launchers ask Steam whether the +app supports VR (`droiddeck-agent --steam-supports-vr`; optional-VR games such as +Thumper launch normally) and wrap it in +`droiddeck-steamvr-game` (`droiddeck-steamvr-flat`). Adding +`droiddeck-steamvr-game %command%` to a game's launch options does the same by hand. This runs a nested, unmodified Gamescope OpenVR backend for that game. Gamescope owns the GPU overlay, placement and input routing; no CPU screen capture or PipeWire service is used. The existing DroidDeck Vulkan synchronization layer diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index 47d2d62fef..8a0ba6a2cc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -1060,6 +1060,24 @@ def main(argv): return 3 print("droiddeck-agent: Steam overview is ready for shortcut app %d" % prepared["appId"]) return 0 + if argv and argv[0] == "--steam-supports-vr": + if len(argv) != 2 or not argv[1].isascii() or not argv[1].isdecimal(): + print("usage: droiddeck-agent --steam-supports-vr ", file=sys.stderr) + return 2 + # Optional-VR games (Thumper, VRChat) carry vr_supported without vr_only. + expression = ("(o => o ? (o.vr_supported === true || o.vr_only === true) : null)" + "(window.appStore?.GetAppOverviewByGameID?.(%s))" % json.dumps(argv[1])) + value = None + deadline = time.monotonic() + 12 # Steam's UI is busiest while a game starts. + while value is None and time.monotonic() < deadline: + try: + value = cdp_eval(Path(base) / "agent", expression, await_promise=False, timeout=8).get("value") + except (AgentError, OSError, ValueError): + pass + if value is None: + time.sleep(0.5) + print({True: "yes", False: "no"}.get(value, "unknown")) + return {True: 0, False: 5}.get(value, 1) if argv and argv[0] == "--steam-asleep": expression = """(() => { const store = globalThis.SuspendResumeStore; diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat new file mode 100755 index 0000000000..a07462d07e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat @@ -0,0 +1,13 @@ +#!/bin/sh +# Exit 0 when this game run should open as a SteamVR panel: SteamVR is running and Steam +# lists no VR support for the app, optional or required. Under SteamVR, Steam stacks a flat game's window behind +# its own, so without the panel the game plays unseen. +[ "${1:-}" = waitforexitandrun ] || exit 1 +[ -z "${DROIDDECK_STEAMVR_PANEL:-}" ] || exit 1 +# Non-Steam shortcuts run with SteamAppId=0 and their CGameID in SteamGameId. +app=${SteamAppId:-} +[ "$app" = 0 ] && app=${SteamGameId:-} +case $app in '' | 0 | *[!0-9]*) exit 1 ;; esac +pgrep -x vrserver >/dev/null 2>&1 || exit 1 +/usr/local/bin/droiddeck-agent --steam-supports-vr "$app" >/dev/null 2>&1 +[ $? -eq 5 ] diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game index d1e18827fc..0b7d405382 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game @@ -6,6 +6,8 @@ pgrep -x vrserver >/dev/null 2>&1 || { echo 'Start SteamVR before launching a game with droiddeck-steamvr-game.' >&2 exit 1 } +# droiddeck-steamvr-flat skips a run that a launch option already wrapped. +export DROIDDECK_STEAMVR_PANEL=1 vrdir=${DROIDDECK_VR_DIR:-/usr/local/lib/droiddeck-vr} export VK_LAYER_PATH="$vrdir/layer${VK_LAYER_PATH:+:$VK_LAYER_PATH}" export VK_INSTANCE_LAYERS="VK_LAYER_DROIDDECK_vr${VK_INSTANCE_LAYERS:+:$VK_INSTANCE_LAYERS}" diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 81018139f0..04ce24149a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -74,6 +74,9 @@ bl_store_launch() { } bl_run() { + if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "${verb:-}"; then + set -- /usr/local/bin/droiddeck-steamvr-game "$@" + fi if [ -n "${BL_STORE_EXIT:-}" ]; then "$@" rc=$? @@ -463,6 +466,9 @@ verb=$1; shift case $verb in getcompatpath | getnativepath) printf '%s\\n' "$1"; exit 0 ;; esac +if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "$verb"; then + exec /usr/local/bin/droiddeck-steamvr-game /usr/local/bin/droiddeck-fex steam "$verb" "$@" +fi exec /usr/local/bin/droiddeck-fex steam "$verb" "$@" """ diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py index 50b62f2064..66744b6d55 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -412,6 +412,18 @@ class AgentTest(unittest.TestCase): with patch.object(agent, "cdp_eval", side_effect=agent.AgentError("NO_DEVTOOLS", "down")): self.assertEqual(1, agent.main(["--steam-asleep"])) + def test_supports_vr_command_separates_vr_flat_and_unknown_apps(self): + with patch.dict(os.environ, {"BL_LAUNCH_DIR": str(self.dir.parent)}): + for value, code in ((True, 0), (False, 5), (None, 1)): + with self.subTest(value=value), patch.object(agent, "cdp_eval", return_value={"value": value}) as ask: + self.assertEqual(code, agent.main(["--steam-supports-vr", "204360"])) + self.assertIn('GetAppOverviewByGameID?.("204360")', ask.call_args.args[1]) + self.assertIn("vr_supported", ask.call_args.args[1]) + with patch.object(agent, "cdp_eval", side_effect=agent.AgentError("NO_DEVTOOLS", "down")): + self.assertEqual(1, agent.main(["--steam-supports-vr", "204360"])) + for bad in ([], ["1;x"], ["-1"], ["1", "2"]): + self.assertEqual(2, agent.main(["--steam-supports-vr"] + bad)) + def test_idle_inhibit_command_reports_whether_steam_reached_the_state(self): with patch.dict(os.environ, {"BL_LAUNCH_DIR": str(self.dir.parent)}): for value, code in ((True, 0), (False, 1), (None, 1)): diff --git a/tools/vr/src/driver_droiddeck.cpp b/tools/vr/src/driver_droiddeck.cpp index 771e8da399..1398a1d057 100644 --- a/tools/vr/src/driver_droiddeck.cpp +++ b/tools/vr/src/driver_droiddeck.cpp @@ -30,6 +30,7 @@ #include "handcam_shm.h" #include "hand_skeleton.h" #include "index_pose.h" +#include "pad_controller_config.h" #include "joycon_shm.h" #include "presenter.h" #include "spatial_tracking.h" @@ -1027,45 +1028,57 @@ public: pose_.qWorldFromDriverRotation.w = pose_.qDriverFromHeadRotation.w = pose_.qRotation.w = 1; } + void SetProfile(PadProfile profile) { profile_ = profile; } + EVRInitError Activate(uint32_t id) override { id_ = id; PropertyContainerHandle_t c = VRProperties()->TrackedDeviceToPropertyContainer(id_); XrTrackingFile tracking; DroidDeckXrTracking packet{}; xrMode_ = tracking.Read(&packet) && XrTrackingFile::Fresh(packet); - VRProperties()->SetStringProperty(c, Prop_ModelNumber_String, xrMode_ ? "DroidDeck Quest Touch" : "DroidDeck Pad Hand"); - VRProperties()->SetStringProperty(c, Prop_ManufacturerName_String, xrMode_ ? "Meta" : "DroidDeck"); + const PadProfile profile = xrMode_ ? PadProfile::Touch : profile_; + touch_ = profile == PadProfile::Touch; + index_ = profile == PadProfile::Index; + const char *model = touch_ ? "DroidDeck Quest Touch" : index_ ? "DroidDeck Index Hand" : "DroidDeck Pad Hand"; + VRProperties()->SetStringProperty(c, Prop_ModelNumber_String, model); + VRProperties()->SetStringProperty(c, Prop_ManufacturerName_String, touch_ ? "Meta" : index_ ? "Valve" : "DroidDeck"); VRProperties()->SetStringProperty(c, Prop_TrackingSystemName_String, "droiddeck"); - VRProperties()->SetStringProperty(c, Prop_RenderModelName_String, xrMode_ ? + VRProperties()->SetStringProperty(c, Prop_RenderModelName_String, touch_ ? (right_ ? "oculus_quest_plus_controller_right" : "oculus_quest_plus_controller_left") : (right_ ? "{indexcontroller}valve_controller_knu_1_0_right" : "{indexcontroller}valve_controller_knu_1_0_left")); - VRProperties()->SetStringProperty(c, Prop_ControllerType_String, xrMode_ ? "oculus_touch" : "vive_controller"); - VRProperties()->SetStringProperty(c, Prop_InputProfilePath_String, xrMode_ ? - "{oculus}/input/touch_profile.json" : "{htc}/input/vive_controller_profile.json"); + VRProperties()->SetStringProperty(c, Prop_ControllerType_String, touch_ ? "oculus_touch" : index_ ? "knuckles" : "vive_controller"); + VRProperties()->SetStringProperty(c, Prop_InputProfilePath_String, touch_ ? "{oculus}/input/touch_profile.json" : + index_ ? "{indexcontroller}/input/index_controller_profile.json" : "{htc}/input/vive_controller_profile.json"); VRProperties()->SetInt32Property(c, Prop_ControllerRoleHint_Int32, right_ ? TrackedControllerRole_RightHand : TrackedControllerRole_LeftHand); VRProperties()->SetInt32Property(c, Prop_DeviceClass_Int32, TrackedDeviceClass_Controller); auto in = VRDriverInput(); + const bool stick = touch_ || index_; + const char *stickPath = touch_ ? "/input/joystick" : "/input/thumbstick"; + const auto path = [](const char *base, const char *leaf) { return std::string(base) + leaf; }; in->CreateBooleanComponent(c, "/input/system/click", &system_); - in->CreateBooleanComponent(c, "/input/application_menu/click", &menu_); - in->CreateBooleanComponent(c, "/input/grip/click", &grip_); + if (!index_) in->CreateBooleanComponent(c, "/input/application_menu/click", &menu_); + in->CreateBooleanComponent(c, stick ? "/input/grip/touch" : "/input/grip/click", &grip_); in->CreateBooleanComponent(c, "/input/trigger/click", &triggerClick_); in->CreateScalarComponent(c, "/input/trigger/value", &trigger_, VRScalarType_Absolute, VRScalarUnits_NormalizedOneSided); - in->CreateScalarComponent(c, xrMode_ ? "/input/joystick/x" : "/input/trackpad/x", &padX_, VRScalarType_Absolute, VRScalarUnits_NormalizedTwoSided); - in->CreateScalarComponent(c, xrMode_ ? "/input/joystick/y" : "/input/trackpad/y", &padY_, VRScalarType_Absolute, VRScalarUnits_NormalizedTwoSided); - in->CreateBooleanComponent(c, xrMode_ ? "/input/joystick/click" : "/input/trackpad/click", &padClick_); - in->CreateBooleanComponent(c, xrMode_ ? "/input/joystick/touch" : "/input/trackpad/touch", &padTouch_); - if (xrMode_) { + const char *axisBase = stick ? stickPath : "/input/trackpad"; + in->CreateScalarComponent(c, path(axisBase, "/x").c_str(), &padX_, VRScalarType_Absolute, VRScalarUnits_NormalizedTwoSided); + in->CreateScalarComponent(c, path(axisBase, "/y").c_str(), &padY_, VRScalarType_Absolute, VRScalarUnits_NormalizedTwoSided); + in->CreateBooleanComponent(c, path(axisBase, "/click").c_str(), &padClick_); + in->CreateBooleanComponent(c, path(axisBase, "/touch").c_str(), &padTouch_); + if (stick) { + const bool letters = touch_ && !right_; in->CreateScalarComponent(c, "/input/grip/value", &gripValue_, VRScalarType_Absolute, VRScalarUnits_NormalizedOneSided); + if (index_) in->CreateScalarComponent(c, "/input/grip/force", &gripForce_, VRScalarType_Absolute, VRScalarUnits_NormalizedOneSided); in->CreateBooleanComponent(c, "/input/trigger/touch", &triggerTouch_); - in->CreateBooleanComponent(c, right_ ? "/input/a/click" : "/input/x/click", &primaryClick_); - in->CreateBooleanComponent(c, right_ ? "/input/b/click" : "/input/y/click", &secondaryClick_); - in->CreateBooleanComponent(c, right_ ? "/input/a/touch" : "/input/x/touch", &primaryTouch_); - in->CreateBooleanComponent(c, right_ ? "/input/b/touch" : "/input/y/touch", &secondaryTouch_); - in->CreateBooleanComponent(c, "/input/thumbrest/touch", &thumbrestTouch_); + in->CreateBooleanComponent(c, letters ? "/input/x/click" : "/input/a/click", &primaryClick_); + in->CreateBooleanComponent(c, letters ? "/input/y/click" : "/input/b/click", &secondaryClick_); + in->CreateBooleanComponent(c, letters ? "/input/x/touch" : "/input/a/touch", &primaryTouch_); + in->CreateBooleanComponent(c, letters ? "/input/y/touch" : "/input/b/touch", &secondaryTouch_); + if (touch_) in->CreateBooleanComponent(c, "/input/thumbrest/touch", &thumbrestTouch_); } in->CreateHapticComponent(c, "/output/haptic", &haptic_); - Log("%s hand activated (%s)", right_ ? "right" : "left", xrMode_ ? "Quest Touch" : "game pad"); + Log("%s hand activated (%s)", right_ ? "right" : "left", xrMode_ ? "Quest Touch" : model); return VRInitError_None; } void Deactivate() override { ClearInputs(); id_ = k_unTrackedDeviceIndexInvalid; } @@ -1085,11 +1098,14 @@ public: if (id_ == k_unTrackedDeviceIndexInvalid) return; auto in = VRDriverInput(); EVRInputError error = VRInputError_None; - for (VRInputComponentHandle_t h : {system_, menu_, grip_, triggerClick_, padClick_, padTouch_}) { + for (VRInputComponentHandle_t h : {system_, menu_, grip_, triggerClick_, padClick_, padTouch_, triggerTouch_, + primaryClick_, secondaryClick_, primaryTouch_, secondaryTouch_}) { + if (!h) continue; const auto result = in->UpdateBooleanComponent(h, false, 0); if (result != VRInputError_None) error = result; } - for (VRInputComponentHandle_t h : {trigger_, padX_, padY_}) { + for (VRInputComponentHandle_t h : {trigger_, padX_, padY_, gripValue_, gripForce_}) { + if (!h) continue; const auto result = in->UpdateScalarComponent(h, 0.0f, 0); if (result != VRInputError_None) error = result; } @@ -1183,16 +1199,14 @@ public: p.result = valid ? TrackingResult_Running_OK : TrackingResult_Running_OutOfRange; auto in = VRDriverInput(); const uint32_t b = pad ? pad->buttons : 0; - in->UpdateBooleanComponent(system_, right_ && (b & PAD_GUIDE), 0); - in->UpdateBooleanComponent(menu_, (b & (right_ ? PAD_START : PAD_SELECT)) != 0, 0); const auto gripError = in->UpdateBooleanComponent(grip_, opticalInputs_.grip, 0); + if (gripValue_) in->UpdateScalarComponent(gripValue_, opticalInputs_.grip ? 1.0f : 0.0f, 0); const auto clickError = in->UpdateBooleanComponent(triggerClick_, opticalInputs_.click, 0); const auto triggerError = in->UpdateScalarComponent(trigger_, opticalInputs_.trigger, 0); + if (triggerTouch_) in->UpdateBooleanComponent(triggerTouch_, opticalInputs_.trigger > 0.05f, 0); const float x = pad ? pad->axes[right_ ? 2 : 0]/32767.0f : 0; const float y = pad ? -pad->axes[right_ ? 3 : 1]/32767.0f : 0; - in->UpdateScalarComponent(padX_, x, 0); in->UpdateScalarComponent(padY_, y, 0); - in->UpdateBooleanComponent(padTouch_, x*x+y*y > 0.01f || (b & (right_ ? PAD_A : PAD_X)), 0); - in->UpdateBooleanComponent(padClick_, (b & (right_ ? (PAD_A|PAD_R3) : PAD_X)) != 0, 0); + UpdatePadButtons(b, x, y, true); LogOpticalInputs(hand, inputValid, valid, now, connection, origin, inputEpochs, gripError, clickError, triggerError); pose_ = p; VRServerDriverHost()->TrackedDevicePoseUpdated(id_, p, sizeof(p)); @@ -1251,19 +1265,42 @@ public: auto in = VRDriverInput(); const uint32_t b = pad->buttons; const float trig = pad->axes[right_ ? 4 : 5] / 255.0f; - const bool touch = !sticksMoveHands && stickX * stickX + stickY * stickY > 0.01f; - in->UpdateBooleanComponent(system_, right_ && (b & PAD_GUIDE), 0); - in->UpdateBooleanComponent(menu_, (b & (right_ ? PAD_START : PAD_SELECT)) != 0, 0); - in->UpdateBooleanComponent(grip_, (b & (right_ ? PAD_RB : PAD_LB)) != 0, 0); + const bool grip = (b & (right_ ? PAD_RB : PAD_LB)) != 0; in->UpdateScalarComponent(trigger_, trig, 0); in->UpdateBooleanComponent(triggerClick_, trig > 0.6f, 0); - in->UpdateScalarComponent(padX_, touch ? stickX : 0.0f, 0); - in->UpdateScalarComponent(padY_, touch ? stickY : 0.0f, 0); - in->UpdateBooleanComponent(padTouch_, touch || (b & (right_ ? PAD_A : PAD_X)), 0); - in->UpdateBooleanComponent(padClick_, (b & (right_ ? (PAD_A | PAD_R3) : PAD_X)) != 0, 0); + if (triggerTouch_) in->UpdateBooleanComponent(triggerTouch_, trig > 0.05f, 0); + in->UpdateBooleanComponent(grip_, grip, 0); + if (gripValue_) in->UpdateScalarComponent(gripValue_, grip ? 1.0f : 0.0f, 0); + if (gripForce_) in->UpdateScalarComponent(gripForce_, grip ? 1.0f : 0.0f, 0); + UpdatePadButtons(b, stickX, stickY, !sticksMoveHands); } private: + // Face buttons, menus and the stick, for both the game pad and optical hands. + void UpdatePadButtons(uint32_t b, float stickX, float stickY, bool stickToGame) { + auto in = VRDriverInput(); + const bool touch = stickToGame && stickX * stickX + stickY * stickY > 0.01f; + in->UpdateBooleanComponent(system_, right_ && (b & PAD_GUIDE), 0); + in->UpdateScalarComponent(padX_, touch ? stickX : 0.0f, 0); + in->UpdateScalarComponent(padY_, touch ? stickY : 0.0f, 0); + if (!touch_ && !index_) { + in->UpdateBooleanComponent(menu_, (b & (right_ ? PAD_START : PAD_SELECT)) != 0, 0); + in->UpdateBooleanComponent(padTouch_, touch || (b & (right_ ? PAD_A : PAD_X)), 0); + in->UpdateBooleanComponent(padClick_, (b & (right_ ? (PAD_A | PAD_R3) : PAD_X)) != 0, 0); + return; + } + // Touch and Index: face buttons are their own inputs and the stick is a thumbstick. + const bool primary = b & (right_ ? PAD_A : PAD_X), secondary = b & (right_ ? PAD_B : PAD_Y); + const bool both = (b & PAD_L3) && (b & PAD_R3); + if (menu_) in->UpdateBooleanComponent(menu_, !right_ && (b & (PAD_START | PAD_SELECT)), 0); + in->UpdateBooleanComponent(primaryClick_, primary, 0); + in->UpdateBooleanComponent(secondaryClick_, secondary, 0); + in->UpdateBooleanComponent(primaryTouch_, primary, 0); + in->UpdateBooleanComponent(secondaryTouch_, secondary, 0); + in->UpdateBooleanComponent(padTouch_, touch, 0); + in->UpdateBooleanComponent(padClick_, !both && (b & (right_ ? PAD_R3 : PAD_L3)), 0); + } + void LogOpticalInputs(const dd_spatial_hand &hand, bool inputValid, bool poseValid, int64_t now, uint64_t connection, uint64_t origin, uint16_t inputEpochs, EVRInputError gripError, EVRInputError clickError, EVRInputError triggerError) { @@ -1297,14 +1334,15 @@ private: static constexpr int16_t kGrabTrigger = 153; static constexpr float kStickDeadzone = 0.12f, kHandRangeX = 0.40f, kHandRangeUp = 0.50f, kHandRangeDown = 0.30f, kHandSmoothing = 0.05f, kHandPivot = 0.45f; bool right_; - bool xrMode_ = false; + bool xrMode_ = false, touch_ = false, index_ = false; + PadProfile profile_ = PadProfile::Index; uint32_t id_ = k_unTrackedDeviceIndexInvalid; DriverPose_t pose_ = {}; float pull_ = 0.0f, handX_ = 0.0f, handY_ = 0.0f; std::chrono::steady_clock::time_point lastUpdate_ = std::chrono::steady_clock::now(); VRInputComponentHandle_t system_ = 0, menu_ = 0, grip_ = 0, triggerClick_ = 0, trigger_ = 0, padX_ = 0, padY_ = 0, padClick_ = 0, padTouch_ = 0, haptic_ = 0; - VRInputComponentHandle_t gripValue_ = 0, triggerTouch_ = 0, primaryClick_ = 0, secondaryClick_ = 0, + VRInputComponentHandle_t gripValue_ = 0, gripForce_ = 0, triggerTouch_ = 0, primaryClick_ = 0, secondaryClick_ = 0, primaryTouch_ = 0, secondaryTouch_ = 0, thumbrestTouch_ = 0; }; @@ -1552,9 +1590,9 @@ private: if (fresh) PublishChaperone(xr); DriverPose_t head = GetPose(); VRServerDriverHost()->TrackedDevicePoseUpdated(id_, head, sizeof(head)); - for (int hand = 0; hand < 2; hand++) if (hands_[hand]) { + for (int hand = 0; hand < 2; hand++) if (CardboardController *pad = ActiveHand(hand)) { DroidDeckXrHand state = fresh ? xr.hands[hand] : DroidDeckXrHand{}; - hands_[hand]->UpdateXr(state, fresh ? xr.predicted_ns : 0); + pad->UpdateXr(state, fresh ? xr.predicted_ns : 0); } VRDriverInput()->UpdateBooleanComponent(proximity_, fresh, 0); std::this_thread::sleep_for(std::chrono::milliseconds(2)); @@ -1594,9 +1632,10 @@ private: VRServerDriverHost()->TrackedDevicePoseUpdated(id_, head, sizeof(DriverPose_t)); const bool lumaJoyCons = (spatial.flags & DD_SPATIAL_ACTIVE) && (spatial.flags & DD_SPATIAL_JOYCONS); const bool optical = !lumaJoyCons && (spatial.flags & DD_SPATIAL_ACTIVE) && (spatial.flags & DD_SPATIAL_HANDS); - if (!optical && havePad && (pad.buttons & PAD_L3) && !(lastPad_.buttons & PAD_L3)) { - sticksMoveHands_ = !sticksMoveHands_; - Log("sticks now move %s", sticksMoveHands_ ? "the hands" : "in the game"); + const uint32_t chord = PAD_L3 | PAD_R3; + if (!optical && havePad && (pad.buttons & chord) == chord && (lastPad_.buttons & chord) != chord) { + sticksMoveHands_.store(!sticksMoveHands_.load()); + Log("sticks now move %s", sticksMoveHands_.load() ? "the hands" : "in the game"); } const float dt = std::min(std::chrono::duration(now - lastReach_).count(), 0.1f); lastReach_ = now; @@ -1638,7 +1677,7 @@ private: if (joyCon || bare) wantHand_[side] = true; const bool covered = handControllers_[side] && handControllers_[side]->Update(joyCon, bare, head.qRotation, nowNs, lumaJoyCons ? &spatial : nullptr); - CardboardController *hand = hands_[side]; + CardboardController *hand = ActiveHand(side); if (!hand) continue; if (otherControllers_ || covered || bare || lumaJoyCons) { if (!padHandOff_[side]) hand->Disconnect(); @@ -1650,7 +1689,7 @@ private: havePad ? &pad : nullptr, SpatialNow(), spatial.connection, spatial.origin, uint16_t(spatial.input_epochs >> (side*16)), spatial.flags & DD_SPATIAL_STEADY_AIM ? &spatial.head : nullptr); - else hand->Update(head, havePad ? &pad : nullptr, sticksMoveHands_, reach_); + else hand->Update(head, havePad ? &pad : nullptr, sticksMoveHands_.load(), reach_); } if (havePad) lastPad_ = pad; lastSent = now; @@ -1713,6 +1752,18 @@ private: PropertyContainerHandle_t container_ = k_ulInvalidPropertyContainer; public: void SetHands(CardboardController *left, CardboardController *right) { hands_[0] = left; hands_[1] = right; } + void SetSticksMoveHands(bool on) { sticksMoveHands_ = on; } + + // Called only from the pose thread: a replaced pair is disconnected there, so it never races an update. + CardboardController *ActiveHand(int side) { + CardboardController *wanted = hands_[side].load(); + if (wanted != active_[side]) { + if (active_[side]) active_[side]->Disconnect(); + active_[side] = wanted; + padHandOff_[side] = false; + } + return wanted; + } void SetHandControllers(HandController *left, HandController *right) { handControllers_[0] = left; handControllers_[1] = right; } bool WantsHand(int side) const { return wantHand_[side].load(); } @@ -1729,12 +1780,13 @@ private: PadState lastPad_; VRInputComponentHandle_t proximity_ = 0; bool worn_ = true; - bool sticksMoveHands_ = true; + std::atomic sticksMoveHands_{false}; float reach_ = 0.0f; std::chrono::steady_clock::time_point lastReach_ = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point lastScan_{}; bool otherControllers_ = false; - CardboardController *hands_[2] = {nullptr, nullptr}; + std::atomic hands_[2] = {nullptr, nullptr}; + CardboardController *active_[2] = {nullptr, nullptr}; bool padHandOff_[2] = {false, false}; ShmFile joyConFile_{kJoyConPath, DROIDDECK_JOYCON_MAGIC, DROIDDECK_JOYCON_VERSION, "Joy-Con"}; uint32_t lastJoyConSeq_ = 0; @@ -1767,11 +1819,8 @@ public: Log("DroidDeck Cardboard driver loaded"); if (!VRServerDriverHost()->TrackedDeviceAdded("droiddeck-cardboard-hmd", TrackedDeviceClass_HMD, &hmd_)) Log("TrackedDeviceAdded failed"); - if (VRSettings()->GetBool(kSettingsSection, "gamepadControllers")) { - VRServerDriverHost()->TrackedDeviceAdded("droiddeck-pad-left", TrackedDeviceClass_Controller, &left_); - VRServerDriverHost()->TrackedDeviceAdded("droiddeck-pad-right", TrackedDeviceClass_Controller, &right_); - hmd_.SetHands(&left_, &right_); - } + padsEnabled_ = VRSettings()->GetBool(kSettingsSection, "gamepadControllers"); + ApplyPadConfig(true); hmd_.SetHandControllers(&handLeft_, &handRight_); return VRInitError_None; } @@ -1782,6 +1831,11 @@ public: } const char *const *GetInterfaceVersions() override { return k_InterfaceVersions; } void RunFrame() override { + const auto now = std::chrono::steady_clock::now(); + if (now - lastConfigCheck_ > std::chrono::seconds(1)) { + lastConfigCheck_ = now; + ApplyPadConfig(false); + } for (int side = 0; side < 2; side++) { if (handAdded_[side] || !hmd_.WantsHand(side)) continue; handAdded_[side] = true; @@ -1803,9 +1857,11 @@ public: if (!h.componentHandle) continue; if (h.componentHandle == handLeft_.Haptic()) SendRumble(DROIDDECK_JOYCON_RUMBLE_SLOT, h); else if (h.componentHandle == handRight_.Haptic()) SendRumble(DROIDDECK_JOYCON_RUMBLE_SLOT + 1, h); - else if (h.componentHandle == left_.Haptic() || h.componentHandle == right_.Haptic()) { - if (left_.XrMode()) SendHaptic(h.componentHandle == right_.Haptic() ? 1 : 0, h); + else for (int p = 0; p < kPadProfiles; p++) { + if (!padAdded_[p] || (h.componentHandle != pads_[p][0].Haptic() && h.componentHandle != pads_[p][1].Haptic())) continue; + if (pads_[p][0].XrMode()) SendHaptic(h.componentHandle == pads_[p][1].Haptic() ? 1 : 0, h); else SendRumble(0, h); + break; } } } @@ -1852,8 +1908,46 @@ private: target.frequency = std::max(pulse.fFrequency, 0.f); __atomic_store_n(&haptics_->seq, (sequence | 1u) + 1u, __ATOMIC_RELEASE); } + // SteamVR fixes a device's input profile when it activates, so each type gets its own pair, + // added the first time it is chosen; devices cannot be removed, only disconnected. + void ApplyPadConfig(bool initial) { + // The file is a few bytes, so compare what it says; two quick writes can share an mtime. + const PadControllerConfig pads = read_pad_controller_config("/run/droiddeck/" DROIDDECK_VR_CONTROLLERS_FILE); + if (!initial && pads.profile == configProfile_ && pads.sticksMoveHands == configSticks_) return; + configProfile_ = pads.profile; + if (initial || pads.sticksMoveHands != configSticks_) hmd_.SetSticksMoveHands(pads.sticksMoveHands); + configSticks_ = pads.sticksMoveHands; + const PadProfile profile = padsEnabled_ ? pads.profile : PadProfile::Off; + if (!initial && profile == profile_) return; + profile_ = profile; + Log("game pad hands: %s, sticks start in %s", pad_profile_name(profile), pads.sticksMoveHands ? "the hands" : "the game"); + if (profile == PadProfile::Off) { hmd_.SetHands(nullptr, nullptr); return; } + const int p = int(profile) - 1; + if (!padAdded_[p]) { + static const char *const kNames[kPadProfiles][2] = { + {"droiddeck-pad-left", "droiddeck-pad-right"}, + {"droiddeck-pad-touch-left", "droiddeck-pad-touch-right"}, + {"droiddeck-pad-vive-left", "droiddeck-pad-vive-right"}, + }; + for (int side = 0; side < 2; side++) { + pads_[p][side].SetProfile(profile); + VRServerDriverHost()->TrackedDeviceAdded(kNames[p][side], TrackedDeviceClass_Controller, &pads_[p][side]); + } + padAdded_[p] = true; + } + hmd_.SetHands(&pads_[p][0], &pads_[p][1]); + } + + static constexpr int kPadProfiles = 3; CardboardHmd hmd_; - CardboardController left_{false}, right_{true}; + CardboardController pads_[kPadProfiles][2] = {{CardboardController(false), CardboardController(true)}, + {CardboardController(false), CardboardController(true)}, + {CardboardController(false), CardboardController(true)}}; + bool padAdded_[kPadProfiles] = {false, false, false}; + bool padsEnabled_ = true, configSticks_ = false; + PadProfile profile_ = PadProfile::Off; + PadProfile configProfile_ = PadProfile::Index; + std::chrono::steady_clock::time_point lastConfigCheck_{}; HandController handLeft_{false}, handRight_{true}; bool handAdded_[2] = {false, false}; }; diff --git a/tools/vr/src/pad_controller_config.h b/tools/vr/src/pad_controller_config.h new file mode 100644 index 0000000000..387832b3a9 --- /dev/null +++ b/tools/vr/src/pad_controller_config.h @@ -0,0 +1,54 @@ +#pragma once +#include +#include + +#define DROIDDECK_VR_CONTROLLERS_FILE "droiddeck-vr-controllers" + +enum class PadProfile { Off, Index, Touch, Vive }; + +struct PadControllerConfig { + PadProfile profile = PadProfile::Index; + bool sticksMoveHands = false; +}; + +// One key=value per line, written by the app before SteamVR starts. +inline PadControllerConfig pad_controller_config(const char *text) { + PadControllerConfig config; + if (!text) return config; + for (const char *line = text; *line;) { + const char *end = std::strchr(line, '\n'); + const size_t length = end ? size_t(end - line) : std::strlen(line); + const auto is = [&](const char *expected) { + return std::strlen(expected) == length && !std::strncmp(line, expected, length); + }; + if (is("emulate=off")) config.profile = PadProfile::Off; + else if (is("emulate=index")) config.profile = PadProfile::Index; + else if (is("emulate=touch")) config.profile = PadProfile::Touch; + else if (is("emulate=vive")) config.profile = PadProfile::Vive; + else if (is("sticks=hands")) config.sticksMoveHands = true; + else if (is("sticks=game")) config.sticksMoveHands = false; + if (!end) break; + line = end + 1; + } + return config; +} + +inline PadControllerConfig read_pad_controller_config(const char *path) { + char text[256] = {}; + if (FILE *f = std::fopen(path, "r")) { + const size_t n = std::fread(text, 1, sizeof(text) - 1, f); + text[n] = 0; + std::fclose(f); + } + return pad_controller_config(text); +} + +inline const char *pad_profile_name(PadProfile profile) { + switch (profile) { + case PadProfile::Off: return "off"; + case PadProfile::Index: return "Index"; + case PadProfile::Touch: return "Quest Touch"; + case PadProfile::Vive: return "Vive"; + } + return "?"; +} diff --git a/tools/vr/tests/test_optical_controller.cpp b/tools/vr/tests/test_optical_controller.cpp index cd84028830..799439d7af 100644 --- a/tools/vr/tests/test_optical_controller.cpp +++ b/tools/vr/tests/test_optical_controller.cpp @@ -80,6 +80,7 @@ int main() { Context context; VRDriverContext() = &context; CardboardController controller(false); + controller.SetProfile(PadProfile::Vive); assert(controller.Activate(1) == VRInitError_None); const auto gripHandle=context.input.handles.at("/input/grip/click"); const auto clickHandle=context.input.handles.at("/input/trigger/click"); @@ -260,4 +261,46 @@ int main() { joyCon.Update(nullptr, false, {1,0,0,0}, now, &spatial); assert(!joyCon.GetPose().deviceIsConnected && context.input.values.at(joyTrigger) == 0); puts("PASS: optical controller recovery and Luma Joy-Con camera, fallback, head loss and origin changes"); + + for (const PadProfile profile : {PadProfile::Index, PadProfile::Touch}) { + auto &padContext = context; + padContext.input.handles.clear(); + CardboardController pad(true); + pad.SetProfile(profile); + assert(pad.Activate(2) == VRInitError_None); + const auto &h = padContext.input.handles; + const std::string stick = profile == PadProfile::Touch ? "/input/joystick" : "/input/thumbstick"; + assert(!h.count("/input/trackpad/x") && h.count("/input/b/click") && h.count("/input/grip/value")); + assert(h.count("/input/application_menu/click") == (profile == PadProfile::Touch)); + DriverPose_t head{}; + head.qRotation.w = 1; + PadState state{}; + state.buttons = PAD_A | PAD_RB; + state.axes[2] = 32767; + state.axes[4] = 255; + pad.Update(head, &state, false, 0); + const auto value = [&](const std::string &name) { return padContext.input.values.at(h.at(name)); }; + assert(value("/input/a/click") == 1 && value("/input/b/click") == 0); + assert(value(stick + "/x") == 1 && value(stick + "/touch") == 1 && value(stick + "/click") == 0); + assert(value("/input/grip/value") == 1 && value("/input/trigger/value") == 1); + pad.Update(head, &state, true, 0); + assert(value(stick + "/x") == 0); + state = {}; + state.buttons = PAD_R3; + pad.Update(head, &state, false, 0); + assert(value(stick + "/click") == 1); + state.buttons = PAD_L3 | PAD_R3; + pad.Update(head, &state, false, 0); + assert(value(stick + "/click") == 0); + dd_spatial_hand optical{}; + state = {}; + state.buttons = PAD_A; + pad.UpdateOptical(optical, false, &state, 1000000000, 1, 1); + assert(value("/input/a/click") == 1 && value(stick + "/click") == 0 && value(stick + "/touch") == 0); + state.buttons = PAD_B | PAD_R3; + pad.UpdateOptical(optical, false, &state, 1000000001, 1, 1); + assert(value("/input/b/click") == 1 && value("/input/a/click") == 0 && value(stick + "/click") == 1); + assert(!padContext.input.values.count(0)); + } + puts("PASS: game pad hands as Index and Quest Touch thumbstick controllers"); } diff --git a/tools/vr/tests/test_pad_controller_config.cpp b/tools/vr/tests/test_pad_controller_config.cpp new file mode 100644 index 0000000000..bfc5469df6 --- /dev/null +++ b/tools/vr/tests/test_pad_controller_config.cpp @@ -0,0 +1,19 @@ +#include "../src/pad_controller_config.h" +#include +#include + +int main() { + auto config = pad_controller_config(nullptr); + assert(config.profile == PadProfile::Index && !config.sticksMoveHands); + config = pad_controller_config("emulate=touch\nsticks=hands\n"); + assert(config.profile == PadProfile::Touch && config.sticksMoveHands); + config = pad_controller_config("emulate=off"); + assert(config.profile == PadProfile::Off); + config = pad_controller_config("emulate=vive\nsticks=game"); + assert(config.profile == PadProfile::Vive && !config.sticksMoveHands); + config = pad_controller_config("emulate=offline\nsticks=handsome\n"); + assert(config.profile == PadProfile::Index && !config.sticksMoveHands); + assert(read_pad_controller_config("/nonexistent/droiddeck").profile == PadProfile::Index); + std::puts("pad controller config ok"); + return 0; +}