Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
David Rowe 2020-05-22 08:52:08 +12:00
commit 7634478aba
13 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/pr_build.yml vendored
View file

@ -51,7 +51,7 @@ jobs:
echo ::set-env name=PYTHON_EXEC::python3 echo ::set-env name=PYTHON_EXEC::python3
echo ::set-env name=INSTALLER_EXT::* echo ::set-env name=INSTALLER_EXT::*
echo ::set-env name=CMAKE_BUILD_EXTRA::"-- -j3" 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 fi
# Mac build variables # Mac build variables
if [ "${{ matrix.os }}" = "macOS-latest" ]; then if [ "${{ matrix.os }}" = "macOS-latest" ]; then

3
cmake/macros/TargetPython.cmake
View file

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

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
) )

4
launchers/qt/src/BuildsRequest.h
View file

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

2
launchers/qt/src/LauncherState.cpp
View file

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

2
launchers/qt/src/LauncherState.h
View file

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

2
launchers/qt/src/UserSettingsRequest.h
View file

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

2
libraries/shared/src/PathUtils.h
View file

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

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);

2
scripts/system/create/edit.js
View file

@ -1409,7 +1409,7 @@ function setupModelMenus() {
menuItemName: MENU_CREATE_ENTITIES_GRABBABLE, menuItemName: MENU_CREATE_ENTITIES_GRABBABLE,
afterItem: "Unparent Entity", afterItem: "Unparent Entity",
isCheckable: true, 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({ Menu.addMenuItem({

2
tools/oven/src/BakerCLI.h
View file

@ -34,7 +34,7 @@ public:
BakerCLI(OvenCLIApplication* parent); BakerCLI(OvenCLIApplication* parent);
public slots: 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: private slots:
void handleFinishedBaker(); void handleFinishedBaker();

2
tools/oven/src/OvenCLIApplication.cpp
View file

@ -85,7 +85,7 @@ void OvenCLIApplication::parseCommandLine(int argc, char* argv[]) {
_inputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)); _inputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER));
_outputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_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)) { if (parser.isSet(CLI_DISABLE_TEXTURE_COMPRESSION_PARAMETER)) {
qDebug() << "Disabling texture compression"; qDebug() << "Disabling texture compression";