diff --git a/build_scripts/compile_version_string.txt b/build_scripts/compile_version_string.txt index 04d144a..6931a61 100644 --- a/build_scripts/compile_version_string.txt +++ b/build_scripts/compile_version_string.txt @@ -1 +1 @@ -5.3.1-release \ No newline at end of file +5.3.2-release \ No newline at end of file diff --git a/docs/SteamVRInputGuide.md b/docs/SteamVRInputGuide.md index 2a66bc8..1e69643 100644 --- a/docs/SteamVRInputGuide.md +++ b/docs/SteamVRInputGuide.md @@ -14,7 +14,7 @@ All the types mean to you is which physical buttons can be bound to which action ## Okay Cool? How do I do this? -1. Go to SteamVR dashboard->Steam->Controller Bindings OR go to http://127.0.0.1:27062/dashboard/controllerbinding.html from a desktop browser WHILE steamVR is running. +1. Go to SteamVR dashboard->Steam->Controller Bindings OR go to http://localhost:27062/dashboard/controllerbinding.html from a desktop browser WHILE steamVR is running. 2. Select the application you want to modify keybinds for (Advanced Settings will currently always be at the bottom) 3. Select your controller (the controller must be on). 4. Select your binding. diff --git a/src/main.cpp b/src/main.cpp index ec3b26c..e12a21d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,12 @@ #include "utils/setup.h" #include "settings/settings.h" #include "openvr/ovr_settings_wrapper.h" +#ifdef _WIN64 +# include +extern "C" __declspec( dllexport ) DWORD NvOptimusEnablement = 0x00000001; +extern "C" __declspec( dllexport ) DWORD + AmdPowerXpressRequestHighPerformance = 0x00000001; +#endif INITIALIZE_EASYLOGGINGPP @@ -14,6 +20,7 @@ int main( int argc, char* argv[] ) LOG( INFO ) << settings::getSettingsAndValues(); QCoreApplication::setAttribute( Qt::AA_Use96Dpi ); + QCoreApplication::setAttribute( Qt::AA_UseDesktopOpenGL ); MyQApplication mainEventLoop( argc, argv ); mainEventLoop.setOrganizationName( application_strings::applicationOrganizationName ); diff --git a/src/tabcontrollers/VideoTabController.cpp b/src/tabcontrollers/VideoTabController.cpp index f33ab93..ff79ff8 100644 --- a/src/tabcontrollers/VideoTabController.cpp +++ b/src/tabcontrollers/VideoTabController.cpp @@ -66,6 +66,8 @@ void VideoTabController::initBrightnessOverlay() m_brightnessOverlayHandle, vr::k_unTrackedDeviceIndex_Hmd, ¬ificationTransform ); + vr::VROverlay()->SetOverlaySortOrder( m_brightnessOverlayHandle, + sortMax ); } else { @@ -109,6 +111,8 @@ void VideoTabController::initColorOverlay() m_colorOverlayHandle, vr::k_unTrackedDeviceIndex_Hmd, ¬ificationTransform ); + vr::VROverlay()->SetOverlaySortOrder( m_brightnessOverlayHandle, + sortMax ); } else { diff --git a/src/tabcontrollers/VideoTabController.h b/src/tabcontrollers/VideoTabController.h index 4a7046a..8e9fd50 100644 --- a/src/tabcontrollers/VideoTabController.h +++ b/src/tabcontrollers/VideoTabController.h @@ -128,6 +128,7 @@ class VideoTabController : public QObject setColorOverlayOpacity NOTIFY colorOverlayOpacityChanged ) private: + static constexpr uint32_t sortMax = 0xffffffff; unsigned settingsUpdateCounter = 0; // how far away the overlay is, any OVERLAY closer will not be dimmed. diff --git a/ver/versioncheck.json b/ver/versioncheck.json index 6a06609..9b61b47 100644 --- a/ver/versioncheck.json +++ b/ver/versioncheck.json @@ -1 +1 @@ -{ "major": 5, "minor": 3, "patch": 1, "updateMessage": "", "optionalMessage": "" } \ No newline at end of file +{ "major": 5, "minor": 3, "patch": 2, "updateMessage": "", "optionalMessage": "" } \ No newline at end of file