From 999c67975abd88f3a5eae27626123e113f5f3186 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 8 Nov 2022 16:33:52 -0600 Subject: [PATCH] st/oxr: Fix inconsistent naming related to subaction paths --- src/xrt/state_trackers/oxr/oxr_input.c | 18 +++++++++--------- src/xrt/state_trackers/oxr/oxr_objects.h | 14 +++++++------- src/xrt/state_trackers/oxr/oxr_space.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/xrt/state_trackers/oxr/oxr_input.c b/src/xrt/state_trackers/oxr/oxr_input.c index b8e70f51c..60f6fb9cd 100644 --- a/src/xrt/state_trackers/oxr/oxr_input.c +++ b/src/xrt/state_trackers/oxr/oxr_input.c @@ -330,8 +330,8 @@ oxr_action_create(struct oxr_logger *log, // Mod music for all! static uint32_t key_gen = 1; - if (!oxr_classify_sub_action_paths(log, inst, createInfo->countSubactionPaths, createInfo->subactionPaths, - &subaction_paths)) { + if (!oxr_classify_subaction_paths(log, inst, createInfo->countSubactionPaths, createInfo->subactionPaths, + &subaction_paths)) { return XR_ERROR_PATH_UNSUPPORTED; } @@ -370,11 +370,11 @@ oxr_action_create(struct oxr_logger *log, */ bool -oxr_classify_sub_action_paths(struct oxr_logger *log, - const struct oxr_instance *inst, - uint32_t subaction_path_count, - const XrPath *subaction_paths, - struct oxr_subaction_paths *subaction_paths_out) +oxr_classify_subaction_paths(struct oxr_logger *log, + const struct oxr_instance *inst, + uint32_t subaction_path_count, + const XrPath *subaction_paths, + struct oxr_subaction_paths *subaction_paths_out) { const char *str = NULL; size_t length = 0; @@ -1591,8 +1591,8 @@ oxr_action_sync_data(struct oxr_logger *log, oxr_session_get_action_set_attachment(sess, actionSets[i].actionSet, &act_set_attached, &act_set); assert(act_set_attached != NULL); - if (!oxr_classify_sub_action_paths(log, sess->sys->inst, 1, &actionSets[i].subactionPath, - &subaction_paths)) { + if (!oxr_classify_subaction_paths(log, sess->sys->inst, 1, &actionSets[i].subactionPath, + &subaction_paths)) { return XR_ERROR_PATH_UNSUPPORTED; } diff --git a/src/xrt/state_trackers/oxr/oxr_objects.h b/src/xrt/state_trackers/oxr/oxr_objects.h index 34d6ea78d..10ae5e2c4 100644 --- a/src/xrt/state_trackers/oxr/oxr_objects.h +++ b/src/xrt/state_trackers/oxr/oxr_objects.h @@ -456,19 +456,19 @@ oxr_action_to_openxr(struct oxr_action *act) * Sets all members of @p subaction_paths ( @ref oxr_subaction_paths ) as * appropriate based on the subaction paths found in the list. * - * If no paths are provided, @p sub_paths->any will be true. + * If no paths are provided, @p subaction_paths->any will be true. * * @return false if an invalid subaction path is provided. * * @public @memberof oxr_instance - * @see oxr_sub_paths + * @see oxr_subaction_paths */ bool -oxr_classify_sub_action_paths(struct oxr_logger *log, - const struct oxr_instance *inst, - uint32_t subaction_path_count, - const XrPath *subaction_paths, - struct oxr_subaction_paths *subaction_paths_out); +oxr_classify_subaction_paths(struct oxr_logger *log, + const struct oxr_instance *inst, + uint32_t subaction_path_count, + const XrPath *subaction_paths, + struct oxr_subaction_paths *subaction_paths_out); /*! * Find the pose input for the set of subaction_paths diff --git a/src/xrt/state_trackers/oxr/oxr_space.c b/src/xrt/state_trackers/oxr/oxr_space.c index df82a4132..3b4818848 100644 --- a/src/xrt/state_trackers/oxr/oxr_space.c +++ b/src/xrt/state_trackers/oxr/oxr_space.c @@ -68,7 +68,7 @@ oxr_space_action_create(struct oxr_logger *log, struct oxr_space *spc = NULL; OXR_ALLOCATE_HANDLE_OR_RETURN(log, spc, OXR_XR_DEBUG_SPACE, oxr_space_destroy, &sess->handle); - oxr_classify_sub_action_paths(log, inst, 1, &createInfo->subactionPath, &subaction_paths); + oxr_classify_subaction_paths(log, inst, 1, &createInfo->subactionPath, &subaction_paths); spc->sess = sess; spc->space_type = OXR_SPACE_TYPE_ACTION;