diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-22 12:52:07 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-22 12:52:07 +0200 |
| commit | bffaa98b1316cd7d509f157a6e6d5f52bbfbdd93 (patch) | |
| tree | 3e63cbbee3aa93c660a28af511aca7806d844c66 /modules/openxr/openxr_interface.h | |
| parent | e500046e006f43c8c86e621a9c5ec61bc330bb85 (diff) | |
| parent | 823ae7b3fa25832d1cd9d7613c650bfc712d1f49 (diff) | |
| download | redot-engine-bffaa98b1316cd7d509f157a6e6d5f52bbfbdd93.tar.gz | |
Merge pull request #90645 from Malcolmnixon/unified-xr-trackers
Rework XR Trackers to have a common ancestor
Diffstat (limited to 'modules/openxr/openxr_interface.h')
| -rw-r--r-- | modules/openxr/openxr_interface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/openxr/openxr_interface.h b/modules/openxr/openxr_interface.h index 737f22d642..e916c7dac2 100644 --- a/modules/openxr/openxr_interface.h +++ b/modules/openxr/openxr_interface.h @@ -35,8 +35,8 @@ #include "extensions/openxr_hand_tracking_extension.h" #include "openxr_api.h" +#include "servers/xr/xr_controller_tracker.h" #include "servers/xr/xr_interface.h" -#include "servers/xr/xr_positional_tracker.h" // declare some default strings #define INTERACTION_PROFILE_NONE "/interaction_profiles/none" @@ -73,7 +73,7 @@ private: struct Tracker { // A tracker we've registered with OpenXR String tracker_name; // Name of our tracker (can be altered from the action map) Vector<Action *> actions; // Actions related to this tracker - Ref<XRPositionalTracker> positional_tracker; // Our positional tracker object that holds our tracker state + Ref<XRControllerTracker> controller_tracker; // Our positional tracker object that holds our tracker state RID tracker_rid; // RID of the tracker registered with our OpenXR API RID interaction_profile; // RID of the interaction profile bound to this tracker (can be null) }; |