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

st/oxr: Basic support for ActionSpace as base space in QuadLayer

Browse source
This commit is contained in:
Christoph Haag 2020-07-16 19:34:46 +02:00 committed by Jakob Bornecrantz
parent 82395b23bb
commit d64ef3df74
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/xrt/state_trackers/oxr/oxr_session.c
View file

@ -836,7 +836,8 @@ convert_eye_visibility(XrSwapchainUsageFlags xr_visibility)
} }
static XrResult static XrResult
submit_quad_layer(struct xrt_compositor *xc, submit_quad_layer(struct oxr_session *sess,
struct xrt_compositor *xc,
struct oxr_logger *log, struct oxr_logger *log,
XrCompositionLayerQuad *quad, XrCompositionLayerQuad *quad,
struct xrt_device *head, struct xrt_device *head,
@ -859,10 +860,33 @@ submit_quad_layer(struct xrt_compositor *xc,
// The space might have a pose, transform that in as well. // The space might have a pose, transform that in as well.
math_pose_transform(&spc->pose, &pose, &pose); math_pose_transform(&spc->pose, &pose, &pose);
} else { } else {
//! @todo Handle action spaces. //! @todo Action space handling not very complete
struct oxr_action_input *input = NULL;
oxr_action_get_pose_input(log, sess, spc->act_key,
&spc->sub_paths, &input);
// If the input isn't active.
if (input == NULL) {
//! @todo just don't render the quad here?
return XR_SUCCESS;
}
uint64_t xdev_timestamp = 0;
struct xrt_space_relation out_relation;
oxr_xdev_get_pose_at(log, sess->sys->inst, input->xdev,
input->input->name, timestamp,
&xdev_timestamp, &out_relation);
struct xrt_pose device_pose = out_relation.pose;
// The space might have a pose, transform that in as well. // The space might have a pose, transform that in as well.
math_pose_transform(&spc->pose, &pose, &pose); math_pose_transform(&spc->pose, &device_pose, &device_pose);
math_pose_transform(&device_pose, &pose, &pose);
// Remove the tracking system origin offset. // Remove the tracking system origin offset.
math_pose_transform(inv_offset, &pose, &pose); math_pose_transform(inv_offset, &pose, &pose);
@ -1107,8 +1131,8 @@ oxr_session_frame_end(struct oxr_logger *log,
break; break;
case XR_TYPE_COMPOSITION_LAYER_QUAD: case XR_TYPE_COMPOSITION_LAYER_QUAD:
submit_quad_layer( submit_quad_layer(
xc, log, (XrCompositionLayerQuad *)layer, xdev, sess, xc, log, (XrCompositionLayerQuad *)layer,
&inv_offset, frameEndInfo->displayTime); xdev, &inv_offset, frameEndInfo->displayTime);
break; break;
default: assert(false && "invalid layer type"); default: assert(false && "invalid layer type");
} }