mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 14:49:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'steamvr_break' into 'main'

Browse source 
feat!: LH_DRIVER=steamvr deprecated,  use STEAMVR_LH_ENABLE=true instead

See merge request gabmus/envision!22
This commit is contained in:
GabMus 2023-12-14 17:19:14 +00:00
commit 352a873528
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ui/job_worker/internal_worker.rs
View file

@ -1,4 +1,7 @@
use crate::{profile::Profile, withclones}; use crate::{
profile::{LighthouseDriver, Profile},
withclones,
};
use super::{ use super::{
job::{CmdWorkerData, FuncWorkerOut, WorkerJob}, job::{CmdWorkerData, FuncWorkerOut, WorkerJob},
@ -161,10 +164,15 @@ impl InternalJobWorker {
) -> relm4::WorkerHandle<InternalJobWorker> { ) -> relm4::WorkerHandle<InternalJobWorker> {
let mut env = prof.environment.clone(); let mut env = prof.environment.clone();
if !env.contains_key("LH_DRIVER") { if !env.contains_key("LH_DRIVER") {
env.insert( match prof.lighthouse_driver {
"LH_DRIVER".into(), // don't set LH_DRIVER for steamvr driver, set this instead
prof.lighthouse_driver.to_string().to_lowercase(), LighthouseDriver::SteamVR => {
); env.insert("STEAMVR_LH_ENABLE".into(), "true".into());
}
d => {
env.insert("LH_DRIVER".into(), d.to_string().to_lowercase());
}
}
} }
let mut launch_opts = prof.xrservice_launch_options.trim(); let mut launch_opts = prof.xrservice_launch_options.trim();
let debug_launch_opts = if debug { let debug_launch_opts = if debug {