diff options
Diffstat (limited to 'intern/ghost/intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_XrContext.cpp | 5 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_XrSession.cpp | 14 |
4 files changed, 14 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 933e0c70cc8..189e663f91a 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -424,7 +424,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) { /* TODO: implement graceful termination through Cocoa mechanism * to avoid session log off to be canceled. */ - /* Note that Cmd+Q is already handled by keyhandler. */ + /* Note that Cmd+Q is already handled by key-handler. */ systemCocoa->handleQuitRequest(); return NSTerminateCancel; } diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 9422d15692d..10ccb00cc15 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1922,7 +1922,7 @@ static GHOST_TKey ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCo #undef MAKE_ID -/* from xclip.c xcout() v0.11 */ +/* From `xclip.c` #xcout() v0.11. */ #define XCLIB_XCOUT_NONE 0 /* no context */ #define XCLIB_XCOUT_SENTCONVSEL 1 /* sent a request */ diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp index 2906a6b241e..a7498e9f91f 100644 --- a/intern/ghost/intern/GHOST_XrContext.cpp +++ b/intern/ghost/intern/GHOST_XrContext.cpp @@ -410,6 +410,11 @@ void GHOST_XrContext::getExtensionsToEnable( try_ext.push_back(XR_EXT_DEBUG_UTILS_EXTENSION_NAME); } + /* Try enabling interaction profile extensions. */ + try_ext.push_back(XR_EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME); + try_ext.push_back(XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME); + try_ext.push_back(XR_HUAWEI_CONTROLLER_INTERACTION_EXTENSION_NAME); + r_ext_names.reserve(try_ext.size() + graphics_binding_types.size()); /* Add graphics binding extensions (may be multiple ones, we'll settle for one to use later, once diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp index 8b0320ef358..a08b2d6045a 100644 --- a/intern/ghost/intern/GHOST_XrSession.cpp +++ b/intern/ghost/intern/GHOST_XrSession.cpp @@ -148,13 +148,12 @@ static void create_reference_spaces(OpenXRSessionData &oxr, const GHOST_XrPose & if (XR_FAILED(result)) { /* One of the rare cases where we don't want to immediately throw an exception on failure, - * since run-times are not required to support the stage reference space. Although we need the - * stage reference space for absolute tracking, if the runtime doesn't support it then just - * fallback to the local space. */ + * since runtimes are not required to support the stage reference space. If the runtime + * doesn't support it then just fall back to the local space. */ if (result == XR_ERROR_REFERENCE_SPACE_UNSUPPORTED) { printf( - "Warning: XR runtime does not support stage reference space, disabling absolute " - "tracking.\n"); + "Warning: XR runtime does not support stage reference space, falling back to local " + "reference space.\n"); create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_LOCAL; CHECK_XR(xrCreateReferenceSpace(oxr.session, &create_info, &oxr.reference_space), @@ -172,8 +171,9 @@ static void create_reference_spaces(OpenXRSessionData &oxr, const GHOST_XrPose & "Failed to get stage reference space bounds."); if (extents.width == 0.0f || extents.height == 0.0f) { printf( - "Warning: Invalid stage reference space bounds, disabling absolute tracking. To enable " - "absolute tracking, please define a tracking space via the XR runtime.\n"); + "Warning: Invalid stage reference space bounds, falling back to local reference space. " + "To use the stage reference space, please define a tracking space via the XR " + "runtime.\n"); /* Fallback to local space. */ if (oxr.reference_space != XR_NULL_HANDLE) { |