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

feat: rename valve index profile to survive profile; drop system profile

Browse source
This commit is contained in:
Gabriele Musco 2023-09-12 17:11:07 +02:00
parent 6fa3021424
commit 8ec4d7445f
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
4 changed files with 7 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/profiles/mod.rs
View file

@ -1,5 +1,4 @@
pub mod lighthouse;
pub mod openhmd;
pub mod system_valve_index;
pub mod valve_index;
pub mod survive;
pub mod wivrn;

8
src/profiles/valve_index.rs → src/profiles/survive.rs
View file

@ -8,9 +8,9 @@ use crate::{
};
use std::collections::HashMap;
pub fn valve_index_profile() -> Profile {
pub fn survive_profile() -> Profile {
let data_dir = get_data_dir();
let prefix = format!("{data}/prefixes/valve_index_default", data = data_dir);
let prefix = format!("{data}/prefixes/survive_default", data = data_dir);
let mut environment: HashMap<String, String> = HashMap::new();
environment.insert("XRT_JSON_LOG".into(), "1".into());
environment.insert("XRT_COMPOSITOR_SCALE_PERCENTAGE".into(), "140".into());
@ -24,8 +24,8 @@ pub fn valve_index_profile() -> Profile {
format!("{pfx}/lib:{pfx}/lib64", pfx = prefix),
);
Profile {
uuid: "valve-index-default".into(),
name: format!("Valve Index - {name} Default", name = APP_NAME),
uuid: "survive-default".into(),
name: format!("Survive - {name} Default", name = APP_NAME),
xrservice_path: data_monado_path(),
xrservice_type: XRServiceType::Monado,
opencomposite_path: data_opencomposite_path(),

33
src/profiles/system_valve_index.rs
View file

@ -1,33 +0,0 @@
use crate::{
constants::APP_NAME,
paths::{data_opencomposite_path, SYSTEM_PREFIX},
profile::{LighthouseDriver, Profile, ProfileFeatures, XRServiceType},
};
use std::collections::HashMap;
pub fn system_valve_index_profile() -> Profile {
let mut environment: HashMap<String, String> = HashMap::new();
environment.insert("XRT_JSON_LOG".into(), "1".into());
environment.insert("XRT_COMPOSITOR_SCALE_PERCENTAGE".into(), "140".into());
environment.insert("XRT_COMPOSITOR_COMPUTE".into(), "1".into());
environment.insert("SURVIVE_GLOBALSCENESOLVER".into(), "0".into());
environment.insert("SURVIVE_TIMECODE_OFFSET_MS".into(), "-6.94".into());
environment.insert("XRT_DEBUG_GUI".into(), "1".into());
environment.insert("XRT_CURATED_GUI".into(), "1".into());
Profile {
uuid: "system-valve-index-default".into(),
name: format!("Valve Index (System) - {name} Default", name = APP_NAME),
opencomposite_path: data_opencomposite_path(),
xrservice_path: "".into(),
xrservice_type: XRServiceType::Monado,
features: ProfileFeatures {
..Default::default()
},
environment,
prefix: SYSTEM_PREFIX.into(),
can_be_built: false,
editable: false,
lighthouse_driver: LighthouseDriver::Survive,
..Default::default()
}
}

6
src/ui/app.rs
View file

@ -37,8 +37,7 @@ use crate::paths::get_ipc_file_path;
use crate::profile::{Profile, XRServiceType};
use crate::profiles::lighthouse::lighthouse_profile;
use crate::profiles::openhmd::openhmd_profile;
use crate::profiles::system_valve_index::system_valve_index_profile;
use crate::profiles::valve_index::valve_index_profile;
use crate::profiles::survive::survive_profile;
use crate::profiles::wivrn::wivrn_profile;
use crate::ui::build_window::{BuildWindowMsg, BuildWindowOutMsg};
use crate::ui::debug_view::DebugViewInit;
@ -229,8 +228,7 @@ impl App {
pub fn profiles_list(config: &Config) -> Vec<Profile> {
let mut profiles = vec![
lighthouse_profile(),
valve_index_profile(),
system_valve_index_profile(),
survive_profile(),
wivrn_profile(),
openhmd_profile(),
];