matrixfurry.com / monado
The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

st/oxr: Properly name MNDX_ball_on_a_stick_controller

Jakob Bornecrantz 59b7bdee fd8e1971

+51 -37
+1
scripts/generate_oxr_ext_support.py
··· 18 18 ['XR_MND_headless'], 19 19 ['XR_EXTX_overlay'], 20 20 ['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'], 21 + ['XR_MNDX_ball_on_a_stick_controller'], 21 22 ) 22 23 23 24 ROOT = Path(__file__).resolve().parent.parent
+7 -7
src/xrt/state_trackers/oxr/bindings.json
··· 219 219 ] 220 220 }, 221 221 222 - "/interaction_profiles/mnd/ball_on_a_stick_controller": { 222 + "/interaction_profiles/mndx/ball_on_a_stick_controller": { 223 223 "title": "Monado ball on a stick controller", 224 - "extension": "XR_MND_ball_on_a_stick_controller", 224 + "extension": "XR_MNDX_ball_on_a_stick_controller", 225 225 "user_paths": [ 226 226 "/user/hand/left", 227 227 "/user/hand/right" ··· 231 231 {"subpath": "/input/menu/click"}, 232 232 {"subpath": "/input/start/click"}, 233 233 {"subpath": "/input/select/click"}, 234 - {"subpath": "/input/square_mnd/click"}, 235 - {"subpath": "/input/cross_mnd/click"}, 236 - {"subpath": "/input/circle_mnd/click"}, 237 - {"subpath": "/input/triangle_mnd/click"}, 234 + {"subpath": "/input/square_mndx/click"}, 235 + {"subpath": "/input/cross_mndx/click"}, 236 + {"subpath": "/input/circle_mndx/click"}, 237 + {"subpath": "/input/triangle_mndx/click"}, 238 238 {"subpath": "/input/trigger/value"}, 239 239 {"subpath": "/input/grip/pose"}, 240 - {"subpath": "/input/ball_mnd/pose"}, 240 + {"subpath": "/input/ball_mndx/pose"}, 241 241 {"subpath": "/input/aim/pose"}, 242 242 {"subpath": "/output/haptic"} 243 243 ]
+2 -2
src/xrt/state_trackers/oxr/oxr_api_action.c
··· 140 140 func = oxr_verify_oculus_touch_controller_subpath; 141 141 } else if (ip == inst->path_cache.valve_index_controller) { 142 142 func = oxr_verify_valve_index_controller_subpath; 143 - } else if (ip == inst->path_cache.mnd_ball_on_stick_controller) { 144 - func = oxr_verify_mnd_ball_on_a_stick_controller_subpath; 143 + } else if (ip == inst->path_cache.mndx_ball_on_a_stick_controller) { 144 + func = oxr_verify_mndx_ball_on_a_stick_controller_subpath; 145 145 } else { 146 146 return oxr_error( 147 147 &log, XR_ERROR_PATH_UNSUPPORTED,
+1 -1
src/xrt/state_trackers/oxr/oxr_binding.c
··· 241 241 case XRT_DEVICE_PSMV: 242 242 // clang-format off 243 243 interaction_profile_find(log, inst, inst->path_cache.khr_simple_controller, out_p); 244 - interaction_profile_find(log, inst, inst->path_cache.mnd_ball_on_stick_controller, out_p); 244 + interaction_profile_find(log, inst, inst->path_cache.mndx_ball_on_a_stick_controller, out_p); 245 245 // clang-format on 246 246 return; 247 247 case XRT_DEVICE_DAYDREAM:
+24 -24
src/xrt/state_trackers/oxr/oxr_binding_data.h
··· 430 430 * 431 431 */ 432 432 433 - static struct binding_template mnd_ball_on_stick_controller_bindings[26] = { 433 + static struct binding_template mndx_ball_on_a_stick_controller_bindings[26] = { 434 434 { 435 435 .sub_path = OXR_SUB_ACTION_PATH_LEFT, 436 436 .paths = ··· 491 491 .sub_path = OXR_SUB_ACTION_PATH_LEFT, 492 492 .paths = 493 493 { 494 - "/user/hand/left/input/square_mnd/click", 495 - "/user/hand/left/input/square_mnd", 494 + "/user/hand/left/input/square_mndx/click", 495 + "/user/hand/left/input/square_mndx", 496 496 NULL, 497 497 }, 498 498 .inputs = ··· 505 505 .sub_path = OXR_SUB_ACTION_PATH_LEFT, 506 506 .paths = 507 507 { 508 - "/user/hand/left/input/cross_mnd/click", 509 - "/user/hand/left/input/cross_mnd", 508 + "/user/hand/left/input/cross_mndx/click", 509 + "/user/hand/left/input/cross_mndx", 510 510 NULL, 511 511 }, 512 512 .inputs = ··· 519 519 .sub_path = OXR_SUB_ACTION_PATH_LEFT, 520 520 .paths = 521 521 { 522 - "/user/hand/left/input/circle_mnd/click", 523 - "/user/hand/left/input/circle_mnd", 522 + "/user/hand/left/input/circle_mndx/click", 523 + "/user/hand/left/input/circle_mndx", 524 524 NULL, 525 525 }, 526 526 .inputs = ··· 533 533 .sub_path = OXR_SUB_ACTION_PATH_LEFT, 534 534 .paths = 535 535 { 536 - "/user/hand/left/input/triangle_mnd/click", 537 - "/user/hand/left/input/triangle_mnd", 536 + "/user/hand/left/input/triangle_mndx/click", 537 + "/user/hand/left/input/triangle_mndx", 538 538 NULL, 539 539 }, 540 540 .inputs = ··· 575 575 .sub_path = OXR_SUB_ACTION_PATH_LEFT, 576 576 .paths = 577 577 { 578 - "/user/hand/left/input/ball_mnd/pose", 579 - "/user/hand/left/input/ball_mnd", 578 + "/user/hand/left/input/ball_mndx/pose", 579 + "/user/hand/left/input/ball_mndx", 580 580 NULL, 581 581 }, 582 582 .inputs = ··· 672 672 .sub_path = OXR_SUB_ACTION_PATH_RIGHT, 673 673 .paths = 674 674 { 675 - "/user/hand/right/input/square_mnd/click", 676 - "/user/hand/right/input/square_mnd", 675 + "/user/hand/right/input/square_mndx/click", 676 + "/user/hand/right/input/square_mndx", 677 677 NULL, 678 678 }, 679 679 .inputs = ··· 686 686 .sub_path = OXR_SUB_ACTION_PATH_RIGHT, 687 687 .paths = 688 688 { 689 - "/user/hand/right/input/cross_mnd/click", 690 - "/user/hand/right/input/cross_mnd", 689 + "/user/hand/right/input/cross_mndx/click", 690 + "/user/hand/right/input/cross_mndx", 691 691 NULL, 692 692 }, 693 693 .inputs = ··· 700 700 .sub_path = OXR_SUB_ACTION_PATH_RIGHT, 701 701 .paths = 702 702 { 703 - "/user/hand/right/input/circle_mnd/click", 704 - "/user/hand/right/input/circle_mnd", 703 + "/user/hand/right/input/circle_mndx/click", 704 + "/user/hand/right/input/circle_mndx", 705 705 NULL, 706 706 }, 707 707 .inputs = ··· 714 714 .sub_path = OXR_SUB_ACTION_PATH_RIGHT, 715 715 .paths = 716 716 { 717 - "/user/hand/right/input/triangle_mnd/click", 718 - "/user/hand/right/input/triangle_mnd", 717 + "/user/hand/right/input/triangle_mndx/click", 718 + "/user/hand/right/input/triangle_mndx", 719 719 NULL, 720 720 }, 721 721 .inputs = ··· 756 756 .sub_path = OXR_SUB_ACTION_PATH_RIGHT, 757 757 .paths = 758 758 { 759 - "/user/hand/right/input/ball_mnd/pose", 760 - "/user/hand/right/input/ball_mnd", 759 + "/user/hand/right/input/ball_mndx/pose", 760 + "/user/hand/right/input/ball_mndx", 761 761 NULL, 762 762 }, 763 763 .inputs = ··· 972 972 .num_bindings = ARRAY_SIZE(google_daydream_controller_bindings), 973 973 }, 974 974 { 975 - .path = "/interaction_profiles/mnd/ball_on_stick_controller", 976 - .bindings = mnd_ball_on_stick_controller_bindings, 977 - .num_bindings = ARRAY_SIZE(mnd_ball_on_stick_controller_bindings), 975 + .path = "/interaction_profiles/mndx/ball_on_a_stick_controller", 976 + .bindings = mndx_ball_on_a_stick_controller_bindings, 977 + .num_bindings = ARRAY_SIZE(mndx_ball_on_a_stick_controller_bindings), 978 978 }, 979 979 { 980 980 .path = "/interaction_profiles/valve/index_controller",
+14 -1
src/xrt/state_trackers/oxr/oxr_extension_support.h
··· 112 112 #define OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) 113 113 #endif 114 114 115 + 116 + /* 117 + * XR_MNDX_ball_on_a_stick_controller 118 + */ 119 + #if defined(XR_MNDX_ball_on_a_stick_controller) 120 + #define OXR_HAVE_MNDX_ball_on_a_stick_controller 121 + #define OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \ 122 + _(MNDX_ball_on_a_stick_controller, MNDX_BALL_ON_A_STICK_CONTROLLER) 123 + #else 124 + #define OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) 125 + #endif 126 + 115 127 // end of GENERATED per-extension defines - do not modify - used by scripts 116 128 117 129 /*! ··· 143 155 OXR_EXTENSION_SUPPORT_EXT_debug_utils(_) \ 144 156 OXR_EXTENSION_SUPPORT_MND_headless(_) \ 145 157 OXR_EXTENSION_SUPPORT_EXTX_overlay(_) \ 146 - OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) 158 + OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \ 159 + OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) 147 160 // clang-format on
+1 -1
src/xrt/state_trackers/oxr/oxr_instance.c
··· 166 166 cache_path(log, inst, "/interaction_profiles/oculus/go_controller", &inst->path_cache.oculus_go_controller); 167 167 cache_path(log, inst, "/interaction_profiles/oculus/touch_controller", &inst->path_cache.oculus_touch_controller); 168 168 cache_path(log, inst, "/interaction_profiles/valve/index_controller", &inst->path_cache.valve_index_controller); 169 - cache_path(log, inst, "/interaction_profiles/mnd/ball_on_stick_controller", &inst->path_cache.mnd_ball_on_stick_controller); 169 + cache_path(log, inst, "/interaction_profiles/mndx/ball_on_a_stick_controller", &inst->path_cache.mndx_ball_on_a_stick_controller); 170 170 // clang-format on 171 171 172 172 // fill in our application info - @todo - replicate all createInfo
+1 -1
src/xrt/state_trackers/oxr/oxr_objects.h
··· 1148 1148 XrPath oculus_go_controller; 1149 1149 XrPath oculus_touch_controller; 1150 1150 XrPath valve_index_controller; 1151 - XrPath mnd_ball_on_stick_controller; 1151 + XrPath mndx_ball_on_a_stick_controller; 1152 1152 } path_cache; 1153 1153 1154 1154 //! Debug messengers