From 7c8fa679bd750c83eb4dc1caaf828930adf7f9d6 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Tue, 13 Oct 2026 10:37:08 -0400 Subject: [PATCH] Fit VR games on the glasses: full view, seated origin at the head, pad hands reach with the d-pad --- .../com/droiddeck/launcher/SessionActivity.kt | 7 ++++++- .../launcher/agent/AgentBridgeProvider.kt | 5 ++++- .../com/droiddeck/launcher/glasses/Glasses.kt | 9 ++++---- tools/droiddeckctl | 8 ++++++- .../overlay/usr/local/bin/droiddeck-steamvr | 21 +++++++++++++++++++ tools/vr/src/driver_droiddeck.cpp | 9 +++++++- 6 files changed, 51 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 284df1a858..37b1e13de0 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2725,7 +2725,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun pushCardboard(c: Cardboard) { - val fov = if (c.viewer == Cardboard.Viewer.VITURE.id) glasses.verticalFovDeg else 0f + val fov = when { + c.viewer != Cardboard.Viewer.VITURE.id -> 0f + c.source == Cardboard.SOURCE_SBS -> GLASSES_VR_FOV_DEG + else -> glasses.verticalFovDeg + } panelSizeMm().let { (w, h) -> c.push(w, h, fov, refreshHz()) } } @@ -2997,6 +3001,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val DRAWER_SLOW_REPEAT_FLOOR_MS = 240L private const val DRAWER_FAST_REPEAT_INTERVAL_MS = 90L private const val DRAWER_REPEAT_ACCELERATION_MS = 1_400L + private const val GLASSES_VR_FOV_DEG = 70f /** Compositor scale modes (Container.FULLSCREEN_* values): 1 = fit with bars, centred. */ private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt index 4c5861a426..47f976189a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt @@ -136,7 +136,10 @@ class AgentBridgeProvider : ContentProvider() { else -> return error("INVALID_KEY", "Unknown glasses setting '$key'") } } - "simulate" -> if (!g.simulate(request.optInt("seconds", 20).coerceIn(1, 600))) return error("BUSY", "Already simulating") + "simulate" -> { + fun angle(key: String) = if (request.has(key)) request.optDouble(key).takeIf { it.isFinite() }?.coerceIn(-90.0, 90.0) else null + if (!g.simulate(request.optInt("seconds", 20).coerceIn(1, 600), angle("yaw"), angle("pitch"))) return error("BUSY", "Already simulating") + } "stop-simulate" -> g.stopSimulation() "query" -> { g.query(); Thread.sleep(600) } "mode" -> { g.sendMode(request.optString("mode").removePrefix("0x").toInt(16)); Thread.sleep(600) } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt index 3833276890..65bfc08cd1 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt @@ -211,16 +211,17 @@ object Glasses { post { updateImu() } } - fun simulate(seconds: Int): Boolean { + fun simulate(seconds: Int, holdYaw: Double? = null, holdPitch: Double? = null): Boolean { + val hold = holdYaw != null || holdPitch != null val t = Thread({ val start = SystemClock.elapsedRealtimeNanos() val end = start + seconds * 1_000_000_000L while (SystemClock.elapsedRealtimeNanos() < end && simulating.get() === Thread.currentThread()) { val now = SystemClock.elapsedRealtimeNanos() val t = (now - start) / 1e9 - val yaw = 40.0 * sin(t * 2 * Math.PI / 6.0) - val pitch = 15.0 * sin(t * 2 * Math.PI / 4.0) - val roll = 5.0 * sin(t * 2 * Math.PI / 5.0) + val yaw = if (hold) holdYaw ?: 0.0 else 40.0 * sin(t * 2 * Math.PI / 6.0) + val pitch = if (hold) holdPitch ?: 0.0 else 15.0 * sin(t * 2 * Math.PI / 4.0) + val roll = if (hold) 0.0 else 5.0 * sin(t * 2 * Math.PI / 5.0) val q = VitureProtocol.eulerZxy(roll.toFloat(), pitch.toFloat(), yaw.toFloat()) deliver(q, now) SystemClock.sleep(4) diff --git a/tools/droiddeckctl b/tools/droiddeckctl index b1cca562af..fac5d3674c 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -491,6 +491,10 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: request.update(key=args.key, value=args.value) elif args.glasses_op == "simulate": request["seconds"] = args.seconds + if args.yaw is not None: + request["yaw"] = args.yaw + if args.pitch is not None: + request["pitch"] = args.pitch elif args.glasses_op == "mode": request["mode"] = args.mode elif args.glasses_op == "imu": @@ -673,8 +677,10 @@ def build_parser() -> argparse.ArgumentParser: glasses_set = glasses_ops.add_parser("set", help="refreshHz, sbsHz, brightness, volume, sunblock, 3d, gameOnGlasses, headTracking, auto3d") glasses_set.add_argument("key") glasses_set.add_argument("value") - glasses_sim = glasses_ops.add_parser("simulate", help="feed a moving head pose (yaw, pitch and roll sweeps)") + glasses_sim = glasses_ops.add_parser("simulate", help="feed a moving head pose (yaw, pitch and roll sweeps), or hold one") glasses_sim.add_argument("--seconds", type=int, default=20) + glasses_sim.add_argument("--yaw", type=float, help="hold this yaw (degrees, left positive) instead of sweeping") + glasses_sim.add_argument("--pitch", type=float, help="hold this pitch (degrees, down positive) instead of sweeping") glasses_ops.add_parser("stop-simulate") glasses_ops.add_parser("query", help="ask the glasses for their display mode, brightness, volume and IMU state") glasses_mode = glasses_ops.add_parser("mode", help="send a display mode byte, e.g. 0x31 (1080p60), 0x34 (1080p120), 0x32 (3D)") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr index 162e471da7..8e2b8ae1fc 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr @@ -87,6 +87,27 @@ start) } JSON ln -sf "$steamvr/steamxr_linuxarm64.json" "$HOME/.config/openxr/1/active_runtime.json" + chaperone=$HOME/.local/share/Steam/config/chaperone_info.vrchap + [ -s "$chaperone" ] || cat > "$chaperone" <<'JSON' +{ + "jsonid" : "chaperone_info", + "universes" : [ + { + "collision_bounds" : [ + [ [ -1.0, 0.0, -1.0 ], [ -1.0, 2.43, -1.0 ], [ -1.0, 2.43, 1.0 ], [ -1.0, 0.0, 1.0 ] ], + [ [ -1.0, 0.0, 1.0 ], [ -1.0, 2.43, 1.0 ], [ 1.0, 2.43, 1.0 ], [ 1.0, 0.0, 1.0 ] ], + [ [ 1.0, 0.0, 1.0 ], [ 1.0, 2.43, 1.0 ], [ 1.0, 2.43, -1.0 ], [ 1.0, 0.0, -1.0 ] ], + [ [ 1.0, 0.0, -1.0 ], [ 1.0, 2.43, -1.0 ], [ -1.0, 2.43, -1.0 ], [ -1.0, 0.0, -1.0 ] ] + ], + "play_area" : [ 2.0, 2.0 ], + "seated" : { "translation" : [ 0.0, -1.6, 0.0 ], "yaw" : 0.0 }, + "standing" : { "translation" : [ 0.0, 0.0, 0.0 ], "yaw" : 0.0 }, + "universeID" : "2" + } + ], + "version" : 5 +} +JSON # vrcompositor asks for VK_KHR_display, which makes Turnip/KGSL report no GPU at all; the layer stands # in for a display. gamescope's implicit WSI layer stays out of SteamVR's processes. diff --git a/tools/vr/src/driver_droiddeck.cpp b/tools/vr/src/driver_droiddeck.cpp index 11a7aeb868..af66afb732 100644 --- a/tools/vr/src/driver_droiddeck.cpp +++ b/tools/vr/src/driver_droiddeck.cpp @@ -417,12 +417,16 @@ public: // From the driver's pose thread: the head's orientation and the pad. void Update(const HmdQuaternion_t &head, const PadState *pad) { if (id_ == k_unTrackedDeviceIndexInvalid) return; + const auto now = std::chrono::steady_clock::now(); + const float dt = std::min(std::chrono::duration(now - lastUpdate_).count(), 0.1f); + lastUpdate_ = now; + if (pad && pad->axes[7]) reach_ = std::clamp(reach_ - (pad->axes[7] > 0 ? 1.0f : -1.0f) * kReachSpeed * dt, kReachMin, kReachMax); DriverPose_t p = {}; p.qWorldFromDriverRotation.w = 1; p.qDriverFromHeadRotation.w = 1; p.qRotation = head; // Low and in front of its side, in head space, then into the room with the head's rotation. - const double off[3] = {right_ ? 0.18 : -0.18, -0.35, -0.30}; + const double off[3] = {right_ ? 0.18 : -0.18, -0.35, -0.30 - reach_}; double m[3][3]; const double w = head.w, x = head.x, y = head.y, z = head.z; m[0][0] = 1 - 2 * (y * y + z * z); m[0][1] = 2 * (x * y - z * w); m[0][2] = 2 * (x * z + y * w); @@ -452,9 +456,12 @@ public: } private: + static constexpr float kReachSpeed = 0.6f, kReachMin = -0.2f, kReachMax = 0.7f; bool right_; uint32_t id_ = k_unTrackedDeviceIndexInvalid; DriverPose_t pose_ = {}; + float reach_ = 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; };