Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 10:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #335 from kasenvr/feature/openvr-update

Browse source 
Update to latest OpenVR SDK
This commit is contained in:
kasenvr 2020-05-20 14:03:05 -04:00 committed by GitHub
commit a9b56b5f3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/ports/openvr/portfile.cmake
View file

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO ValveSoftware/openvr REPO ValveSoftware/openvr
REF v1.0.16 REF v1.11.11
SHA512 967356563ba4232da5361510c7519d3058e09eced4571aadc00d8a75ab1f299a0aebda2b0b10b0ffb6c6a443fd718634d0c0103964e289961449c93e8d7b9d02 SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121
HEAD_REF master HEAD_REF master
) )

6
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -738,26 +738,28 @@ int OpenVrDisplayPlugin::getRequiredThreadCount() const {
} }
QString OpenVrDisplayPlugin::getPreferredAudioInDevice() const { QString OpenVrDisplayPlugin::getPreferredAudioInDevice() const {
QString device = getVrSettingString(vr::k_pch_audio_Section, vr::k_pch_audio_OnPlaybackDevice_String); QString device = getVrSettingString(vr::k_pch_audio_Section, vr::k_pch_audio_RecordingDeviceOverride_String);
if (!device.isEmpty()) { if (!device.isEmpty()) {
static const WCHAR INIT = 0; static const WCHAR INIT = 0;
size_t size = device.size() + 1; size_t size = device.size() + 1;
std::vector<WCHAR> deviceW; std::vector<WCHAR> deviceW;
deviceW.assign(size, INIT); deviceW.assign(size, INIT);
device.toWCharArray(deviceW.data()); device.toWCharArray(deviceW.data());
// FIXME: This may not be necessary if vr::k_pch_audio_RecordingDeviceOverride_StringName is used above.
device = AudioClient::getWinDeviceName(deviceW.data()); device = AudioClient::getWinDeviceName(deviceW.data());
} }
return device; return device;
} }
QString OpenVrDisplayPlugin::getPreferredAudioOutDevice() const { QString OpenVrDisplayPlugin::getPreferredAudioOutDevice() const {
QString device = getVrSettingString(vr::k_pch_audio_Section, vr::k_pch_audio_OnRecordDevice_String); QString device = getVrSettingString(vr::k_pch_audio_Section, vr::k_pch_audio_PlaybackDeviceOverride_String);
if (!device.isEmpty()) { if (!device.isEmpty()) {
static const WCHAR INIT = 0; static const WCHAR INIT = 0;
size_t size = device.size() + 1; size_t size = device.size() + 1;
std::vector<WCHAR> deviceW; std::vector<WCHAR> deviceW;
deviceW.assign(size, INIT); deviceW.assign(size, INIT);
device.toWCharArray(deviceW.data()); device.toWCharArray(deviceW.data());
// FIXME: This may not be necessary if vr::k_pch_audio_PlaybackDeviceOverride_StringName is used above.
device = AudioClient::getWinDeviceName(deviceW.data()); device = AudioClient::getWinDeviceName(deviceW.data());
} }
return device; return device;

3
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -100,7 +100,7 @@ QString getVrSettingString(const char* section, const char* setting) {
vr::IVRSettings * vrSettings = vr::VRSettings(); vr::IVRSettings * vrSettings = vr::VRSettings();
if (vrSettings) { if (vrSettings) {
vr::EVRSettingsError error = vr::VRSettingsError_None; vr::EVRSettingsError error = vr::VRSettingsError_None;
vrSettings->GetString(vr::k_pch_audio_Section, vr::k_pch_audio_OnPlaybackDevice_String, BUFFER, BUFFER_SIZE, &error); vrSettings->GetString(vr::k_pch_audio_Section, setting, BUFFER, BUFFER_SIZE, &error);
if (error == vr::VRSettingsError_None) { if (error == vr::VRSettingsError_None) {
result = BUFFER; result = BUFFER;
} }
@ -413,7 +413,6 @@ void showMinSpecWarning() {
vrSystem->ResetSeatedZeroPose(); vrSystem->ResetSeatedZeroPose();
QString imagePath = PathUtils::resourcesPath() + "/images/steam-min-spec-failed.png"; QString imagePath = PathUtils::resourcesPath() + "/images/steam-min-spec-failed.png";
vrOverlay->SetOverlayFromFile(minSpecFailedOverlay, imagePath.toLocal8Bit().toStdString().c_str()); vrOverlay->SetOverlayFromFile(minSpecFailedOverlay, imagePath.toLocal8Bit().toStdString().c_str());
vrOverlay->SetHighQualityOverlay(minSpecFailedOverlay);
vrOverlay->SetOverlayWidthInMeters(minSpecFailedOverlay, 1.4f); vrOverlay->SetOverlayWidthInMeters(minSpecFailedOverlay, 1.4f);
vrOverlay->SetOverlayInputMethod(minSpecFailedOverlay, vr::VROverlayInputMethod_Mouse); vrOverlay->SetOverlayInputMethod(minSpecFailedOverlay, vr::VROverlayInputMethod_Mouse);
vrOverlay->ShowOverlay(minSpecFailedOverlay); vrOverlay->ShowOverlay(minSpecFailedOverlay);