fly/flightgear
1
0
Fork 0
Code Activity

VRManager: Update to osgXR 0.5.0

Browse source 
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 <james@albanarts.com>
This commit is contained in:
James Hogan 2022-08-18 14:27:20 +01:00
parent 6c812a3dfd
commit 199adf90df
No known key found for this signature in database
GPG key ID: 35CEE4862B1023F2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -158,7 +158,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
endif() endif()
if (ENABLE_VR_DEFAULT) if (ENABLE_VR_DEFAULT)
find_package(osgXR 0.3.9 QUIET) find_package(osgXR 0.5.0 QUIET)
if (osgXR_FOUND) if (osgXR_FOUND)
set(SYSTEM_OSGXR_DEFAULT 1) set(SYSTEM_OSGXR_DEFAULT 1)
endif() endif()

2
src/Viewer/VRManager.cxx
View file

@ -59,7 +59,7 @@ VRManager::VRManager() :
FLIGHTGEAR_MINOR_VERSION << 8 | FLIGHTGEAR_MINOR_VERSION << 8 |
FLIGHTGEAR_PATCH_VERSION); FLIGHTGEAR_PATCH_VERSION);
_settings->setApp("FlightGear", fgVersion); _settings->setApp("FlightGear", fgVersion);
_settings->preferEnvBlendMode(osgXR::Settings::OPAQUE); _settings->preferEnvBlendMode(osgXR::Settings::BLEND_MODE_OPAQUE);
// Inform osgXR what node masks to use // Inform osgXR what node masks to use
setVisibilityMaskNodeMasks(simgear::NodeMask::LEFT_BIT, setVisibilityMaskNodeMasks(simgear::NodeMask::LEFT_BIT,