Merge branch 'master' into feature/vive-pro-eye-tracking

.github/workflows/pr_build.yml

@@ -51,7 +51,7 @@ jobs:
           echo ::set-env name=PYTHON_EXEC::python3
           echo ::set-env name=INSTALLER_EXT::*
           echo ::set-env name=CMAKE_BUILD_EXTRA::"-- -j3"
-          echo ::set-env name=CMAKE_EXTRA::"-DBUILD_TOOLS:BOOLEAN=FALSE"
+          echo ::set-env name=CMAKE_EXTRA::"-DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)"
         fi
         # Mac build variables
         if [ "${{ matrix.os }}" = "macOS-latest" ]; then

cmake/macros/TargetPython.cmake

@@ -19,4 +19,5 @@ macro(TARGET_PYTHON)
             message(FATAL_ERROR "Unable to locate Python interpreter 3.5 or higher")
         endif()
     endif()
-endmacro()
+    message("Using the Python interpreter located at: " ${HIFI_PYTHON_EXEC})
+endmacro()

cmake/ports/openvr/portfile.cmake

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

launchers/qt/src/BuildsRequest.h

@@ -4,10 +4,10 @@
 #include <QNetworkAccessManager>
 
 struct Build {
-    QString tag{ QString::null };
+    QString tag;
     int latestVersion{ 0 };
     int buildNumber{ 0 };
-    QString installerZipURL{ QString::null };
+    QString installerZipURL;
 };
 
 struct Builds {

launchers/qt/src/LauncherState.cpp

@@ -244,7 +244,7 @@ void LauncherState::getCurrentClientVersion() {
     if (match.hasMatch()) {
         _currentClientVersion = match.captured("version");
     } else {
-        _currentClientVersion = QString::null;
+        _currentClientVersion.clear();
     }
     qDebug() << "Current client version is: " << _currentClientVersion;
 

launchers/qt/src/LauncherState.h

@@ -176,7 +176,7 @@ private:
     QString _displayName;
     QString _applicationErrorMessage;
     QString _currentClientVersion;
-    QString _buildTag { QString::null };
+    QString _buildTag;
     QString _contentCacheURL;
     QString _loginTokenResponse;
     QFile _clientZipFile;

launchers/qt/src/UserSettingsRequest.h

@@ -6,7 +6,7 @@
 #include "LoginRequest.h"
 
 struct UserSettings {
-    QString homeLocation{ QString::null };
+    QString homeLocation;
 };
 
 class UserSettingsRequest : public QObject {

libraries/shared/src/PathUtils.h

@@ -58,7 +58,7 @@ public:
     static QString generateTemporaryDir();
     static bool deleteMyTemporaryDir(QString dirName);
 
-    static int removeTemporaryApplicationDirs(QString appName = QString::null);
+    static int removeTemporaryApplicationDirs(QString appName = QString());
 
     static Qt::CaseSensitivity getFSCaseSensitivity();
     static QString stripFilename(const QUrl& url);

plugins/openvr/src/OpenVrDisplayPlugin.cpp

@@ -738,26 +738,28 @@ int OpenVrDisplayPlugin::getRequiredThreadCount() 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()) {
         static const WCHAR INIT = 0;
         size_t size = device.size() + 1;
         std::vector<WCHAR> deviceW;
         deviceW.assign(size, INIT);
         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());
     }
     return device;
 }
 
 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()) {
         static const WCHAR INIT = 0;
         size_t size = device.size() + 1;
         std::vector<WCHAR> deviceW;
         deviceW.assign(size, INIT);
         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());
     }
     return device;

plugins/openvr/src/OpenVrHelpers.cpp

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

scripts/system/create/edit.js

@@ -1409,7 +1409,7 @@ function setupModelMenus() {
         menuItemName: MENU_CREATE_ENTITIES_GRABBABLE,
         afterItem: "Unparent Entity",
         isCheckable: true,
-        isChecked: Settings.getValue(SETTING_EDIT_PREFIX + MENU_CREATE_ENTITIES_GRABBABLE, true)
+        isChecked: Settings.getValue(SETTING_EDIT_PREFIX + MENU_CREATE_ENTITIES_GRABBABLE, false)
     });
 
     Menu.addMenuItem({

tools/oven/src/BakerCLI.h

@@ -34,7 +34,7 @@ public:
     BakerCLI(OvenCLIApplication* parent);
 
 public slots:
-    void bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type = QString::null);
+    void bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type = QString());
 
 private slots:
     void handleFinishedBaker();  

tools/oven/src/OvenCLIApplication.cpp

@@ -85,7 +85,7 @@ void OvenCLIApplication::parseCommandLine(int argc, char* argv[]) {
     _inputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER));
     _outputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER));
 
-    _typeParameter = parser.isSet(CLI_TYPE_PARAMETER) ? parser.value(CLI_TYPE_PARAMETER) : QString::null;
+    _typeParameter = parser.isSet(CLI_TYPE_PARAMETER) ? parser.value(CLI_TYPE_PARAMETER) : QString();
 
     if (parser.isSet(CLI_DISABLE_TEXTURE_COMPRESSION_PARAMETER)) {
         qDebug() << "Disabling texture compression";