Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kim <pk15950@gmail.com>2022-02-17 09:41:53 +0300
committerPeter Kim <pk15950@gmail.com>2022-02-17 09:51:16 +0300
commit6a8709ba136ef4e8522555f279294a886595e34c (patch)
tree1edbe054f8e9b14c537e841c56ee648816f4ee53 /source/blender/windowmanager/xr/intern/wm_xr_session.c
parent7d4d8a13ce9e93c7382edbd816042837bf3aa4e6 (diff)
XR: Allow variable count of action map subactions
Previously, the number of action map subactions was limited to two per action (identified by user_path0, user_path1), however for devices with more than two user paths (e.g. Vive Tracker) it will be useful to support a variable amount instead. For example, a single pose action could then be used to query the positions of all connected trackers, with each tracker having its own subaction tracking space. NOTE: This introduces breaking changes for the XR Python API as follows: - XrActionMapItem: The new `user_paths` collection property replaces the `user_path0`/`user_path1` properties. - XrActionMapBinding: The new `component_paths` collection property replaces the `component_path0`/`component_path1` properties. Reviewed By: Severin Differential Revision: https://developer.blender.org/D13949
Diffstat (limited to 'source/blender/windowmanager/xr/intern/wm_xr_session.c')
-rw-r--r--source/blender/windowmanager/xr/intern/wm_xr_session.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 59b4eb00363..dfeaeae196c 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -1188,8 +1188,9 @@ void wm_xr_session_actions_update(wmWindowManager *wm)
&state->viewer_pose, settings->base_scale * state->nav_scale, state->viewer_viewmat);
}
- int ret = GHOST_XrSyncActions(xr_context, active_action_set ? active_action_set->name : NULL);
- if (!ret) {
+ const bool synced = GHOST_XrSyncActions(xr_context,
+ active_action_set ? active_action_set->name : NULL);
+ if (!synced) {
return;
}