mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Only access space velocity through chain helper

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-03-14 23:04:28 +00:00 committed by Jakob Bornecrantz
parent 85a2abaec6
commit 587d26bb45
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xrt/state_trackers/oxr/oxr_space.c
View file

@ -20,6 +20,7 @@
#include "oxr_objects.h" #include "oxr_objects.h"
#include "oxr_logger.h" #include "oxr_logger.h"
#include "oxr_handle.h" #include "oxr_handle.h"
#include "oxr_chain.h"
const struct xrt_pose origin = XRT_POSE_IDENTITY; const struct xrt_pose origin = XRT_POSE_IDENTITY;
@ -437,6 +438,9 @@ oxr_space_locate(
print_space_slog(&slog, "baseSpace", baseSpc); print_space_slog(&slog, "baseSpace", baseSpc);
} }
// Used in a lot of places.
XrSpaceVelocity *vel = OXR_GET_OUTPUT_FROM_CHAIN(location->next, XR_TYPE_SPACE_LOCATION, XrSpaceVelocity);
// Get the pure space relation. // Get the pure space relation.
struct xrt_space_relation pure; struct xrt_space_relation pure;
bool has_pure_relation = get_pure_space_relation(log, spc, baseSpc, time, &pure); bool has_pure_relation = get_pure_space_relation(log, spc, baseSpc, time, &pure);
@ -445,7 +449,6 @@ oxr_space_locate(
OXR_XRT_POSE_TO_XRPOSEF(XRT_POSE_IDENTITY, location->pose); OXR_XRT_POSE_TO_XRPOSEF(XRT_POSE_IDENTITY, location->pose);
XrSpaceVelocity *vel = (XrSpaceVelocity *)location->next;
if (vel) { if (vel) {
vel->velocityFlags = 0; vel->velocityFlags = 0;
U_ZERO(&vel->linearVelocity); U_ZERO(&vel->linearVelocity);
@ -474,7 +477,6 @@ oxr_space_locate(
OXR_XRT_POSE_TO_XRPOSEF(result.pose, location->pose); OXR_XRT_POSE_TO_XRPOSEF(result.pose, location->pose);
location->locationFlags = xrt_to_xr_space_location_flags(result.relation_flags); location->locationFlags = xrt_to_xr_space_location_flags(result.relation_flags);
XrSpaceVelocity *vel = (XrSpaceVelocity *)location->next;
if (vel) { if (vel) {
vel->velocityFlags = 0; vel->velocityFlags = 0;
if ((result.relation_flags & XRT_SPACE_RELATION_LINEAR_VELOCITY_VALID_BIT) != 0) { if ((result.relation_flags & XRT_SPACE_RELATION_LINEAR_VELOCITY_VALID_BIT) != 0) {