5.8.16

build_scripts/compile_version_string.txt

@@ -1 +1 @@
-5.8.13-release
+5.8.17-release

build_scripts/qt/compilers/msvc.pri

@@ -9,4 +9,4 @@ warnings_as_errors {
 QMAKE_CXXFLAGS += /GL
 
 # Force standards-conformance
-QMAKE_CXXFLAGS += /permissive-
+# QMAKE_CXXFLAGS += /permissive-

src/overlaycontroller.cpp

@@ -1235,17 +1235,39 @@ void OverlayController::mainEventLoop()
             LOG( DEBUG ) << "Dashboard deactivated";
             m_dashboardVisible = false;
             settings::saveChangedSettings();
+            if(0UL != m_lastTextUID){
+                submitLastTextField(m_lastTextUID);
+                m_lastTextUID = 0;
+            }
         }
         break;
 
-        case vr::VREvent_KeyboardDone:
+        case vr::VREvent_HideKeyboard:
         {
-            char keyboardBuffer[1024];
-            vr::VROverlay()->GetKeyboardText( keyboardBuffer, 1024 );
+            if(0UL != m_lastTextUID){
+                submitLastTextField(m_lastTextUID);
+                m_lastTextUID = 0;
+            }
+        }
+        break;
+
+        case vr::VREvent_KeyboardCharInput:
+        {
+            char keyboardBuffer[64];
+            vr::VROverlay()->GetKeyboardText( keyboardBuffer, 64 );
             emit keyBoardInputSignal( QString( keyboardBuffer ),
                                       static_cast<unsigned long>(
                                           vrEvent.data.keyboard.uUserValue ) );
+            m_lastTextUID = static_cast<unsigned long>(vrEvent.data.keyboard.uUserValue);
         }
+        // case vr::VREvent_KeyboardDone:
+        // {
+        //     char keyboardBuffer[1024];
+        //     vr::VROverlay()->GetKeyboardText( keyboardBuffer, 1024 );
+        //     emit keyBoardInputSignal( QString( keyboardBuffer ),
+        //                               static_cast<unsigned long>(
+        //                                   vrEvent.data.keyboard.uUserValue ) );
+        // }
         break;
 
         case vr::VREvent_SeatedZeroPoseReset:
@@ -1572,11 +1594,20 @@ const vr::VROverlayHandle_t& OverlayController::overlayThumbnailHandle()
 void OverlayController::showKeyboard( QString existingText,
                                       unsigned long userValue )
 {
+    // vr::VROverlay()->ShowKeyboardForOverlay(
+    //     m_ulOverlayHandle,
+    //     vr::k_EGamepadTextInputModeNormal,
+    //     vr::k_EGamepadTextInputLineModeSingleLine,
+    //     0,
+    //     "Advanced Settings Overlay",
+    //     1024,
+    //     existingText.toStdString().c_str(),
+    //     userValue );
     vr::VROverlay()->ShowKeyboardForOverlay(
         m_ulOverlayHandle,
         vr::k_EGamepadTextInputModeNormal,
         vr::k_EGamepadTextInputLineModeSingleLine,
-        0,
+        vr::KeyboardFlag_Modal+vr::KeyboardFlag_Minimal+vr::KeyboardFlag_HideDoneKey,
         "Advanced Settings Overlay",
         1024,
         existingText.toStdString().c_str(),

src/overlaycontroller.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <openvr.h>
 #include <QtCore/QtCore>
 // because of incompatibilities with QtOpenGL and GLEW we need to cherry pick
@@ -131,6 +130,7 @@ class OverlayController : public QObject
     QString m_updateMessage = "";
     QString m_optionalMessage = "";
     QString m_versionCheckText = "";
+    unsigned long m_lastTextUID = 0;
 
     QUrl m_runtimePathUrl;
 
@@ -293,6 +293,7 @@ public slots:
     void autoApplyChaperoneEnabledChanged( bool value );
     void soundVolumeChanged( double value );
     void desktopModeToggleChanged( bool value );
+    void submitLastTextField(unsigned long value = 0);
 };
 
 } // namespace advsettings

src/res/qml/common/MyTextField.qml

@@ -5,6 +5,7 @@ import ovras.advsettings 1.0
 TextField {
 	property int keyBoardUID: 0
     property string savedText: ""
+    property bool active: false
     id: myTextField
     color: "#d9dbe0"
     text: ""
@@ -18,19 +19,25 @@ TextField {
         }
         onClicked: {
             myTextField.forceActiveFocus()
+            active = true;
         }
     }
     onActiveFocusChanged: {
         if (activeFocus) {
+            active = true;
             if (!OverlayController.desktopMode) {
                 OverlayController.showKeyboard(text, keyBoardUID)
-            } else {
-                savedText = text
             }
+            //savedText = text
+        }
+        //When box loses focus apply changes
+        else{
+            myTextField.onInputEvent(text)
+            active = false;
         }
     }
     onEditingFinished: {
-        if (OverlayController.desktopMode && savedText !== text) {
+        if(OverlayController.desktopMode){
             myTextField.onInputEvent(text)
         }
     }
@@ -39,11 +46,47 @@ TextField {
 	}
     Connections {
         target: OverlayController
+
+        onSubmitLastTextField:{
+            //value here is UID
+            if(value == 0){
+                active = false;
+                return;
+            }
+
+            if(value == keyBoardUID && active == true){
+                myTextField.onInputEvent(text)
+                active = false;
+            }
+        }
+
         onKeyBoardInputSignal: {
             if (userValue == keyBoardUID) {
-                if (myTextField.text !== input) {
-                    myTextField.onInputEvent(input)
+                if(input == '\b'){
+                    myTextField.text = text.slice(0,-1)
+                    return
+                }
+                else if(input == '\e'){
+                    myTextField.text = text.slice(0,cursorPosition)+text.slice(cursorposition+1)
+                    return;
+                }
+                //Execute input
+                else if(input == '\n'){
+                    if(!OverlayController.desktopMode){
+                        //myTextField.onInputEvent(input)
+                        myTextField.focus = false;
+                    }
+                    return;
+                }
+                else if(input=='\r'){
+                    return;
+                }
+                else{
+                    myTextField.text = text + input;
                 }
+                //if (myTextField.text !== input) {
+                //    myTextField.onInputEvent(input)
+                //}
             }
         }
     }

src/tabcontrollers/MoveCenterTabController.cpp

@@ -274,10 +274,11 @@ void MoveCenterTabController::setTrackingUniverse( int value, bool notify )
     if ( m_trackingUniverse != value )
     {
         vr::VRChaperoneSetup()->HideWorkingSetPreview();
-        if ( !m_roomSetupModeDetected && value == vr::TrackingUniverseStanding )
-        {
-            reset();
-        }
+        //TODO verify
+        // if ( !m_roomSetupModeDetected && value == vr::TrackingUniverseStanding )
+        // {
+        //     reset();
+        // }
 
         m_trackingUniverse = value;
         if ( notify )
@@ -914,20 +915,15 @@ void MoveCenterTabController::incomingZeroReset()
     // aspects) IN mixed tracking environments I get this issue, the check if
     // there is an error and apply autosaved profile is hopefully a workaround
 
-    //This should catch OpenXR games, and helps prevent a loop on zero resets.
-    if(m_trackingUniverse==vr::TrackingUniverseRawAndUncalibrated){
-        return;
-    }
-
-    auto calState = vr::VRChaperone()->GetCalibrationState();
-    LOG( INFO ) << "Calibration State on Recenter is: " << calState;
-    //Any Logging should be handled after openXR check to avoid spam;
+    //auto calState = vr::VRChaperone()->GetCalibrationState();
+    //LOG( INFO ) << "Calibration State on Recenter is: " << calState;
 
     //TODO 8/3/2026 SteamFrame May Need special handling, will discuss With Valve currently
     //reset zero pose seems to move floor level as well as our changes, requiring 2 resets to set at correct level
     //or we could potentially not apply our offset during this process
     float offset[3] = { 0, 0, 0 };
     offset[1] = -m_offsetY;
+    //TODO set universe center and seated recenter as 0 for this part
     vr::VRChaperoneSetup()->RevertWorkingCopy();
     vr::VRChaperoneSetup()->GetWorkingStandingZeroPoseToRawTrackingPose(
         &m_universeCenterForReset );
@@ -939,12 +935,14 @@ void MoveCenterTabController::incomingZeroReset()
     return;
 }
 
+//TODO 9/4/26 This needs to be looked at This moves the chaperone, and seems to do same thing as
+//zerooffsets....
 void MoveCenterTabController::reset()
 {
     // DO NOT attempt to apply autosaved profile on reset, as it is triggered by
     // the apply chaperone profile Side effects are bad!
-    auto calState = vr::VRChaperone()->GetCalibrationState();
-    LOG( INFO ) << "Calibration State on Reset is: " << calState;
+    //auto calState = vr::VRChaperone()->GetCalibrationState();
+    //LOG( INFO ) << "Calibration State on Reset is: " << calState;
 
     if ( !m_chaperoneBasisAcquired )
     {
@@ -1146,7 +1144,7 @@ void MoveCenterTabController::zeroOffsets()
         m_roomSetupModeDetected = false;
     }
 
-    LOG( INFO ) << "SUCCESS: Chaperone Data Updated and Offsets zeroed out";
+    //LOG( INFO ) << "SUCCESS: Chaperone Data Updated and Offsets zeroed out";
 }
 
 void MoveCenterTabController::sendSeatedRecenter()
@@ -1893,8 +1891,9 @@ void MoveCenterTabController::resetOffsets( bool resetOffsetsJustPressed )
         emit offsetZChanged( m_offsetZ );
         emit rotationChanged( m_rotation );
         updateSpace( true );
-        auto calState = vr::VRChaperone()->GetCalibrationState();
-        LOG( INFO ) << "Calibration State on Reset Offsets is: " << calState;
+
+        //auto calState = vr::VRChaperone()->GetCalibrationState();
+        //LOG( INFO ) << "Calibration State on Reset Offsets is: " << calState;
 
         //        if ( calState > 199 && m_initComplete )
         //        {
@@ -2623,7 +2622,7 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
     }
 
     // keep the seated origin synced with offsets if in seated mode
-    if ( m_trackingUniverse == vr::TrackingUniverseSeated )
+    if ( m_trackingUniverse == vr::TrackingUniverseSeated || m_trackingUniverse == vr::TrackingUniverseRawAndUncalibrated )
     {
         vr::HmdMatrix34_t offsetSeatedCenter;
 
@@ -2708,19 +2707,6 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
     vr::VRChaperoneSetup()->SetWorkingStandingZeroPoseToRawTrackingPose(
         &offsetUniverseCenter );
 
-    //openxr
-    //In OpenXR titles commitworkingcopy essentially causes zero resets, this is too much work, and causes lag
-    //As such we will update every third frame for OpenXR titles, this should be reasonably responsive.
-    //We may have to re-visit or make user adjustable
-    if(m_trackingUniverse==vr::TrackingUniverseRawAndUncalibrated){
-        m_openXRSkip++;
-            if(m_openXRSkip % 5==0){
-                vr::VRChaperoneSetup()->CommitWorkingCopy(
-                    vr::EChaperoneConfigFile_Live );
-                m_openXRSkip = 0;
-            }
-        }
-    //This is what actually throws you into the "working set" instead of live.
     vr::VRChaperoneSetup()->ShowWorkingSetPreview();
 
     if ( m_collisionBoundsCountForReset > 0 )

src/tabcontrollers/SteamVRTabController.cpp

@@ -507,14 +507,13 @@ void SteamVRTabController::launchBindingUI()
         LOG( ERROR )
             << "failed to get input handle? is your right controller on?";
     }
+    bool desktopShow = false;
     if ( parent->isDesktopMode() )
     {
-        QDesktopServices::openUrl(
-            QUrl( "http://127.0.0.1:27062/dashboard/controllerbinding.html" ) );
-        return;
+        desktopShow = true;
     }
     auto error = vr::VRInput()->OpenBindingUI(
-        application_strings::applicationKey, actionHandle, inputHandle, false );
+        application_strings::applicationKey, actionHandle, inputHandle, desktopShow );
     if ( error != vr::VRInputError_None )
     {
         LOG( ERROR ) << "Input Error: " << error;

third-party/openvr/README.md

@@ -1,13 +1,25 @@
 OpenVR SDK
 ---
 
-OpenVR is an API and runtime that allows access to VR hardware from multiple 
-vendors without requiring that applications have specific knowledge of the 
-hardware they are targeting. This repository is an SDK that contains the API 
-and samples. The runtime is under SteamVR in Tools on Steam. 
+OpenVR is an API and runtime that allows access to VR hardware from multiple
+vendors without requiring that applications have specific knowledge of the
+hardware they are targeting. This repository is an SDK that contains the API
+and samples. The runtime is under SteamVR in Tools on Steam.
 
 ### Documentation
 
-Documentation for the API is available on the [Github Wiki](https://github.com/ValveSoftware/openvr/wiki/API-Documentation)
+#### Application API
 
-More information on OpenVR and SteamVR can be found on http://steamvr.com
+Documentation for the Application API is available on
+the [GitHub Wiki](https://github.com/ValveSoftware/openvr/wiki/API-Documentation).
+
+#### Driver API
+
+Current documentation for the Driver API can be found in [docs/Driver_API_Documentation.md](docs/).
+
+* Old driver API documentation can still be found on
+  the [GitHub Wiki](https://github.com/ValveSoftware/openvr/wiki/Driver-Documentation).
+
+### About
+
+More information on OpenVR and SteamVR can be found on https://steamvr.com