add frame controller profile

This commit is contained in:
galister committed 2026-09-27 17:14:33 +09:00
1 parent ef81d500ca
commit 596e661d7e
8 files changed
+767 -53

No files matched your search

+62
View File
@@ -477,6 +477,68 @@ static std::vector<interaction_profile> interaction_profiles{
"/user/hand/right/input/squeeze/value",
},
},
interaction_profile{
.profile_name = "/interaction_profiles/valve/frame_controller_valve",
.required_extensions = {"XR_VALVE_frame_controller_interaction"},
.input_sources = {
"/user/hand/right/output/haptic",
"/user/hand/left/output/haptic",
"/user/hand/right/input/grip/pose",
"/user/hand/left/input/grip/pose",
"/user/hand/right/input/aim/pose",
"/user/hand/left/input/aim/pose",
"/user/hand/right/input/a/touch",
"/user/hand/right/input/a/click",
"/user/hand/right/input/b/touch",
"/user/hand/right/input/b/click",
"/user/hand/right/input/x/touch",
"/user/hand/right/input/x/click",
"/user/hand/right/input/y/touch",
"/user/hand/right/input/y/click",
"/user/hand/right/input/menu/touch",
"/user/hand/right/input/menu/click",
"/user/hand/right/input/system/touch",
"/user/hand/right/input/system/click",
"/user/hand/right/input/bumper/touch",
"/user/hand/right/input/bumper/click",
"/user/hand/right/input/squeeze/touch",
"/user/hand/right/input/squeeze/click",
"/user/hand/right/input/squeeze/value",
"/user/hand/right/input/trigger/touch",
"/user/hand/right/input/trigger/click",
"/user/hand/right/input/trigger/value",
"/user/hand/right/input/thumbstick/touch",
"/user/hand/right/input/thumbstick/click",
"/user/hand/right/input/thumbstick",
"/user/hand/left/input/dpad_up/touch",
"/user/hand/left/input/dpad_up/click",
"/user/hand/left/input/dpad_left/touch",
"/user/hand/left/input/dpad_left/click",
"/user/hand/left/input/dpad_down/touch",
"/user/hand/left/input/dpad_down/click",
"/user/hand/left/input/dpad_right/touch",
"/user/hand/left/input/dpad_right/click",
"/user/hand/left/input/view/touch",
"/user/hand/left/input/view/click",
"/user/hand/left/input/system/touch",
"/user/hand/left/input/system/click",
"/user/hand/left/input/bumper/touch",
"/user/hand/left/input/bumper/click",
"/user/hand/left/input/squeeze/touch",
"/user/hand/left/input/squeeze/click",
"/user/hand/left/input/squeeze/value",
"/user/hand/left/input/trigger/touch",
"/user/hand/left/input/trigger/click",
"/user/hand/left/input/trigger/value",
"/user/hand/left/input/thumbstick/touch",
"/user/hand/left/input/thumbstick/click",
"/user/hand/left/input/thumbstick",
},
},
interaction_profile{
.profile_name = "/interaction_profiles/yvr/touch_controller_yvr",
.input_sources = {
+2
View File
@@ -18,6 +18,7 @@
*/
#include "lobby.h"
#include "application.h"
#include "configuration.h"
#include "constants.h"
@@ -1438,6 +1439,7 @@ scene::meta & scenes::lobby::get_meta_scene()
"/interaction_profiles/bytedance/pico4s_controller",
"/interaction_profiles/yvr/touch_controller_yvr",
"/interaction_profiles/htc/vive_focus3_controller",
"/interaction_profiles/valve/frame_controller_valve",
},
{
{"left_aim", "/user/hand/left/input/aim/pose"},
+32 -6
View File
@@ -55,13 +55,28 @@ using namespace beman::inplace_vector;
// clang-format off
static const std::unordered_map<std::string, device_id> device_ids = {
{"/user/hand/left/input/x/click", device_id::X_CLICK},
{"/user/hand/left/input/x/touch", device_id::X_TOUCH},
{"/user/hand/left/input/y/click", device_id::Y_CLICK},
{"/user/hand/left/input/y/touch", device_id::Y_TOUCH},
{"/user/hand/left/input/menu/click", device_id::MENU_CLICK},
{"/user/hand/left/input/dpad_up/click", device_id::DPAD_UP_CLICK},
{"/user/hand/left/input/dpad_up/touch", device_id::DPAD_UP_TOUCH},
{"/user/hand/left/input/dpad_down/click", device_id::LEFT_X_CLICK},
{"/user/hand/left/input/dpad_down/touch", device_id::LEFT_X_TOUCH},
{"/user/hand/left/input/dpad_left/click", device_id::DPAD_LEFT_CLICK},
{"/user/hand/left/input/dpad_left/touch", device_id::DPAD_LEFT_TOUCH},
{"/user/hand/left/input/dpad_right/click", device_id::LEFT_Y_CLICK},
{"/user/hand/left/input/dpad_right/touch", device_id::LEFT_Y_TOUCH},
{"/user/hand/left/input/x/click", device_id::LEFT_X_CLICK},
{"/user/hand/left/input/x/touch", device_id::LEFT_X_TOUCH},
{"/user/hand/left/input/y/click", device_id::LEFT_Y_CLICK},
{"/user/hand/left/input/y/touch", device_id::LEFT_Y_TOUCH},
{"/user/hand/left/input/view/click", device_id::VIEW_CLICK},
{"/user/hand/left/input/view/touch", device_id::VIEW_TOUCH},
{"/user/hand/left/input/menu/click", device_id::LEFT_MENU_CLICK},
{"/user/hand/left/input/system/click", device_id::LEFT_MENU_CLICK},
{"/user/hand/left/input/system/touch", device_id::LEFT_SYSTEM_TOUCH},
{"/user/hand/left/input/bumper/click", device_id::LEFT_BUMPER_CLICK},
{"/user/hand/left/input/bumper/touch", device_id::LEFT_BUMPER_TOUCH},
{"/user/hand/left/input/squeeze/click", device_id::LEFT_SQUEEZE_CLICK},
{"/user/hand/left/input/squeeze/force", device_id::LEFT_SQUEEZE_FORCE},
{"/user/hand/left/input/squeeze/touch", device_id::LEFT_SQUEEZE_TOUCH},
{"/user/hand/left/input/squeeze/value", device_id::LEFT_SQUEEZE_VALUE},
{"/user/hand/left/input/trigger/value", device_id::LEFT_TRIGGER_VALUE},
{"/user/hand/left/input/trigger/click", device_id::LEFT_TRIGGER_CLICK},
@@ -94,9 +109,19 @@ static const std::unordered_map<std::string, device_id> device_ids = {
{"/user/hand/right/input/a/touch", device_id::A_TOUCH},
{"/user/hand/right/input/b/click", device_id::B_CLICK},
{"/user/hand/right/input/b/touch", device_id::B_TOUCH},
{"/user/hand/right/input/system/click", device_id::SYSTEM_CLICK},
{"/user/hand/right/input/x/click", device_id::RIGHT_X_CLICK},
{"/user/hand/right/input/x/touch", device_id::RIGHT_X_TOUCH},
{"/user/hand/right/input/y/click", device_id::RIGHT_Y_CLICK},
{"/user/hand/right/input/y/touch", device_id::RIGHT_Y_TOUCH},
{"/user/hand/right/input/system/click", device_id::RIGHT_SYSTEM_CLICK},
{"/user/hand/right/input/system/touch", device_id::RIGHT_SYSTEM_TOUCH},
{"/user/hand/right/input/menu/click", device_id::RIGHT_MENU_CLICK},
{"/user/hand/right/input/menu/touch", device_id::RIGHT_MENU_TOUCH},
{"/user/hand/right/input/bumper/click", device_id::RIGHT_BUMPER_CLICK},
{"/user/hand/right/input/bumper/touch", device_id::RIGHT_BUMPER_TOUCH},
{"/user/hand/right/input/squeeze/click", device_id::RIGHT_SQUEEZE_CLICK},
{"/user/hand/right/input/squeeze/force", device_id::RIGHT_SQUEEZE_FORCE},
{"/user/hand/right/input/squeeze/touch", device_id::RIGHT_SQUEEZE_TOUCH},
{"/user/hand/right/input/squeeze/value", device_id::RIGHT_SQUEEZE_VALUE},
{"/user/hand/right/input/trigger/value", device_id::RIGHT_TRIGGER_VALUE},
{"/user/hand/right/input/trigger/click", device_id::RIGHT_TRIGGER_CLICK},
@@ -1361,6 +1386,7 @@ scene::meta & scenes::stream::get_meta_scene()
"/interaction_profiles/bytedance/pico4s_controller",
"/interaction_profiles/yvr/touch_controller_yvr",
"/interaction_profiles/htc/vive_focus3_controller",
"/interaction_profiles/valve/frame_controller_valve",
},
{
{"left_aim", "/user/hand/left/input/aim/pose"},
+1
View File
@@ -676,6 +676,7 @@ void scenes::stream::on_interaction_profile_changed(const XrEventDataInteraction
DO_PROFILE(yvr, touch_controller_yvr)
DO_PROFILE(samsung, odyssey_controller)
DO_PROFILE(valve, index_controller)
DO_PROFILE(valve, frame_controller_valve)
// FIXME: remove once support for pre-1.1 profiles is dropped
if (profile == "/interaction_profiles/facebook/touch_controller_pro")
+27 -6
View File
@@ -61,13 +61,19 @@ enum class device_id : uint8_t
RIGHT_GRIP, // /user/hand/right/input/grip/pose
RIGHT_AIM, // /user/hand/right/input/aim/pose
RIGHT_PALM, // /user/hand/right/palm_ext/pose
X_CLICK, // /user/hand/left/input/x/click
X_TOUCH, // /user/hand/left/input/x/touch
Y_CLICK, // /user/hand/left/input/y/click
Y_TOUCH, // /user/hand/left/input/y/touch
MENU_CLICK, // /user/hand/left/input/menu/click
LEFT_X_CLICK, // /user/hand/left/input/x/click
LEFT_X_TOUCH, // /user/hand/left/input/x/touch
LEFT_Y_CLICK, // /user/hand/left/input/y/click
LEFT_Y_TOUCH, // /user/hand/left/input/y/touch
VIEW_CLICK, // /user/hand/left/input/view/click
VIEW_TOUCH, // /user/hand/left/input/view/touch
LEFT_MENU_CLICK, // /user/hand/left/input/{menu,system}/click
LEFT_SYSTEM_TOUCH, // /user/hand/left/input/system/touch
LEFT_BUMPER_CLICK, // /user/hand/left/input/bumper/click
LEFT_BUMPER_TOUCH, // /user/hand/left/input/bumper/touch
LEFT_SQUEEZE_CLICK, // /user/hand/left/input/squeeze/click
LEFT_SQUEEZE_FORCE, // /user/hand/left/input/squeeze/force
LEFT_SQUEEZE_TOUCH, // /user/hand/left/input/squeeze/touch
LEFT_SQUEEZE_VALUE, // /user/hand/left/input/squeeze/value
LEFT_TRIGGER_CLICK, // /user/hand/left/input/trigger/click
LEFT_TRIGGER_VALUE, // /user/hand/left/input/trigger/value
@@ -97,13 +103,27 @@ enum class device_id : uint8_t
LEFT_AIM_ACTIVATE_READY, // /user/hand/left/input/aim_activate_ext/ready_ext
LEFT_GRASP_VALUE, // /user/hand/left/input/grasp_ext/value
LEFT_GRASP_READY, // /user/hand/left/input/grasp_ext/ready_ext
DPAD_UP_CLICK, // /user/hand/left/input/dpad_up/click
DPAD_UP_TOUCH, // /user/hand/left/input/dpad_up/touch
DPAD_LEFT_CLICK, // /user/hand/left/input/dpad_left/click
DPAD_LEFT_TOUCH, // /user/hand/left/input/dpad_left/touch
A_CLICK, // /user/hand/right/input/a/click
A_TOUCH, // /user/hand/right/input/a/touch
B_CLICK, // /user/hand/right/input/b/click
B_TOUCH, // /user/hand/right/input/b/touch
SYSTEM_CLICK, // /user/hand/right/input/system/click
RIGHT_X_CLICK, // /user/hand/right/input/x/click
RIGHT_X_TOUCH, // /user/hand/right/input/x/touch
RIGHT_Y_CLICK, // /user/hand/right/input/y/click
RIGHT_Y_TOUCH, // /user/hand/right/input/y/touch
RIGHT_SYSTEM_CLICK, // /user/hand/right/input/system/click
RIGHT_SYSTEM_TOUCH, // /user/hand/right/input/system/touch
RIGHT_MENU_CLICK, // /user/hand/right/input/menu/click
RIGHT_MENU_TOUCH, // /user/hand/right/input/menu/touch
RIGHT_BUMPER_CLICK, // /user/hand/right/input/bumper/click
RIGHT_BUMPER_TOUCH, // /user/hand/right/input/bumper/touch
RIGHT_SQUEEZE_CLICK, // /user/hand/right/input/squeeze/click
RIGHT_SQUEEZE_FORCE, // /user/hand/right/input/squeeze/force
RIGHT_SQUEEZE_TOUCH, // /user/hand/right/input/squeeze/touch
RIGHT_SQUEEZE_VALUE, // /user/hand/right/input/squeeze/value
RIGHT_TRIGGER_CLICK, // /user/hand/right/input/trigger/click
RIGHT_TRIGGER_VALUE, // /user/hand/right/input/trigger/value
@@ -190,6 +210,7 @@ enum class interaction_profile : uint8_t
yvr_touch_controller_yvr,
samsung_odyssey_controller,
valve_index_controller,
valve_frame_controller_valve,
};
enum video_codec
@@ -0,0 +1,459 @@
From 3033e3e9e4eb16693f21b12a00eacf60ea816b6b Mon Sep 17 00:00:00 2001
From: galister <[email protected]>
Date: Fri, 18 Sep 2026 14:59:50 +0900
Subject: [PATCH 1/1] st/oxr: add XR_VALVE_frame_controller_interaction
Signed-off-by: galister <[email protected]>
---
CMakeLists.txt | 2 +
cmake/MonadoSetOptions.cmake | 1 +
.../XR_VALVE_frame_controller_interaction.h | 25 ++
src/xrt/auxiliary/bindings/bindings.json | 257 ++++++++++++++++++
.../include/xrt/xrt_config_build.h.cmake_in | 1 +
src/xrt/include/xrt/xrt_defines.h | 48 ++++
src/xrt/include/xrt/xrt_openxr_includes.h | 1 +
.../oxr_extension_support.py | 1 +
8 files changed, 336 insertions(+)
create mode 100644 src/external/openxr_includes/openxr/XR_VALVE_frame_controller_interaction.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4c06a042..7d3ae8b5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -440,6 +440,7 @@ option(XRT_FEATURE_OPENXR_INTERACTION_CONTACTGLOVE2 "Enable XR_MND_contactglove2
option(XRT_FEATURE_OPENXR_INTERACTION_VIVE_COSMOS "Enable XR_HTC_vive_cosmos_controller_interaction" ON)
option(XRT_FEATURE_OPENXR_INTERACTION_VIVE_FOCUS3 "Enable XR_HTC_vive_focus3_controller_interaction" ON)
option(XRT_FEATURE_OPENXR_INTERACTION_FB_PROXIMITY "Enable XR_FB_touch_controller_proximity" ON)
+option(XRT_FEATURE_OPENXR_INTERACTION_FRAME "Enable XR_VALVE_frame_controller_interaction" ON)
option(XRT_FEATURE_OPENXR_INTERACTION_TOUCH_PRO "Enable XR_FB_touch_controller_pro" ON)
option(XRT_FEATURE_OPENXR_INTERACTION_TOUCH_PLUS "Enable XR_META_touch_controller_plus" ON)
option(XRT_FEATURE_OPENXR_INTERACTION_LOGITECH_MX_INK "Enable XR_LOGITECH_mx_ink_stylus_interaction" OFF)
@@ -696,6 +697,7 @@ if(XRT_MODULE_OPENXR_STATE_TRACKER)
message(STATUS "# FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE: ${XRT_FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE}")
message(STATUS "# FEATURE_OPENXR_INTERACTION_EXT_HAND: ${XRT_FEATURE_OPENXR_INTERACTION_EXT_HAND}")
message(STATUS "# FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE: ${XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE}")
+ message(STATUS "# FEATURE_OPENXR_INTERACTION_FRAME: ${XRT_FEATURE_OPENXR_INTERACTION_FRAME}")
message(STATUS "# FEATURE_OPENXR_INTERACTION_KHR_GENERIC: ${XRT_FEATURE_OPENXR_INTERACTION_KHR_GENERIC}")
message(STATUS "# FEATURE_OPENXR_INTERACTION_LOGITECH_MX_INK: ${XRT_FEATURE_OPENXR_INTERACTION_LOGITECH_MX_INK}")
message(STATUS "# FEATURE_OPENXR_INTERACTION_ML2: ${XRT_FEATURE_OPENXR_INTERACTION_ML2}")
diff --git a/cmake/MonadoSetOptions.cmake b/cmake/MonadoSetOptions.cmake
index 8f7fa6f85..a53089d7a 100644
--- a/cmake/MonadoSetOptions.cmake
+++ b/cmake/MonadoSetOptions.cmake
@@ -134,6 +134,7 @@ function(monado_set_options)
XRT_FEATURE_OPENXR_INTERACTION_EXT_HAND
XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE
XRT_FEATURE_OPENXR_INTERACTION_FB_PROXIMITY
+ XRT_FEATURE_OPENXR_INTERACTION_FRAME
XRT_FEATURE_OPENXR_INTERACTION_KHR_GENERIC
XRT_FEATURE_OPENXR_INTERACTION_ML2
XRT_FEATURE_OPENXR_INTERACTION_MNDX
diff --git a/src/external/openxr_includes/openxr/XR_VALVE_frame_controller_interaction.h b/src/external/openxr_includes/openxr/XR_VALVE_frame_controller_interaction.h
new file mode 100644
index 000000000..d67826910
--- /dev/null
+++ b/src/external/openxr_includes/openxr/XR_VALVE_frame_controller_interaction.h
@@ -0,0 +1,25 @@
+// Copyright 2026, Collabora, Ltd.
+// SPDX-License-Identifier: BSL-1.0
+/*!
+ * @file
+ * @brief Preview header for XR_VALVE_frame_controller_interaction extension
+ * @ingroup external_openxr
+ */
+#ifndef XR_VALVE_FRAME_CONTROLLER_INTERACTION_H
+#define XR_VALVE_FRAME_CONTROLLER_INTERACTION_H 1
+
+#include <openxr/openxr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define XR_VALVE_frame_controller_interaction 1
+#define XR_VALVE_frame_controller_interaction_SPEC_VERSION 1
+#define XR_VALVE_FRAME_CONTROLLER_INTERACTION_EXTENSION_NAME "XR_VALVE_frame_controller_interaction"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/xrt/auxiliary/bindings/bindings.json b/src/xrt/auxiliary/bindings/bindings.json
index 462ffbf43..dbb0129a3 100644
--- a/src/xrt/auxiliary/bindings/bindings.json
+++ b/src/xrt/auxiliary/bindings/bindings.json
@@ -3258,6 +3258,263 @@
}
},
+ "/interaction_profiles/valve/frame_controller_valve": {
+ "title": "Steam Frame Controller",
+ "type": "tracked_controller",
+ "extension": "VALVE_frame_controller_interaction",
+ "monado_device": "XRT_DEVICE_FRAME_CONTROLLER",
+ "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"],
+ "subaction_paths": [
+ "/user/hand/left",
+ "/user/hand/right"
+ ],
+ "subpaths": {
+ "/input/a": {
+ "type": "button",
+ "localized_name": "A",
+ "components": ["click", "touch"],
+ "side": "right",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_A_CLICK",
+ "touch": "XRT_INPUT_FRAME_A_TOUCH"
+ }
+ },
+ "/input/b": {
+ "type": "button",
+ "localized_name": "B",
+ "components": ["click", "touch"],
+ "side": "right",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_B_CLICK",
+ "touch": "XRT_INPUT_FRAME_B_TOUCH"
+ }
+ },
+ "/input/x": {
+ "type": "button",
+ "localized_name": "X",
+ "components": ["click", "touch"],
+ "side": "right",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_X_CLICK",
+ "touch": "XRT_INPUT_FRAME_X_TOUCH"
+ }
+ },
+ "/input/y": {
+ "type": "button",
+ "localized_name": "Y",
+ "components": ["click", "touch"],
+ "side": "right",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_Y_CLICK",
+ "touch": "XRT_INPUT_FRAME_Y_TOUCH"
+ }
+ },
+ "/input/menu": {
+ "type": "button",
+ "localized_name": "Menu",
+ "components": ["click", "touch"],
+ "side": "right",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_MENU_CLICK",
+ "touch": "XRT_INPUT_FRAME_MENU_TOUCH"
+ }
+ },
+ "/input/system": {
+ "type": "button",
+ "localized_name": "System",
+ "components": ["click", "touch"],
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_SYSTEM_CLICK",
+ "touch": "XRT_INPUT_FRAME_SYSTEM_TOUCH"
+ }
+ },
+ "/input/bumper": {
+ "type": "button",
+ "localized_name": "Bumper",
+ "components": ["click", "touch"],
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_BUMPER_CLICK",
+ "touch": "XRT_INPUT_FRAME_BUMPER_TOUCH"
+ }
+ },
+ "/input/squeeze": {
+ "type": "button",
+ "localized_name": "Squeeze",
+ "components": ["click", "touch", "value"],
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_SQUEEZE_CLICK",
+ "touch": "XRT_INPUT_FRAME_SQUEEZE_TOUCH",
+ "value": "XRT_INPUT_FRAME_SQUEEZE_VALUE"
+ }
+ },
+ "/input/trigger": {
+ "type": "trigger",
+ "localized_name": "Trigger",
+ "components": ["click", "value", "touch"],
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_TRIGGER_CLICK",
+ "value": "XRT_INPUT_FRAME_TRIGGER_VALUE",
+ "touch": "XRT_INPUT_FRAME_TRIGGER_TOUCH"
+ }
+ },
+ "/input/thumbstick": {
+ "type": "joystick",
+ "localized_name": "Thumbstick",
+ "components": ["click", "touch", "position"],
+ "dpad_emulation": {
+ "position": "position",
+ "activate": "click",
+ "center": true
+ },
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_THUMBSTICK_CLICK",
+ "touch": "XRT_INPUT_FRAME_THUMBSTICK_TOUCH",
+ "position": "XRT_INPUT_FRAME_THUMBSTICK"
+ }
+ },
+ "/input/grip": {
+ "type": "pose",
+ "localized_name": "Grip",
+ "components": ["pose"],
+ "monado_bindings": {
+ "pose": "XRT_INPUT_FRAME_GRIP_POSE"
+ }
+ },
+ "/input/aim": {
+ "type": "pose",
+ "localized_name": "Aim",
+ "components": ["pose"],
+ "monado_bindings": {
+ "pose": "XRT_INPUT_FRAME_AIM_POSE"
+ }
+ },
+ "/input/dpad_up": {
+ "type": "button",
+ "localized_name": "D-Pad Up",
+ "components": ["click", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_DPAD_UP_CLICK",
+ "touch": "XRT_INPUT_FRAME_DPAD_UP_TOUCH"
+ }
+ },
+ "/input/dpad_down": {
+ "type": "button",
+ "localized_name": "D-Pad Down",
+ "components": ["click", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_DPAD_DOWN_CLICK",
+ "touch": "XRT_INPUT_FRAME_DPAD_DOWN_TOUCH"
+ }
+ },
+ "/input/dpad_left": {
+ "type": "button",
+ "localized_name": "D-Pad Left",
+ "components": ["click", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_DPAD_LEFT_CLICK",
+ "touch": "XRT_INPUT_FRAME_DPAD_LEFT_TOUCH"
+ }
+ },
+ "/input/dpad_right": {
+ "type": "button",
+ "localized_name": "D-Pad Right",
+ "components": ["click", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_DPAD_RIGHT_CLICK",
+ "touch": "XRT_INPUT_FRAME_DPAD_RIGHT_TOUCH"
+ }
+ },
+ "/input/view": {
+ "type": "button",
+ "localized_name": "View",
+ "components": ["click", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_VIEW_CLICK",
+ "touch": "XRT_INPUT_FRAME_VIEW_TOUCH"
+ }
+ },
+ "/input/bumper_left": {
+ "type": "button",
+ "localized_name": "Bumper",
+ "components": ["click", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_BUMPER_CLICK",
+ "touch": "XRT_INPUT_FRAME_BUMPER_TOUCH"
+ }
+ },
+ "/input/squeeze_left": {
+ "type": "button",
+ "localized_name": "Squeeze",
+ "components": ["click", "touch", "value"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_SQUEEZE_CLICK",
+ "touch": "XRT_INPUT_FRAME_SQUEEZE_TOUCH",
+ "value": "XRT_INPUT_FRAME_SQUEEZE_VALUE"
+ }
+ },
+ "/input/trigger_left": {
+ "type": "trigger",
+ "localized_name": "Trigger",
+ "components": ["click", "value", "touch"],
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_TRIGGER_CLICK",
+ "value": "XRT_INPUT_FRAME_TRIGGER_VALUE",
+ "touch": "XRT_INPUT_FRAME_TRIGGER_TOUCH"
+ }
+ },
+ "/input/thumbstick_left": {
+ "type": "joystick",
+ "localized_name": "Thumbstick",
+ "components": ["click", "touch", "position"],
+ "dpad_emulation": {
+ "position": "position",
+ "activate": "click",
+ "center": true
+ },
+ "side": "left",
+ "monado_bindings": {
+ "click": "XRT_INPUT_FRAME_THUMBSTICK_CLICK",
+ "touch": "XRT_INPUT_FRAME_THUMBSTICK_TOUCH",
+ "position": "XRT_INPUT_FRAME_THUMBSTICK"
+ }
+ },
+ "/input/grip_left": {
+ "type": "pose",
+ "localized_name": "Grip",
+ "components": ["pose"],
+ "side": "left",
+ "monado_bindings": {
+ "pose": "XRT_INPUT_FRAME_GRIP_POSE"
+ }
+ },
+ "/input/aim_left": {
+ "type": "pose",
+ "localized_name": "Aim",
+ "components": ["pose"],
+ "side": "left",
+ "monado_bindings": {
+ "pose": "XRT_INPUT_FRAME_AIM_POSE"
+ }
+ },
+ "/output/haptic": {
+ "type": "vibration",
+ "localized_name": "Haptic",
+ "components": ["haptic"],
+ "monado_bindings": {
+ "haptic": "XRT_OUTPUT_NAME_FRAME_HAPTIC"
+ }
+ }
+ }
+ },
+
"/interaction_profiles/facebook/touch_controller_pro": {
"title": "Meta Quest Touch Pro Controller",
"type": "tracked_controller",
diff --git a/src/xrt/include/xrt/xrt_config_build.h.cmake_in b/src/xrt/include/xrt/xrt_config_build.h.cmake_in
index 873b15b0a..81c547b90 100644
--- a/src/xrt/include/xrt/xrt_config_build.h.cmake_in
+++ b/src/xrt/include/xrt/xrt_config_build.h.cmake_in
@@ -75,6 +75,7 @@
#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_EXT_HAND
#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE
#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_FB_PROXIMITY
+#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_FRAME
#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_KHR_GENERIC
#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_LOGITECH_MX_INK
#cmakedefine XRT_FEATURE_OPENXR_INTERACTION_ML2
diff --git a/src/xrt/include/xrt/xrt_defines.h b/src/xrt/include/xrt/xrt_defines.h
index a5c5bd65f..404f617c9 100644
--- a/src/xrt/include/xrt/xrt_defines.h
+++ b/src/xrt/include/xrt/xrt_defines.h
@@ -832,6 +832,9 @@ enum xrt_device_name
XRT_DEVICE_TOUCH_CONTROLLER_QUEST_1_RIFT_S,
XRT_DEVICE_TOUCH_CONTROLLER_QUEST_2,
+ //! XR_VALVE_frame_controller_interaction
+ XRT_DEVICE_FRAME_CONTROLLER,
+
// XR_KHR_generic_controller
XRT_DEVICE_GENERIC_CONTROLLER,
@@ -1443,6 +1446,48 @@ enum xrt_input_name
XRT_INPUT_MAGNETRA2_GRIP_POSE = XRT_INPUT_NAME(0X150B, POSE),
XRT_INPUT_MAGNETRA2_AIM_POSE = XRT_INPUT_NAME(0X150C, POSE),
+ // XR_VALVE_frame_controller_interaction
+ // Right controller: a, b, x, y, menu
+ XRT_INPUT_FRAME_A_CLICK = XRT_INPUT_NAME(0x1600, BOOLEAN),
+ XRT_INPUT_FRAME_A_TOUCH = XRT_INPUT_NAME(0x1601, BOOLEAN),
+ XRT_INPUT_FRAME_B_CLICK = XRT_INPUT_NAME(0x1602, BOOLEAN),
+ XRT_INPUT_FRAME_B_TOUCH = XRT_INPUT_NAME(0x1603, BOOLEAN),
+ XRT_INPUT_FRAME_X_CLICK = XRT_INPUT_NAME(0x1604, BOOLEAN),
+ XRT_INPUT_FRAME_X_TOUCH = XRT_INPUT_NAME(0x1605, BOOLEAN),
+ XRT_INPUT_FRAME_Y_CLICK = XRT_INPUT_NAME(0x1606, BOOLEAN),
+ XRT_INPUT_FRAME_Y_TOUCH = XRT_INPUT_NAME(0x1607, BOOLEAN),
+ XRT_INPUT_FRAME_MENU_CLICK = XRT_INPUT_NAME(0x1608, BOOLEAN),
+ XRT_INPUT_FRAME_MENU_TOUCH = XRT_INPUT_NAME(0x1609, BOOLEAN),
+
+ // Left controller: dpad, view
+ XRT_INPUT_FRAME_DPAD_UP_CLICK = XRT_INPUT_NAME(0x160A, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_UP_TOUCH = XRT_INPUT_NAME(0x160B, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_DOWN_CLICK = XRT_INPUT_NAME(0x160C, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_DOWN_TOUCH = XRT_INPUT_NAME(0x160D, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_LEFT_CLICK = XRT_INPUT_NAME(0x160E, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_LEFT_TOUCH = XRT_INPUT_NAME(0x160F, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_RIGHT_CLICK = XRT_INPUT_NAME(0x1610, BOOLEAN),
+ XRT_INPUT_FRAME_DPAD_RIGHT_TOUCH = XRT_INPUT_NAME(0x1611, BOOLEAN),
+ XRT_INPUT_FRAME_VIEW_CLICK = XRT_INPUT_NAME(0x1612, BOOLEAN),
+ XRT_INPUT_FRAME_VIEW_TOUCH = XRT_INPUT_NAME(0x1613, BOOLEAN),
+
+ // Both: system, bumper, squeeze, trigger, thumbstick
+ XRT_INPUT_FRAME_SYSTEM_CLICK = XRT_INPUT_NAME(0x1614, BOOLEAN),
+ XRT_INPUT_FRAME_SYSTEM_TOUCH = XRT_INPUT_NAME(0x1615, BOOLEAN),
+ XRT_INPUT_FRAME_BUMPER_CLICK = XRT_INPUT_NAME(0x1616, BOOLEAN),
+ XRT_INPUT_FRAME_BUMPER_TOUCH = XRT_INPUT_NAME(0x1617, BOOLEAN),
+ XRT_INPUT_FRAME_SQUEEZE_CLICK = XRT_INPUT_NAME(0x1618, BOOLEAN),
+ XRT_INPUT_FRAME_SQUEEZE_TOUCH = XRT_INPUT_NAME(0x1619, BOOLEAN),
+ XRT_INPUT_FRAME_SQUEEZE_VALUE = XRT_INPUT_NAME(0x161A, VEC1_ZERO_TO_ONE),
+ XRT_INPUT_FRAME_TRIGGER_CLICK = XRT_INPUT_NAME(0x161B, BOOLEAN),
+ XRT_INPUT_FRAME_TRIGGER_TOUCH = XRT_INPUT_NAME(0x161C, BOOLEAN),
+ XRT_INPUT_FRAME_TRIGGER_VALUE = XRT_INPUT_NAME(0x161D, VEC1_ZERO_TO_ONE),
+ XRT_INPUT_FRAME_THUMBSTICK_CLICK = XRT_INPUT_NAME(0x161E, BOOLEAN),
+ XRT_INPUT_FRAME_THUMBSTICK_TOUCH = XRT_INPUT_NAME(0x161F, BOOLEAN),
+ XRT_INPUT_FRAME_THUMBSTICK = XRT_INPUT_NAME(0x1620, VEC2_MINUS_ONE_TO_ONE),
+ XRT_INPUT_FRAME_GRIP_POSE = XRT_INPUT_NAME(0x1621, POSE),
+ XRT_INPUT_FRAME_AIM_POSE = XRT_INPUT_NAME(0x1622, POSE),
+
// clang-format on
};
@@ -1681,6 +1726,9 @@ enum xrt_output_name
XRT_OUTPUT_NAME_CONTACTGLOVE2_HAPTIC = XRT_OUTPUT_NAME(0x0C00, VIBRATION),
+ //! XR_VALVE_frame_controller_interaction
+ XRT_OUTPUT_NAME_FRAME_HAPTIC = XRT_OUTPUT_NAME(0x0D00, VIBRATION),
+
// clang-format on
// Make sure to add a trailing comma to any new entries.
};
diff --git a/src/xrt/include/xrt/xrt_openxr_includes.h b/src/xrt/include/xrt/xrt_openxr_includes.h
index e92948fb8..78f73a26c 100644
--- a/src/xrt/include/xrt/xrt_openxr_includes.h
+++ b/src/xrt/include/xrt/xrt_openxr_includes.h
@@ -75,3 +75,4 @@ typedef __eglMustCastToProperFunctionPointerType (*PFNEGLGETPROCADDRESSPROC)(con
#include "openxr/XR_MNDX_flipvr.h"
#include "openxr/XR_MND_query_egl_device.h"
#include "openxr/XR_MND_contactglove2_interaction.h"
+#include "openxr/XR_VALVE_frame_controller_interaction.h"
diff --git a/src/xrt/state_trackers/oxr/extension_support/oxr_extension_support.py b/src/xrt/state_trackers/oxr/extension_support/oxr_extension_support.py
index e9be594f9..12b54fec4 100644
--- a/src/xrt/state_trackers/oxr/extension_support/oxr_extension_support.py
+++ b/src/xrt/state_trackers/oxr/extension_support/oxr_extension_support.py
@@ -116,6 +116,7 @@ EXTENSIONS = (
['XR_MSFT_unbounded_reference_space', 'XRT_FEATURE_OPENXR_SPACE_UNBOUNDED'],
['XR_OPPO_controller_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_OPPO'],
['XR_VARJO_quad_views', 'XRT_FEATURE_OPENXR_VARJO_QUAD_VIEWS'],
+ ['XR_VALVE_frame_controller_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_FRAME'],
# Experimental extensions, sorted alphabetically.
['XR_EXTX_overlay', 'XRT_FEATURE_OPENXR_OVERLAY'],
['XR_HTCX_vive_tracker_interaction', 'ALWAYS_DISABLED'],
--
2.55.0
+182 -41
View File
@@ -19,6 +19,7 @@
*/
#include "wivrn_controller.h"
#include "configuration.h"
#include "driver/xrt_cast.h"
#include "utils/method.h"
@@ -52,38 +53,48 @@ enum wivrn_controller_input_index
WIVRN_CONTROLLER_HAND_TRACKING_LEFT,
WIVRN_CONTROLLER_HAND_TRACKING_RIGHT = WIVRN_CONTROLLER_HAND_TRACKING_LEFT,
WIVRN_CONTROLLER_MENU_CLICK, // /user/hand/left/input/menu/click
WIVRN_CONTROLLER_SYSTEM_CLICK // /user/hand/right/input/system/click
= WIVRN_CONTROLLER_MENU_CLICK, //
WIVRN_CONTROLLER_A_CLICK, // /user/hand/right/input/a/click
WIVRN_CONTROLLER_A_TOUCH, // /user/hand/right/input/a/touch
WIVRN_CONTROLLER_B_CLICK, // /user/hand/right/input/b/click
WIVRN_CONTROLLER_B_TOUCH, // /user/hand/right/input/b/touch
WIVRN_CONTROLLER_X_CLICK = WIVRN_CONTROLLER_A_CLICK, // /user/hand/left/input/x/click
WIVRN_CONTROLLER_X_TOUCH = WIVRN_CONTROLLER_A_TOUCH, // /user/hand/left/input/x/touch
WIVRN_CONTROLLER_Y_CLICK = WIVRN_CONTROLLER_B_CLICK, // /user/hand/left/input/y/click
WIVRN_CONTROLLER_Y_TOUCH = WIVRN_CONTROLLER_B_TOUCH, // /user/hand/left/input/y/touch
WIVRN_CONTROLLER_SQUEEZE_CLICK, // /user/hand/XXXX/input/squeeze/click
WIVRN_CONTROLLER_SQUEEZE_FORCE, // /user/hand/XXXX/input/squeeze/force
WIVRN_CONTROLLER_SQUEEZE_VALUE, // /user/hand/XXXX/input/squeeze/value
WIVRN_CONTROLLER_TRIGGER_CLICK, // /user/hand/XXXX/input/trigger/click
WIVRN_CONTROLLER_TRIGGER_VALUE, // /user/hand/XXXX/input/trigger/value
WIVRN_CONTROLLER_TRIGGER_TOUCH, // /user/hand/XXXX/input/trigger/touch
WIVRN_CONTROLLER_TRIGGER_PROXIMITY, // /user/hand/XXXX/input/trigger/proximity
WIVRN_CONTROLLER_TRIGGER_CURL, // /user/hand/XXXX/input/trigger/curl_fb
WIVRN_CONTROLLER_TRIGGER_SLIDE, // /user/hand/XXXX/input/trigger/slide_fb
WIVRN_CONTROLLER_TRIGGER_FORCE, // /user/hand/XXXX/input/trigger/force
WIVRN_CONTROLLER_THUMBSTICK, // /user/hand/XXXX/input/thumbstick/{x,y}
WIVRN_CONTROLLER_THUMBSTICK_CLICK, // /user/hand/XXXX/input/thumbstick/click
WIVRN_CONTROLLER_THUMBSTICK_TOUCH, // /user/hand/XXXX/input/thumbstick/touch
WIVRN_CONTROLLER_THUMBREST_TOUCH, // /user/hand/XXXX/input/thumbrest/touch
WIVRN_CONTROLLER_THUMBREST_FORCE, // /user/hand/XXXX/input/thumbrest/force
WIVRN_CONTROLLER_THUMB_PROXIMITY, // /user/hand/XXXX/input/thumb_resting_surfaces/proximity
WIVRN_CONTROLLER_TRACKPAD, // /user/hand/XXXX/input/trackpad/{x,y}
WIVRN_CONTROLLER_TRACKPAD_CLICK, // /user/hand/XXXX/input/trackpad/click
WIVRN_CONTROLLER_TRACKPAD_FORCE, // /user/hand/XXXX/input/trackpad/force
WIVRN_CONTROLLER_TRACKPAD_TOUCH, // /user/hand/XXXX/input/trackpad/touch
WIVRN_CONTROLLER_STYLUS_FORCE, // /user/hand/XXXX/input/stylus_fb/force
WIVRN_CONTROLLER_MENU_CLICK, // /user/hand/XXXX/input/menu/click
WIVRN_CONTROLLER_MENU_TOUCH, // /user/hand/XXXX/input/menu/touch
WIVRN_CONTROLLER_SYSTEM_CLICK, // /user/hand/XXXX/input/system/click
WIVRN_CONTROLLER_SYSTEM_TOUCH, // /user/hand/XXXX/input/system/touch
WIVRN_CONTROLLER_VIEW_CLICK, // /user/hand/left/input/view/click
WIVRN_CONTROLLER_VIEW_TOUCH, // /user/hand/left/input/view/touch
WIVRN_CONTROLLER_A_CLICK, // /user/hand/right/input/a/click
WIVRN_CONTROLLER_A_TOUCH, // /user/hand/right/input/a/touch
WIVRN_CONTROLLER_B_CLICK, // /user/hand/right/input/b/click
WIVRN_CONTROLLER_B_TOUCH, // /user/hand/right/input/b/touch
WIVRN_CONTROLLER_X_CLICK, // /user/hand/XXXX/input/x/click
WIVRN_CONTROLLER_X_TOUCH, // /user/hand/XXXX/input/x/touch
WIVRN_CONTROLLER_Y_CLICK, // /user/hand/XXXX/input/y/click
WIVRN_CONTROLLER_Y_TOUCH, // /user/hand/XXXX/input/y/touch
WIVRN_CONTROLLER_DPAD_UP_CLICK, // /user/hand/XXXX/input/dpad_up/click
WIVRN_CONTROLLER_DPAD_UP_TOUCH, // /user/hand/XXXX/input/dpad_up/touch
WIVRN_CONTROLLER_DPAD_LEFT_CLICK, // /user/hand/XXXX/input/dpad_left/click
WIVRN_CONTROLLER_DPAD_LEFT_TOUCH, // /user/hand/XXXX/input/dpad_left/touch
WIVRN_CONTROLLER_SQUEEZE_CLICK, // /user/hand/XXXX/input/squeeze/click
WIVRN_CONTROLLER_SQUEEZE_FORCE, // /user/hand/XXXX/input/squeeze/force
WIVRN_CONTROLLER_SQUEEZE_TOUCH, // /user/hand/XXXX/input/squeeze/touch
WIVRN_CONTROLLER_SQUEEZE_VALUE, // /user/hand/XXXX/input/squeeze/value
WIVRN_CONTROLLER_TRIGGER_CLICK, // /user/hand/XXXX/input/trigger/click
WIVRN_CONTROLLER_TRIGGER_VALUE, // /user/hand/XXXX/input/trigger/value
WIVRN_CONTROLLER_TRIGGER_TOUCH, // /user/hand/XXXX/input/trigger/touch
WIVRN_CONTROLLER_TRIGGER_PROXIMITY, // /user/hand/XXXX/input/trigger/proximity
WIVRN_CONTROLLER_TRIGGER_CURL, // /user/hand/XXXX/input/trigger/curl_fb
WIVRN_CONTROLLER_TRIGGER_SLIDE, // /user/hand/XXXX/input/trigger/slide_fb
WIVRN_CONTROLLER_TRIGGER_FORCE, // /user/hand/XXXX/input/trigger/force
WIVRN_CONTROLLER_BUMPER_CLICK, // /user/hand/XXXX/input/bumper/click
WIVRN_CONTROLLER_BUMPER_TOUCH, // /user/hand/XXXX/input/bumper/touch
WIVRN_CONTROLLER_THUMBSTICK, // /user/hand/XXXX/input/thumbstick/{x,y}
WIVRN_CONTROLLER_THUMBSTICK_CLICK, // /user/hand/XXXX/input/thumbstick/click
WIVRN_CONTROLLER_THUMBSTICK_TOUCH, // /user/hand/XXXX/input/thumbstick/touch
WIVRN_CONTROLLER_THUMBREST_TOUCH, // /user/hand/XXXX/input/thumbrest/touch
WIVRN_CONTROLLER_THUMBREST_FORCE, // /user/hand/XXXX/input/thumbrest/force
WIVRN_CONTROLLER_THUMB_PROXIMITY, // /user/hand/XXXX/input/thumb_resting_surfaces/proximity
WIVRN_CONTROLLER_TRACKPAD, // /user/hand/XXXX/input/trackpad/{x,y}
WIVRN_CONTROLLER_TRACKPAD_CLICK, // /user/hand/XXXX/input/trackpad/click
WIVRN_CONTROLLER_TRACKPAD_FORCE, // /user/hand/XXXX/input/trackpad/force
WIVRN_CONTROLLER_TRACKPAD_TOUCH, // /user/hand/XXXX/input/trackpad/touch
WIVRN_CONTROLLER_STYLUS_FORCE, // /user/hand/XXXX/input/stylus_fb/force
// XR_EXT_hand_interaction
WIVRN_CONTROLLER_PINCH_POSE, // /user/hand/XXXX/input/pinch_ext/pose
@@ -139,26 +150,62 @@ input_data map_input(device_id id)
return {WIVRN_CONTROLLER_PALM_POSE, wivrn_input_type::POSE, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_PALM:
return {WIVRN_CONTROLLER_PALM_POSE, wivrn_input_type::POSE, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::X_CLICK:
case device_id::LEFT_X_CLICK:
return {WIVRN_CONTROLLER_X_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::LEFT_X_TOUCH:
return {WIVRN_CONTROLLER_X_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::LEFT_Y_CLICK:
return {WIVRN_CONTROLLER_Y_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::LEFT_Y_TOUCH:
return {WIVRN_CONTROLLER_Y_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_X_CLICK:
return {WIVRN_CONTROLLER_X_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::RIGHT_X_TOUCH:
return {WIVRN_CONTROLLER_X_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::RIGHT_Y_CLICK:
return {WIVRN_CONTROLLER_Y_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::RIGHT_Y_TOUCH:
return {WIVRN_CONTROLLER_Y_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::A_CLICK:
return {WIVRN_CONTROLLER_A_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::X_TOUCH:
return {WIVRN_CONTROLLER_X_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::A_TOUCH:
return {WIVRN_CONTROLLER_A_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::Y_CLICK:
return {WIVRN_CONTROLLER_Y_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::B_CLICK:
return {WIVRN_CONTROLLER_B_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::Y_TOUCH:
return {WIVRN_CONTROLLER_Y_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::B_TOUCH:
return {WIVRN_CONTROLLER_B_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::MENU_CLICK:
case device_id::DPAD_UP_CLICK:
return {WIVRN_CONTROLLER_DPAD_UP_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::DPAD_UP_TOUCH:
return {WIVRN_CONTROLLER_DPAD_UP_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::DPAD_LEFT_CLICK:
return {WIVRN_CONTROLLER_DPAD_LEFT_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::DPAD_LEFT_TOUCH:
return {WIVRN_CONTROLLER_DPAD_LEFT_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::LEFT_MENU_CLICK:
return {WIVRN_CONTROLLER_MENU_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::SYSTEM_CLICK:
case device_id::RIGHT_MENU_CLICK:
return {WIVRN_CONTROLLER_MENU_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::RIGHT_MENU_TOUCH:
return {WIVRN_CONTROLLER_MENU_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::LEFT_SYSTEM_TOUCH:
return {WIVRN_CONTROLLER_SYSTEM_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::VIEW_CLICK:
return {WIVRN_CONTROLLER_VIEW_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::VIEW_TOUCH:
return {WIVRN_CONTROLLER_VIEW_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_SYSTEM_CLICK:
return {WIVRN_CONTROLLER_SYSTEM_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::RIGHT_SYSTEM_TOUCH:
return {WIVRN_CONTROLLER_SYSTEM_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::LEFT_BUMPER_CLICK:
return {WIVRN_CONTROLLER_BUMPER_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::LEFT_BUMPER_TOUCH:
return {WIVRN_CONTROLLER_BUMPER_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_BUMPER_CLICK:
return {WIVRN_CONTROLLER_BUMPER_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::RIGHT_BUMPER_TOUCH:
return {WIVRN_CONTROLLER_BUMPER_TOUCH, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::LEFT_SQUEEZE_VALUE:
return {WIVRN_CONTROLLER_SQUEEZE_VALUE, wivrn_input_type::FLOAT, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_SQUEEZE_VALUE:
@@ -199,6 +246,10 @@ input_data map_input(device_id id)
return {WIVRN_CONTROLLER_SQUEEZE_FORCE, wivrn_input_type::FLOAT, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_SQUEEZE_FORCE:
return {WIVRN_CONTROLLER_SQUEEZE_FORCE, wivrn_input_type::FLOAT, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::LEFT_SQUEEZE_TOUCH:
return {WIVRN_CONTROLLER_SQUEEZE_TOUCH, wivrn_input_type::FLOAT, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_SQUEEZE_TOUCH:
return {WIVRN_CONTROLLER_SQUEEZE_TOUCH, wivrn_input_type::FLOAT, XRT_DEVICE_TYPE_RIGHT_HAND_CONTROLLER};
case device_id::LEFT_TRIGGER_CLICK:
return {WIVRN_CONTROLLER_TRIGGER_CLICK, wivrn_input_type::BOOL, XRT_DEVICE_TYPE_LEFT_HAND_CONTROLLER};
case device_id::RIGHT_TRIGGER_CLICK:
@@ -352,6 +403,66 @@ xrt_binding_input_pair index_input_binding_right[] = {
{XRT_INPUT_HAND_POKE_POSE, XRT_INPUT_HAND_POKE_POSE},
};
xrt_binding_input_pair frame_input_binding_left[] = {
{XRT_INPUT_FRAME_DPAD_UP_CLICK, XRT_INPUT_FRAME_DPAD_UP_CLICK},
{XRT_INPUT_FRAME_DPAD_UP_TOUCH, XRT_INPUT_FRAME_DPAD_UP_TOUCH},
{XRT_INPUT_FRAME_DPAD_DOWN_CLICK, XRT_INPUT_TOUCH_X_CLICK},
{XRT_INPUT_FRAME_DPAD_DOWN_TOUCH, XRT_INPUT_TOUCH_X_TOUCH},
{XRT_INPUT_FRAME_DPAD_LEFT_CLICK, XRT_INPUT_TOUCH_Y_CLICK},
{XRT_INPUT_FRAME_DPAD_LEFT_TOUCH, XRT_INPUT_TOUCH_Y_TOUCH},
{XRT_INPUT_FRAME_DPAD_RIGHT_CLICK, XRT_INPUT_FRAME_DPAD_RIGHT_CLICK},
{XRT_INPUT_FRAME_DPAD_RIGHT_TOUCH, XRT_INPUT_FRAME_DPAD_RIGHT_TOUCH},
{XRT_INPUT_FRAME_VIEW_CLICK, XRT_INPUT_FRAME_VIEW_CLICK},
{XRT_INPUT_FRAME_VIEW_TOUCH, XRT_INPUT_FRAME_VIEW_TOUCH},
{XRT_INPUT_FRAME_SYSTEM_CLICK, XRT_INPUT_TOUCH_MENU_CLICK},
{XRT_INPUT_FRAME_SYSTEM_TOUCH, XRT_INPUT_INDEX_SYSTEM_TOUCH},
{XRT_INPUT_FRAME_BUMPER_CLICK, XRT_INPUT_FRAME_BUMPER_CLICK},
{XRT_INPUT_FRAME_BUMPER_TOUCH, XRT_INPUT_FRAME_BUMPER_TOUCH},
{XRT_INPUT_FRAME_SQUEEZE_CLICK, XRT_INPUT_VIVE_FOCUS3_SQUEEZE_CLICK},
{XRT_INPUT_FRAME_SQUEEZE_TOUCH, XRT_INPUT_FRAME_SQUEEZE_TOUCH},
{XRT_INPUT_FRAME_SQUEEZE_VALUE, XRT_INPUT_TOUCH_SQUEEZE_VALUE},
{XRT_INPUT_FRAME_TRIGGER_CLICK, XRT_INPUT_INDEX_TRIGGER_CLICK},
{XRT_INPUT_FRAME_TRIGGER_TOUCH, XRT_INPUT_TOUCH_TRIGGER_TOUCH},
{XRT_INPUT_FRAME_TRIGGER_VALUE, XRT_INPUT_TOUCH_TRIGGER_VALUE},
{XRT_INPUT_FRAME_THUMBSTICK_CLICK, XRT_INPUT_TOUCH_THUMBSTICK_CLICK},
{XRT_INPUT_FRAME_THUMBSTICK_TOUCH, XRT_INPUT_TOUCH_THUMBSTICK_TOUCH},
{XRT_INPUT_FRAME_THUMBSTICK, XRT_INPUT_TOUCH_THUMBSTICK},
{XRT_INPUT_FRAME_GRIP_POSE, XRT_INPUT_TOUCH_GRIP_POSE},
{XRT_INPUT_FRAME_AIM_POSE, XRT_INPUT_TOUCH_AIM_POSE},
};
xrt_binding_input_pair frame_input_binding_right[] = {
{XRT_INPUT_FRAME_A_CLICK, XRT_INPUT_TOUCH_A_CLICK},
{XRT_INPUT_FRAME_A_TOUCH, XRT_INPUT_TOUCH_A_TOUCH},
{XRT_INPUT_FRAME_B_CLICK, XRT_INPUT_TOUCH_B_CLICK},
{XRT_INPUT_FRAME_B_TOUCH, XRT_INPUT_TOUCH_B_TOUCH},
{XRT_INPUT_FRAME_X_CLICK, XRT_INPUT_FRAME_X_CLICK},
{XRT_INPUT_FRAME_X_TOUCH, XRT_INPUT_FRAME_X_TOUCH},
{XRT_INPUT_FRAME_Y_CLICK, XRT_INPUT_FRAME_Y_CLICK},
{XRT_INPUT_FRAME_Y_TOUCH, XRT_INPUT_FRAME_Y_TOUCH},
{XRT_INPUT_FRAME_MENU_CLICK, XRT_INPUT_FRAME_MENU_CLICK},
{XRT_INPUT_FRAME_MENU_TOUCH, XRT_INPUT_FRAME_MENU_TOUCH},
{XRT_INPUT_FRAME_SYSTEM_CLICK, XRT_INPUT_TOUCH_SYSTEM_CLICK},
{XRT_INPUT_FRAME_SYSTEM_TOUCH, XRT_INPUT_INDEX_SYSTEM_TOUCH},
{XRT_INPUT_FRAME_BUMPER_CLICK, XRT_INPUT_FRAME_BUMPER_CLICK},
{XRT_INPUT_FRAME_BUMPER_TOUCH, XRT_INPUT_FRAME_BUMPER_TOUCH},
{XRT_INPUT_FRAME_SQUEEZE_CLICK, XRT_INPUT_VIVE_FOCUS3_SQUEEZE_CLICK},
{XRT_INPUT_FRAME_SQUEEZE_TOUCH, XRT_INPUT_FRAME_SQUEEZE_TOUCH},
{XRT_INPUT_FRAME_SQUEEZE_VALUE, XRT_INPUT_TOUCH_SQUEEZE_VALUE},
{XRT_INPUT_FRAME_TRIGGER_CLICK, XRT_INPUT_INDEX_TRIGGER_CLICK},
{XRT_INPUT_FRAME_TRIGGER_TOUCH, XRT_INPUT_TOUCH_TRIGGER_TOUCH},
{XRT_INPUT_FRAME_TRIGGER_VALUE, XRT_INPUT_TOUCH_TRIGGER_VALUE},
{XRT_INPUT_FRAME_THUMBSTICK_CLICK, XRT_INPUT_TOUCH_THUMBSTICK_CLICK},
{XRT_INPUT_FRAME_THUMBSTICK_TOUCH, XRT_INPUT_TOUCH_THUMBSTICK_TOUCH},
{XRT_INPUT_FRAME_THUMBSTICK, XRT_INPUT_TOUCH_THUMBSTICK},
{XRT_INPUT_FRAME_GRIP_POSE, XRT_INPUT_TOUCH_GRIP_POSE},
{XRT_INPUT_FRAME_AIM_POSE, XRT_INPUT_TOUCH_AIM_POSE},
};
xrt_binding_output_pair frame_output_binding[] = {
{XRT_OUTPUT_NAME_FRAME_HAPTIC, XRT_OUTPUT_NAME_FRAME_HAPTIC},
};
xrt_binding_output_pair index_output_binding[] = {
{XRT_OUTPUT_NAME_INDEX_HAPTIC, XRT_OUTPUT_NAME_TOUCH_HAPTIC},
};
@@ -516,6 +627,8 @@ make_binding_profiles()
{
constexpr auto & index_input_binding =
HandId == 0 ? index_input_binding_left : index_input_binding_right;
constexpr auto & frame_input_binding =
HandId == 0 ? frame_input_binding_left : frame_input_binding_right;
return std::to_array<xrt_binding_profile>({
{
.name = XRT_DEVICE_SIMPLE_CONTROLLER,
@@ -531,6 +644,13 @@ make_binding_profiles()
.outputs = index_output_binding,
.output_count = std::size(index_output_binding),
},
{
.name = XRT_DEVICE_FRAME_CONTROLLER,
.inputs = frame_input_binding,
.input_count = std::size(frame_input_binding),
.outputs = frame_output_binding,
.output_count = std::size(frame_output_binding),
},
{
.name = XRT_DEVICE_VIVE_FOCUS3_CONTROLLER,
.inputs = focus3_input_binding,
@@ -658,25 +778,41 @@ wivrn_controller::wivrn_controller(xrt_device_name name,
{
inputs[WIVRN_CONTROLLER_HAND_TRACKING_LEFT].name = XRT_INPUT_HT_UNOBSTRUCTED_LEFT;
inputs[WIVRN_CONTROLLER_HAND_TRACKING_LEFT].active = true;
SET_INPUT(FRAME, VIEW_CLICK);
SET_INPUT(FRAME, VIEW_TOUCH);
SET_INPUT(TOUCH, MENU_CLICK);
SET_INPUT(TOUCH, X_CLICK);
SET_INPUT(TOUCH, Y_CLICK);
SET_INPUT(TOUCH, X_TOUCH);
SET_INPUT(TOUCH, Y_TOUCH);
SET_INPUT(FRAME, DPAD_LEFT_CLICK);
SET_INPUT(FRAME, DPAD_LEFT_TOUCH);
SET_INPUT(FRAME, DPAD_UP_CLICK);
SET_INPUT(FRAME, DPAD_UP_TOUCH);
}
else
{
inputs[WIVRN_CONTROLLER_HAND_TRACKING_RIGHT].name = XRT_INPUT_HT_UNOBSTRUCTED_RIGHT;
inputs[WIVRN_CONTROLLER_HAND_TRACKING_RIGHT].active = true;
SET_INPUT(FRAME, MENU_CLICK);
SET_INPUT(FRAME, MENU_TOUCH);
SET_INPUT(TOUCH, SYSTEM_CLICK);
SET_INPUT(TOUCH, A_CLICK);
SET_INPUT(TOUCH, B_CLICK);
SET_INPUT(TOUCH, A_TOUCH);
SET_INPUT(TOUCH, B_TOUCH);
SET_INPUT(FRAME, X_CLICK);
SET_INPUT(FRAME, Y_CLICK);
SET_INPUT(FRAME, X_TOUCH);
SET_INPUT(FRAME, Y_TOUCH);
}
SET_INPUT(VIVE_FOCUS3, SQUEEZE_CLICK);
SET_INPUT(INDEX, SQUEEZE_FORCE);
SET_INPUT(TOUCH, SQUEEZE_VALUE);
SET_INPUT(FRAME, SQUEEZE_TOUCH);
SET_INPUT(INDEX, TRIGGER_CLICK);
SET_INPUT(TOUCH, TRIGGER_VALUE);
SET_INPUT(TOUCH, TRIGGER_TOUCH);
@@ -695,9 +831,13 @@ wivrn_controller::wivrn_controller(xrt_device_name name,
SET_INPUT(INDEX, TRACKPAD_FORCE);
SET_INPUT(INDEX, TRACKPAD_TOUCH);
SET_INPUT(TOUCH_PRO, STYLUS_FORCE);
SET_INPUT(FRAME, BUMPER_CLICK);
SET_INPUT(FRAME, BUMPER_TOUCH);
SET_INPUT(INDEX, SYSTEM_TOUCH);
outputs_array = {
{.name = XRT_OUTPUT_NAME_TOUCH_HAPTIC},
{.name = XRT_OUTPUT_NAME_FRAME_HAPTIC},
{.name = XRT_OUTPUT_NAME_TOUCH_PRO_HAPTIC_THUMB},
{.name = XRT_OUTPUT_NAME_TOUCH_PRO_HAPTIC_TRIGGER},
};
@@ -879,6 +1019,7 @@ xrt_result_t wivrn_controller::set_output(xrt_output_name name, const xrt_output
switch (name)
{
case XRT_OUTPUT_NAME_TOUCH_HAPTIC:
case XRT_OUTPUT_NAME_FRAME_HAPTIC:
id = left ? device_id::LEFT_CONTROLLER_HAPTIC : device_id::RIGHT_CONTROLLER_HAPTIC;
break;
case XRT_OUTPUT_NAME_TOUCH_PRO_HAPTIC_TRIGGER:
+2
View File
@@ -574,6 +574,8 @@ static xrt_device_name get_name(interaction_profile profile)
return XRT_DEVICE_SAMSUNG_ODYSSEY_CONTROLLER;
case interaction_profile::valve_index_controller:
return XRT_DEVICE_INDEX_CONTROLLER;
case interaction_profile::valve_frame_controller_valve:
return XRT_DEVICE_FRAME_CONTROLLER;
}
throw std::runtime_error("invalid interaction profile id " + std::to_string(int(profile)));
}