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: Add Monado ball on a stick controller

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-09-03 15:25:44 +01:00
parent 79ad85e9b7
commit a673f9b7fc
3 changed files with 362 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

362
src/xrt/state_trackers/oxr/oxr_binding.c
View file

@ -37,8 +37,9 @@ struct profile_template
static struct binding_template khr_simple_controller_bindings[10]; static struct binding_template khr_simple_controller_bindings[10];
static struct binding_template google_daydream_controller_bindings[12]; static struct binding_template google_daydream_controller_bindings[12];
static struct binding_template mnd_ball_on_stick_controller_bindings[24];
static struct profile_template profiles[2] = { static struct profile_template profiles[3] = {
{ {
.path = "/interaction_profiles/khr/simple_controller", .path = "/interaction_profiles/khr/simple_controller",
.bindings = khr_simple_controller_bindings, .bindings = khr_simple_controller_bindings,
@ -49,6 +50,11 @@ static struct profile_template profiles[2] = {
.bindings = google_daydream_controller_bindings, .bindings = google_daydream_controller_bindings,
.num_bindings = ARRAY_SIZE(google_daydream_controller_bindings), .num_bindings = ARRAY_SIZE(google_daydream_controller_bindings),
}, },
{
.path = "/interaction_profiles/mnd/ball_on_stick_controller",
.bindings = mnd_ball_on_stick_controller_bindings,
.num_bindings = ARRAY_SIZE(mnd_ball_on_stick_controller_bindings),
},
}; };
static void static void
@ -129,7 +135,8 @@ is_valid_interaction_profile(struct oxr_instance *inst, XrPath path)
inst->path_cache.microsoft_xbox_controller == path || inst->path_cache.microsoft_xbox_controller == path ||
inst->path_cache.oculus_go_controller == path || inst->path_cache.oculus_go_controller == path ||
inst->path_cache.oculus_touch_controller == path || inst->path_cache.oculus_touch_controller == path ||
inst->path_cache.valve_index_controller == path; inst->path_cache.valve_index_controller == path ||
inst->path_cache.mnd_ball_on_stick_controller == path;
} }
static bool static bool
@ -274,6 +281,7 @@ oxr_find_profile_for_device(struct oxr_logger *log,
case XRT_DEVICE_PSMV: case XRT_DEVICE_PSMV:
// clang-format off // clang-format off
interaction_profile_find(log, inst, inst->path_cache.khr_simple_controller, out_p); interaction_profile_find(log, inst, inst->path_cache.khr_simple_controller, out_p);
interaction_profile_find(log, inst, inst->path_cache.mnd_ball_on_stick_controller, out_p);
// clang-format on // clang-format on
return; return;
default: return; default: return;
@ -819,3 +827,353 @@ static struct binding_template google_daydream_controller_bindings[12] = {
}, },
}, },
}; };
/*
*
*
*
* Monado ball on a stick controller
*
*
*
*/
static struct binding_template mnd_ball_on_stick_controller_bindings[24] = {
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/system/click",
"/user/hand/left/input/system",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_PS_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/menu/click",
"/user/hand/left/input/menu",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_MOVE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/start/click",
"/user/hand/left/input/start",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_START_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/select/click",
"/user/hand/left/input/select",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_SELECT_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/square_mnd/click",
"/user/hand/left/input/square_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_SQUARE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/cross_mnd/click",
"/user/hand/left/input/cross_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_CROSS_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/circle_mnd/click",
"/user/hand/left/input/circle_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_CIRCLE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/triangle_mnd/click",
"/user/hand/left/input/triangle_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_TRIANGLE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/trigger/value",
"/user/hand/left/input/trigger",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_TRIGGER_VALUE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/grip/pose",
"/user/hand/left/input/grip",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_BODY_CENTER_POSE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/ball_mnd/pose",
"/user/hand/left/input/ball_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_BALL_CENTER_POSE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_LEFT,
.paths =
{
"/user/hand/left/input/aim/pose",
"/user/hand/left/input/aim",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_BALL_TIP_POSE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/system/click",
"/user/hand/right/input/system",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_PS_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/menu/click",
"/user/hand/right/input/menu",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_MOVE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/start/click",
"/user/hand/right/input/start",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_START_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/select/click",
"/user/hand/right/input/select",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_SELECT_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/square_mnd/click",
"/user/hand/right/input/square_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_SQUARE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/cross_mnd/click",
"/user/hand/right/input/cross_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_CROSS_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/circle_mnd/click",
"/user/hand/right/input/circle_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_CIRCLE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/triangle_mnd/click",
"/user/hand/right/input/triangle_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_TRIANGLE_CLICK,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/trigger/value",
"/user/hand/right/input/trigger",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_TRIGGER_VALUE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/grip/pose",
"/user/hand/right/input/grip",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_BODY_CENTER_POSE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/ball_mnd/pose",
"/user/hand/right/input/ball_mnd",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_BALL_CENTER_POSE,
0,
},
},
{
.sub_path = OXR_SUB_ACTION_PATH_RIGHT,
.paths =
{
"/user/hand/right/input/aim/pose",
"/user/hand/right/input/aim",
NULL,
},
.inputs =
{
XRT_INPUT_PSMV_BALL_TIP_POSE,
0,
},
},
};

1
src/xrt/state_trackers/oxr/oxr_instance.c
View file

@ -110,6 +110,7 @@ oxr_instance_create(struct oxr_logger *log,
cache_path(log, inst, "/interaction_profiles/oculus/go_controller", &inst->path_cache.oculus_go_controller); cache_path(log, inst, "/interaction_profiles/oculus/go_controller", &inst->path_cache.oculus_go_controller);
cache_path(log, inst, "/interaction_profiles/oculus/touch_controller", &inst->path_cache.oculus_touch_controller); cache_path(log, inst, "/interaction_profiles/oculus/touch_controller", &inst->path_cache.oculus_touch_controller);
cache_path(log, inst, "/interaction_profiles/valve/index_controller", &inst->path_cache.valve_index_controller); cache_path(log, inst, "/interaction_profiles/valve/index_controller", &inst->path_cache.valve_index_controller);
cache_path(log, inst, "/interaction_profiles/mnd/ball_on_stick", &inst->path_cache.mnd_ball_on_stick_controller);
// clang-format on // clang-format on
p_ret = xrt_prober_create(&inst->prober); p_ret = xrt_prober_create(&inst->prober);

1
src/xrt/state_trackers/oxr/oxr_objects.h
View file

@ -894,6 +894,7 @@ struct oxr_instance
XrPath oculus_go_controller; XrPath oculus_go_controller;
XrPath oculus_touch_controller; XrPath oculus_touch_controller;
XrPath valve_index_controller; XrPath valve_index_controller;
XrPath mnd_ball_on_stick_controller;
} path_cache; } path_cache;
//! Debug messengers //! Debug messengers