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: Use factored-out helpers to determine if action state has changed.

Browse source
This commit is contained in:
Ryan Pavlik 2020-07-23 17:59:05 -05:00 committed by Rylie Pavlik
parent 4d8622728f
commit d73d5655f2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/xrt/state_trackers/oxr/oxr_input.c
View file

@ -1295,14 +1295,15 @@ oxr_action_attachment_update(struct oxr_logger *log,
bool active = false; bool active = false;
bool changed = false; bool changed = false;
XrTime timestamp = time_state_monotonic_to_ts_ns(sess->sys->inst->timekeeping, time); XrTime timestamp = time_state_monotonic_to_ts_ns(sess->sys->inst->timekeeping, time);
U_ZERO(&act_attached->any_state);
switch (act_attached->act_ref->action_type) { switch (act_attached->act_ref->action_type) {
case XR_ACTION_TYPE_BOOLEAN_INPUT: { case XR_ACTION_TYPE_BOOLEAN_INPUT: {
bool value = false; bool value = false;
OXR_FOR_EACH_VALID_SUBACTION_PATH(BOOL_CHECK) OXR_FOR_EACH_VALID_SUBACTION_PATH(BOOL_CHECK)
changed = (last.value.boolean != value);
act_attached->any_state.value.boolean = value; act_attached->any_state.value.boolean = value;
changed = act_attached->any_state.active && !oxr_state_equal_bool(&last, &act_attached->any_state);
break; break;
} }
case XR_ACTION_TYPE_FLOAT_INPUT: { case XR_ACTION_TYPE_FLOAT_INPUT: {
@ -1310,8 +1311,8 @@ oxr_action_attachment_update(struct oxr_logger *log,
float value = -2.0f; // NOLINT float value = -2.0f; // NOLINT
OXR_FOR_EACH_VALID_SUBACTION_PATH(VEC1_CHECK) OXR_FOR_EACH_VALID_SUBACTION_PATH(VEC1_CHECK)
changed = last.value.vec1.x != value;
act_attached->any_state.value.vec1.x = value; act_attached->any_state.value.vec1.x = value;
changed = act_attached->any_state.active && !oxr_state_equal_vec1(&last, &act_attached->any_state);
break; break;
} }
case XR_ACTION_TYPE_VECTOR2F_INPUT: { case XR_ACTION_TYPE_VECTOR2F_INPUT: {
@ -1320,9 +1321,9 @@ oxr_action_attachment_update(struct oxr_logger *log,
float distance = -1.0f; float distance = -1.0f;
OXR_FOR_EACH_VALID_SUBACTION_PATH(VEC2_CHECK) OXR_FOR_EACH_VALID_SUBACTION_PATH(VEC2_CHECK)
changed = (last.value.vec2.x != x) || (last.value.vec2.y != y);
act_attached->any_state.value.vec2.x = x; act_attached->any_state.value.vec2.x = x;
act_attached->any_state.value.vec2.y = y; act_attached->any_state.value.vec2.y = y;
changed = act_attached->any_state.active && !oxr_state_equal_vec2(&last, &act_attached->any_state);
break; break;
} }
default: default: