Center Marker/ Chaperone Refactor/ IVROverlay/IVRSettings wrappers PT 1/? (#438)

* changed click noises to internal sounds

* udpated to ovr 1.11.11

* in prog added prototypes

* began wrapper for IVRSettings

* added getters for chaperone colors

* added setters for chaperone color

* fixed type conversion issue

* fixed linking issue, added additional settings chaperone page

* adjusted chaperone page qml

* added color chaperone UI

* refactor in prog

* updated ivrsettings wrapper, refactor in prog

* refactor in prog

* collision bound style add

* refactor

* cleaned up error logging

* fixed fade distance remember bug

* fixed sounds

* fixed brightness opacity bug setting to 0 when 0

* fixed sounds

* added wrapper for removing keys

* refactored reset

* added chaperone Styles to UI

* added chaperone floor always on

* fixed copy/paste error

* adjsuted ui chaperone color slider

* started adding chaperone floor marker

* fixeed naming error overlay

* finalized chaperone Ideas, added chaperone markers

* began ivroverlay wrapper

* center marker fully implemented

* added function prototypes for new settings

* added setting, and updated ui for New Center Marker Overlay

* adjsuted sound effect volume and formatting for chaperonecolorbox

* adjusted volume back

* fixed various issues aroudn new overlay

* removed artifact comment

* cleaned up settings wrapper

* cleaned up chaperone tab controller for namespace changes

* removed ide comment issue

* cleanup overlay wrapper

* cleaned up tab/space changed file name

* renamed files

* fixed include statements

* updated namespace in chaperonetabcontroller

* fixed tab/space issues

* re-activated boundbasisheight

* fixed bulgarian case

* changed chaperone warnings to only work in roomscale

* fix capitilization

* fixed tracking universe update

* direct text input change for brightness

* qml fixes

* fixed qml format issues

* fixed sound issue w/ sliders

* fixed super truely

* Add SDL libraries to CircleCI

* Remove -tidy from circleCI config

* flushed out error messages in overlaywrapper

* removed hungarian notation

* added get/set string to ovrsettings wrapper

* misc cleanup

* add reset orientation btn and new center marker to chaperone

* ui adjustments

* changed alarm audio

* adjusted sound effect volume slightly lower

* updated for 5.1.0 release

Co-authored-by: Vasily <vautkin@teknik.io>

src/overlaycontroller.cpp

@@ -69,35 +69,35 @@ OverlayController::OverlayController( bool desktopMode,
     m_runtimePathUrl = QUrl::fromLocalFile( tempRuntimePath );
     LOG( INFO ) << "VR Runtime Path: " << m_runtimePathUrl.toLocalFile();
 
-    QString activationSoundFile = m_runtimePathUrl.toLocalFile().append(
-        "/content/panorama/sounds/activation.wav" );
-    QFileInfo activationSoundFileInfo( activationSoundFile );
-    if ( activationSoundFileInfo.exists() && activationSoundFileInfo.isFile() )
+    constexpr auto clickSoundURL = "res/sounds/click.wav";
+    const auto activationSoundFile
+        = paths::binaryDirectoryFindFile( clickSoundURL );
+
+    if ( activationSoundFile.has_value() )
     {
-        m_activationSoundEffect.setSource(
-            QUrl::fromLocalFile( activationSoundFile ) );
-        m_activationSoundEffect.setVolume( 1.0 );
+        m_activationSoundEffect.setSource( QUrl::fromLocalFile(
+            QString::fromStdString( ( *activationSoundFile ) ) ) );
+        m_activationSoundEffect.setVolume( 0.7 );
     }
     else
     {
         LOG( ERROR ) << "Could not find activation sound file "
-                     << activationSoundFile;
+                     << clickSoundURL;
     }
+    constexpr auto focusChangedSoundURL = "res/sounds/focus.wav";
+    const auto focusChangedSoundFile
+        = paths::binaryDirectoryFindFile( focusChangedSoundURL );
 
-    QString focusChangedSoundFile = m_runtimePathUrl.toLocalFile().append(
-        "/content/panorama/sounds/focus_change.wav" );
-    QFileInfo focusChangedSoundFileInfo( focusChangedSoundFile );
-    if ( focusChangedSoundFileInfo.exists()
-         && focusChangedSoundFileInfo.isFile() )
+    if ( focusChangedSoundFile.has_value() )
     {
-        m_focusChangedSoundEffect.setSource(
-            QUrl::fromLocalFile( focusChangedSoundFile ) );
-        m_focusChangedSoundEffect.setVolume( 1.0 );
+        m_focusChangedSoundEffect.setSource( QUrl::fromLocalFile(
+            QString::fromStdString( ( *focusChangedSoundFile ) ) ) );
+        m_focusChangedSoundEffect.setVolume( 0.7 );
     }
     else
     {
-        LOG( ERROR ) << "Could not find focus changed sound file "
-                     << focusChangedSoundFile;
+        LOG( ERROR ) << "Could not find focus Changed sound file "
+                     << focusChangedSoundURL;
     }
 
     constexpr auto alarmFileName = "res/sounds/alarm01.wav";
@@ -1144,13 +1144,13 @@ void OverlayController::mainEventLoop()
         rightSpeed
             = std::sqrt( vel[0] * vel[0] + vel[1] * vel[1] + vel[2] * vel[2] );
     }
+    auto universe = vr::VRCompositor()->GetTrackingSpace();
 
-    m_moveCenterTabController.eventLoopTick(
-        vr::VRCompositor()->GetTrackingSpace(), devicePoses );
+    m_moveCenterTabController.eventLoopTick( universe, devicePoses );
     m_utilitiesTabController.eventLoopTick();
     m_statisticsTabController.eventLoopTick(
         devicePoses, leftSpeed, rightSpeed );
-    m_chaperoneTabController.eventLoopTick( devicePoses );
+    m_chaperoneTabController.eventLoopTick( universe, devicePoses );
     m_audioTabController.eventLoopTick();
     m_rotationTabController.eventLoopTick( devicePoses );
 
@@ -1160,6 +1160,7 @@ void OverlayController::mainEventLoop()
         m_steamVRTabController.dashboardLoopTick();
         m_fixFloorTabController.dashboardLoopTick( devicePoses );
         m_videoTabController.dashboardLoopTick();
+        m_chaperoneTabController.dashboardLoopTick();
     }
 
     if ( m_ulOverlayThumbnailHandle != vr::k_ulOverlayHandleInvalid )