mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 01:48:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/survive: Add vive ipd range

Browse source
This commit is contained in:
Christoph Haag 2023-04-11 01:36:06 +02:00 committed by Jakob Bornecrantz
parent 0efb008492
commit c248670f2f
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrt/auxiliary/vive/vive_config.h
View file

@ -21,6 +21,14 @@
#define INDEX_MIN_IPD 0.058 #define INDEX_MIN_IPD 0.058
#define INDEX_MAX_IPD 0.07 #define INDEX_MAX_IPD 0.07
// https://vr-compare.com/headset/htcvive
// #define VIVE_MIN_IPD 0.061
// #define VIVE_MAX_IPD 0.072
// steamvr goes from ~60 to 75
#define VIVE_MIN_IPD 0.060
#define VIVE_MAX_IPD 0.075
// arbitrary default values // arbitrary default values
#define DEFAULT_HAPTIC_FREQ 150.0f #define DEFAULT_HAPTIC_FREQ 150.0f
#define MIN_HAPTIC_DURATION 0.05f #define MIN_HAPTIC_DURATION 0.05f

22
src/xrt/drivers/survive/survive_driver.c
View file

@ -712,9 +712,27 @@ _process_hmd_button_event(struct survive_device *survive, const struct SurviveSi
if (e->axis_ids[i] == SURVIVE_AXIS_IPD) { if (e->axis_ids[i] == SURVIVE_AXIS_IPD) {
float ipd = val; float ipd = val;
float range = INDEX_MAX_IPD - INDEX_MIN_IPD;
// arbitrary default values
float max = 70;
float min = 60;
if (survive->hmd.config.variant == VIVE_VARIANT_INDEX) {
max = INDEX_MAX_IPD;
min = INDEX_MIN_IPD;
} else if (survive->hmd.config.variant == VIVE_VARIANT_VIVE) {
max = VIVE_MAX_IPD;
min = VIVE_MIN_IPD;
} else {
if (!survive->hmd.use_default_ipd) {
SURVIVE_WARN(survive,
"No IPD range for this HMD, falling back to default");
survive->hmd.use_default_ipd = true;
}
}
float range = max - min;
ipd *= range; ipd *= range;
ipd += INDEX_MIN_IPD; ipd += min;
survive->hmd.ipd = ipd; survive->hmd.ipd = ipd;
// SURVIVE_DEBUG(survive, "ipd: %f meter", ipd); // SURVIVE_DEBUG(survive, "ipd: %f meter", ipd);