Add SteamVR offline launch feature

alvr/dashboard/src/steamvr_launcher/linux_steamvr.rs

@@ -6,7 +6,7 @@ use alvr_common::anyhow::bail;
 use alvr_common::{debug, error, info, warn};
 use sysinfo::Process;
 
-pub fn start_steamvr() {
+pub fn launch_steamvr_with_steam() {
     Command::new("steam")
         .args(["steam://rungameid/250820"])
         .spawn()
@@ -153,9 +153,9 @@ fn linux_gpu_checks(device_infos: &[(&wgpu::Adapter, DeviceInfo)]) {
         Ok(dir) => dir,
         Err(e) => {
             error!(
-                "Couldn't detect openvr or steamvr files. \
-            Please make sure you have installed and ran SteamVR at least once. \
-            Or if you're using Flatpak Steam, make sure to use ALVR Dashboard from Flatpak ALVR. {e}"
+                "Couldn't find OpenVR or SteamVR files. \
+                Please make sure you have installed and ran SteamVR at least once. \
+                Or if you're using Flatpak Steam, make sure to use ALVR Dashboard from Flatpak ALVR. {e}"
             );
             return;
         }

alvr/dashboard/src/steamvr_launcher/mod.rs

@@ -3,17 +3,20 @@ mod linux_steamvr;
 #[cfg(windows)]
 mod windows_steamvr;
 
+use std::{path::PathBuf, process::Command};
+
 use crate::data_sources;
 use alvr_adb::commands as adb;
 use alvr_common::{
     anyhow::{Context, Result},
-    debug,
+    debug, error,
     glam::bool,
     parking_lot::Mutex,
     warn,
 };
 use alvr_filesystem as afs;
 use serde_json::{self, json};
+use settings_schema::Switch;
 use std::{
     ffi::OsStr,
     fs,
@@ -107,6 +110,23 @@ fn unblock_alvr_driver_within_vrsettings(text: &str) -> Result<String> {
     Ok(serde_json::to_string_pretty(&settings)?)
 }
 
+pub fn get_default_steamvr_executable_path() -> String {
+    let steamvr_root_dir = alvr_server_io::steamvr_root_dir()
+        .map_err(|e| error!("Couldn't find OpenVR or SteamVR files. {e}"))
+        .unwrap_or_default();
+
+    let steamvr_path = if cfg!(windows) {
+        steamvr_root_dir
+            .join("bin")
+            .join("win64")
+            .join("vrstartup.exe")
+    } else {
+        steamvr_root_dir.join("bin").join("vrmonitor.sh")
+    };
+
+    steamvr_path.into_os_string().into_string().unwrap()
+}
+
 pub struct Launcher {
     _phantom: PhantomData<()>,
 }
@@ -156,11 +176,35 @@ impl Launcher {
         if !is_steamvr_running() {
             debug!("SteamVR is dead. Launching...");
 
-            #[cfg(windows)]
-            windows_steamvr::start_steamvr();
-
-            #[cfg(target_os = "linux")]
-            linux_steamvr::start_steamvr();
+            if let Switch::Enabled(steamvr_path) = &data_sources::get_read_only_local_session()
+                .settings()
+                .extra
+                .steamvr_launcher
+                .use_steamvr_path
+            {
+                let steamvr_path = &steamvr_path.steamvr_executable_path_override;
+
+                if PathBuf::from(steamvr_path).exists() {
+                    debug!("Launching SteamVR from path: {}", steamvr_path);
+
+                    Command::new(steamvr_path).spawn().ok();
+                } else {
+                    let default_steamvr_executable = get_default_steamvr_executable_path();
+
+                    warn!(
+                        "SteamVR executable not found at path: {}. Trying default path.",
+                        default_steamvr_executable
+                    );
+
+                    Command::new(default_steamvr_executable).spawn().ok();
+                }
+            } else {
+                #[cfg(windows)]
+                windows_steamvr::launch_steamvr_with_steam();
+
+                #[cfg(target_os = "linux")]
+                linux_steamvr::launch_steamvr_with_steam();
+            }
         }
     }
 

alvr/dashboard/src/steamvr_launcher/windows_steamvr.rs

@@ -3,7 +3,7 @@ use std::process::Command;
 
 const CREATE_NO_WINDOW: u32 = 0x0800_0000;
 
-pub fn start_steamvr() {
+pub fn launch_steamvr_with_steam() {
     Command::new("cmd")
         .args(["/C", "start", "steam://rungameid/250820"])
         .creation_flags(CREATE_NO_WINDOW)

alvr/session/src/settings.rs

@@ -1468,10 +1468,24 @@ pub struct LoggingConfig {
     pub debug_groups: DebugGroupsConfig,
 }
 
+#[derive(SettingsSchema, Serialize, Deserialize, Clone)]
+pub struct SteamvrQuickLaunchConfig {
+    #[schema(strings(display_name = "SteamVR executable path"))]
+    pub steamvr_executable_path_override: String,
+}
+
 #[derive(SettingsSchema, Serialize, Deserialize, Clone)]
 pub struct SteamvrLauncher {
-    #[schema(strings(display_name = "Open and close SteamVR with dashboard"))]
+    #[schema(strings(
+        display_name = "Open and close SteamVR automatically",
+        help = "Launches SteamVR automatically when the ALVR dashboard is opened, and closes it when the dashboard is closed."
+    ))]
     pub open_close_steamvr_with_dashboard: bool,
+    #[schema(strings(
+        display_name = "Quick launch",
+        help = "Launches SteamVR directly without Steam. This makes launching SteamVR significantly faster, allows SteamVR to be launched offline and avoids the \"app already running\" pop-up."
+    ))]
+    pub use_steamvr_path: Switch<SteamvrQuickLaunchConfig>,
 }
 
 #[derive(SettingsSchema, Serialize, Deserialize, Clone)]
@@ -1513,6 +1527,7 @@ pub struct NewVersionPopupConfig {
 
 #[derive(SettingsSchema, Serialize, Deserialize, Clone)]
 pub struct ExtraConfig {
+    #[schema(strings(display_name = "SteamVR Launcher"))]
     pub steamvr_launcher: SteamvrLauncher,
     pub capture: CaptureConfig,
     pub logging: LoggingConfig,
@@ -2133,6 +2148,16 @@ pub fn session_settings_default() -> SettingsDefault {
             },
             steamvr_launcher: SteamvrLauncherDefault {
                 open_close_steamvr_with_dashboard: false,
+                use_steamvr_path: SwitchDefault {
+                    enabled: false,
+                    content: SteamvrQuickLaunchConfigDefault {
+                        steamvr_executable_path_override: if cfg!(target_os = "windows") {
+                            r"C:\Program Files (x86)\Steam\steamapps\common\SteamVR\bin\win64\vrstartup.exe".into()
+                        } else {
+                            "".into()
+                        },
+                    },
+                },
             },
             capture: CaptureConfigDefault {
                 startup_video_recording: false,