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

aux/util: Move fov from u_device_simple_info::views to top level

Browse source
This commit is contained in:
Christoph Haag 2022-02-19 02:02:36 +01:00 committed by Jakob Bornecrantz
parent 996a5d3e9a
commit 49b81e219f
8 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrt/auxiliary/util/u_device.c
View file

@ -208,7 +208,7 @@ u_device_setup_split_side_by_side(struct xrt_device *xdev, const struct u_device
{
/* right eye */
if (!math_compute_fovs(w_meters, lens_center_x_meters[1], info->views[1].fov, h_meters,
if (!math_compute_fovs(w_meters, lens_center_x_meters[1], info->fov[1], h_meters,
lens_center_y_meters[1], 0, &xdev->hmd->distortion.fov[1])) {
return false;
}

5
src/xrt/auxiliary/util/u_device.h
View file

@ -63,10 +63,7 @@ struct u_device_simple_info
float lens_horizontal_separation_meters;
float lens_vertical_position_meters;
struct
{
float fov;
} views[2];
float fov[2];
};
/*!

4
src/xrt/drivers/dummy/dummy_hmd.c
View file

@ -188,8 +188,8 @@ dummy_hmd_create(void)
info.display.h_meters = 0.07f;
info.lens_horizontal_separation_meters = 0.13f / 2.0f;
info.lens_vertical_position_meters = 0.07f / 2.0f;
info.views[0].fov = 85.0f * (M_PI / 180.0f);
info.views[1].fov = 85.0f * (M_PI / 180.0f);
info.fov[0] = 85.0f * (M_PI / 180.0f);
info.fov[1] = 85.0f * (M_PI / 180.0f);
if (!u_device_setup_split_side_by_side(&dh->base, &info)) {
DH_ERROR(dh, "Failed to setup basic device info");

4
src/xrt/drivers/euroc/euroc_device.c
View file

@ -227,8 +227,8 @@ euroc_device_create(struct xrt_prober *xp)
info.display.h_meters = 0.07f;
info.lens_horizontal_separation_meters = 0.13f / 2.0f;
info.lens_vertical_position_meters = 0.07f / 2.0f;
info.views[0].fov = 85.0f * (M_PI / 180.0f);
info.views[1].fov = 85.0f * (M_PI / 180.0f);
info.fov[0] = 85.0f * (M_PI / 180.0f);
info.fov[1] = 85.0f * (M_PI / 180.0f);
bool ret = u_device_setup_split_side_by_side(xd, &info);
EUROC_ASSERT(ret, "Failed to setup HMD properties");

4
src/xrt/drivers/illixr/illixr_device.cpp
View file

@ -206,8 +206,8 @@ illixr_hmd_create(const char *path_in, const char *comp_in)
info.display.h_meters = 0.07f;
info.lens_horizontal_separation_meters = 0.13f / 2.0f;
info.lens_vertical_position_meters = 0.07f / 2.0f;
info.views[0].fov = 85.0f * (M_PI / 180.0f);
info.views[1].fov = 85.0f * (M_PI / 180.0f);
info.fov[0] = 85.0f * (M_PI / 180.0f);
info.fov[1] = 85.0f * (M_PI / 180.0f);
if (!u_device_setup_split_side_by_side(&dh->base, &info)) {
DH_ERROR(dh, "Failed to setup basic device info");

4
src/xrt/drivers/psvr/psvr_device.c
View file

@ -1059,8 +1059,8 @@ psvr_device_create(struct hid_device_info *sensor_hid_info,
info.display.h_meters = 0.07f;
info.lens_horizontal_separation_meters = 0.13f / 2.0f;
info.lens_vertical_position_meters = 0.07f / 2.0f;
info.views[0].fov = 85.0f * (M_PI / 180.0f);
info.views[1].fov = 85.0f * (M_PI / 180.0f);
info.fov[0] = 85.0f * (M_PI / 180.0f);
info.fov[1] = 85.0f * (M_PI / 180.0f);
if (!u_device_setup_split_side_by_side(&psvr->base, &info)) {
PSVR_ERROR(psvr, "Failed to setup basic device info");

4
src/xrt/drivers/qwerty/qwerty_device.c
View file

@ -255,8 +255,8 @@ qwerty_hmd_create(void)
info.display.h_meters = 0.07f;
info.lens_horizontal_separation_meters = 0.13f / 2.0f;
info.lens_vertical_position_meters = 0.07f / 2.0f;
info.views[0].fov = 85.0f * (M_PI / 180.0f);
info.views[1].fov = 85.0f * (M_PI / 180.0f);
info.fov[0] = 85.0f * (M_PI / 180.0f);
info.fov[1] = 85.0f * (M_PI / 180.0f);
if (!u_device_setup_split_side_by_side(xd, &info)) {
QWERTY_ERROR(qd, "Failed to setup HMD properties");

4
src/xrt/drivers/remote/r_hmd.c
View file

@ -145,8 +145,8 @@ r_hmd_create(struct r_hub *r)
info.display.h_meters = 0.07f;
info.lens_horizontal_separation_meters = 0.13f / 2.0f;
info.lens_vertical_position_meters = 0.07f / 2.0f;
info.views[0].fov = 85.0f * (M_PI / 180.0f);
info.views[1].fov = 85.0f * (M_PI / 180.0f);
info.fov[0] = 85.0f * (M_PI / 180.0f);
info.fov[1] = 85.0f * (M_PI / 180.0f);
if (!u_device_setup_split_side_by_side(&rh->base, &info)) {
U_LOG_E("Failed to setup basic device info");