From 199adf90dfe2f77804df9b41a1e08fa19ca8582c Mon Sep 17 00:00:00 2001 From: James Hogan Date: Thu, 18 Aug 2022 14:27:20 +0100 Subject: [PATCH] VRManager: Update to osgXR 0.5.0 osgXR 0.5.0 broke the API slightly, so update VRManager to use the new enumeration names and update the required osgXR version for when using a system version of osgXR. Signed-off-by: James Hogan --- CMakeLists.txt | 2 +- src/Viewer/VRManager.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ac80778..1500a1d41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR endif() if (ENABLE_VR_DEFAULT) - find_package(osgXR 0.3.9 QUIET) + find_package(osgXR 0.5.0 QUIET) if (osgXR_FOUND) set(SYSTEM_OSGXR_DEFAULT 1) endif() diff --git a/src/Viewer/VRManager.cxx b/src/Viewer/VRManager.cxx index 85221020f..fa768f51a 100644 --- a/src/Viewer/VRManager.cxx +++ b/src/Viewer/VRManager.cxx @@ -59,7 +59,7 @@ VRManager::VRManager() : FLIGHTGEAR_MINOR_VERSION << 8 | FLIGHTGEAR_PATCH_VERSION); _settings->setApp("FlightGear", fgVersion); - _settings->preferEnvBlendMode(osgXR::Settings::OPAQUE); + _settings->preferEnvBlendMode(osgXR::Settings::BLEND_MODE_OPAQUE); // Inform osgXR what node masks to use setVisibilityMaskNodeMasks(simgear::NodeMask::LEFT_BIT,