Remove OpenXR dependencies (#1521)

The OpenXR dependency used by Windows builds needs to be updated to work
without errors when using CMake 4, but XR is not supported on Windows
anymore so there is no easy way to test the changes.

To fix this issue, this change removes XR support on Windows and removes
the OpenXR dependencies since they are only being used on Windows
(Android and iOS use different XR implementations).

Author: docEdub

Apps/Playground/CMakeLists.txt

@@ -93,7 +93,6 @@ elseif(WINDOWS_STORE)
         ${APPX_ASSETS}
         "UWP/App.cpp"
         "UWP/App.h")
-    set(ADDITIONAL_LIBRARIES PRIVATE NativeXr)
 elseif(WIN32)
     set(SOURCES
         ${SOURCES}
@@ -104,7 +103,7 @@ elseif(WIN32)
         "Win32/Resource.h"
         "Win32/small.ico"
         "Win32/targetver.h")
-    set(ADDITIONAL_LIBRARIES PRIVATE NativeXr NativeCamera)
+    set(ADDITIONAL_LIBRARIES PRIVATE NativeCamera)
 endif()
 
 if(WIN32)

Apps/Playground/UWP/App.cpp

@@ -4,7 +4,6 @@
 #include <Babylon/ScriptLoader.h>
 #include <Babylon/Plugins/NativeEngine.h>
 #include <Babylon/Plugins/NativeOptimizations.h>
-#include <Babylon/Plugins/NativeXr.h>
 #include <Babylon/Polyfills/Console.h>
 #include <Babylon/Polyfills/Window.h>
 #include <Babylon/Polyfills/XMLHttpRequest.h>
@@ -401,8 +400,6 @@ void App::RestartRuntime(Windows::Foundation::Rect bounds)
 
         Babylon::Plugins::NativeOptimizations::Initialize(env);
 
-        Babylon::Plugins::NativeXr::Initialize(env);
-
         m_nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(env);
     });
 

Apps/Playground/Win32/App.cpp

@@ -17,7 +17,6 @@
 #include <Babylon/Plugins/NativeCapture.h>
 #include <Babylon/Plugins/NativeEngine.h>
 #include <Babylon/Plugins/NativeOptimizations.h>
-#include <Babylon/Plugins/NativeXr.h>
 #include <Babylon/Plugins/NativeCamera.h>
 #include <Babylon/Plugins/NativeInput.h>
 #include <Babylon/Plugins/TestUtils.h>
@@ -191,8 +190,6 @@ namespace
 
             Babylon::Plugins::NativeCamera::Initialize(env);
 
-            Babylon::Plugins::NativeXr::Initialize(env);
-
             nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(env);
 
             Babylon::Plugins::TestUtils::Initialize(env, hWnd);

CMakeLists.txt

@@ -38,12 +38,6 @@ FetchContent_Declare(ios-cmake
 FetchContent_Declare(JsRuntimeHost
     GIT_REPOSITORY https://github.com/BabylonJS/JsRuntimeHost.git
     GIT_TAG c64c8a8cfc95b187e9547b165f02633909568c22)
-FetchContent_Declare(OpenXR-MixedReality
-    GIT_REPOSITORY https://github.com/microsoft/OpenXR-MixedReality.git
-    GIT_TAG 67424511525b96a36847f2a96d689d99e5879503)
-FetchContent_Declare(OpenXR-SDK
-    GIT_REPOSITORY https://github.com/KhronosGroup/OpenXR-SDK.git
-    GIT_TAG 458984d7f59d1ae6dc1b597d94b02e4f7132eaba)
 FetchContent_Declare(SPIRV-Cross
     GIT_REPOSITORY https://github.com/BabylonJS/SPIRV-Cross.git
     GIT_TAG 6abfcf066d171e9ade7604d91381ebebe4209edc)

Dependencies/CMakeLists.txt

@@ -189,8 +189,8 @@ endif()
 # --------------------------------------------------
 # xr
 # --------------------------------------------------
-# Currently supported on Windows via OpenXR, Android via ARCore, and iOS via ARKit.
-if(BABYLON_NATIVE_PLUGIN_NATIVEXR AND (WIN32 OR ANDROID OR IOS))
+# Currently supported on Android via ARCore, and iOS via ARKit.
+if(BABYLON_NATIVE_PLUGIN_NATIVEXR AND (ANDROID OR IOS))
     add_subdirectory(xr)
     set_property(TARGET xr PROPERTY FOLDER Dependencies/xr)
     warnings_as_errors(xr)

Dependencies/xr/CMakeLists.txt

@@ -24,18 +24,6 @@ endif()
 
 project(xr)
 
-
-if(WIN32)
-    # Avoid picking up system installed jsoncpp in favor of source distributed with openxr_loader project
-    set(BUILD_WITH_SYSTEM_JSONCPP OFF BOOL "disable using system installed jsoncpp")
-    FetchContent_MakeAvailable_With_Message(OpenXR-SDK OpenXR-MixedReality)
-
-    set_property(TARGET openxr_loader PROPERTY FOLDER Dependencies/xr/OpenXR)
-    set_property(TARGET generate_openxr_header PROPERTY FOLDER Dependencies/xr/OpenXR/Generated)
-    set_property(TARGET xr_global_generated_files PROPERTY FOLDER Dependencies/xr/OpenXR/Generated)
-    set_property(TARGET uninstall PROPERTY FOLDER Dependencies/xr/OpenXR/Generated)
-endif()
-
 set(DYNAMIC_LOADER OFF CACHE BOOL "Build the loader as a .dll library")
 
 set(SOURCES "Include/XR.h"
@@ -49,26 +37,6 @@ elseif (IOS)
     set(SOURCES ${SOURCES}
         "Source/ARKit/Include/IXrContextARKit.h"
         "Source/ARKit/XR.mm")
-else()
-    set(SOURCES ${SOURCES}
-        "Source/OpenXR/XR.cpp")
-
-    if(WIN32)
-        set(SOURCES ${SOURCES} "Source/OpenXR/Windows/XrPlatform.h")
-    else()
-        message(FATAL_ERROR "OpenXR support not available for platform ${CMAKE_SYSTEM_NAME}")
-    endif()
-
-    set(SOURCES ${SOURCES}
-        "Source/OpenXR/Include/IXrContextOpenXR.h"
-        "Source/OpenXR/XrPlatformCommon.h"
-        "Source/OpenXR/XrRegistry.h"
-        "Source/OpenXR/XrSupportedExtensions.h"
-        "Source/OpenXR/SceneUnderstanding.h"
-        "Source/OpenXR/SceneUnderstanding.cpp"
-        "Source/OpenXR/XrInput.h"
-        "Source/OpenXR/XrInput.cpp")
-    set_property(TARGET openxr_loader PROPERTY UNITY_BUILD false)
 endif()
 
 add_library(xr ${SOURCES})
@@ -95,20 +63,6 @@ if (ANDROID)
     target_link_libraries(xr PRIVATE glm arcore AndroidExtensions)
 elseif (IOS)    
     target_link_libraries(xr PRIVATE "-framework ARKit")
-else()
-    if(WIN32)
-        target_include_directories(xr PRIVATE "Source/OpenXR/Windows")
-    endif()
-
-    target_include_directories(xr PRIVATE "${openxr-mixedreality_SOURCE_DIR}/openxr_preview/include")
-    target_include_directories(xr PRIVATE "${openxr-mixedreality_SOURCE_DIR}/shared")
-    target_include_directories(xr PRIVATE "Source/OpenXR")
-
-    target_include_directories(xrInternal INTERFACE "${openxr-mixedreality_SOURCE_DIR}/openxr_preview/include")
-    target_include_directories(xrInternal INTERFACE "${openxr-mixedreality_SOURCE_DIR}/shared")
-    target_include_directories(xrInternal INTERFACE "Source/OpenXR")
-
-    target_link_libraries(xr PRIVATE openxr_loader)
 endif()
 
 target_link_libraries(xr