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>
2020-05-13 15:11:20 -05:00
parent 593b429641
commit a803ffaeac
50 changed files with 1824 additions and 429 deletions
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <openvr.h>
+#include <iostream>
+#include <string>
+#include <easylogging++.h>
+#include <utility>
+#include <string>
+#include "../utils/paths.h"
+
+/* Wrapper For OpenVR's IVR settings class, allows us to do our error logging
+ * while also minimizing code
+ *
+ */
+namespace ovr_overlay_wrapper
+{
+// might make sense to mirror ovr's errors exactly, but for now this is more
+// than sufficient
+enum class OverlayError
+{
+    NoError,
+    UndefinedError,
+
+};
+
+OverlayError createOverlay( const std::string overlayKey,
+                            const std::string overlayName,
+                            vr::VROverlayHandle_t* overlayHandle,
+                            std::string customErrorMsg = "" );
+
+OverlayError setOverlayColor( vr::VROverlayHandle_t overlayHandle,
+                              float red,
+                              float green,
+                              float blue,
+                              std::string customErrorMsg = "" );
+OverlayError setOverlayAlpha( vr::VROverlayHandle_t overlayHandle,
+                              float alpha,
+                              std::string customErrorMsg = "" );
+
+OverlayError setOverlayWidthInMeters( vr::VROverlayHandle_t overlayHandle,
+                                      float widthInMeters,
+                                      std::string customErrorMsg = "" );
+OverlayError setOverlayFromFile( vr::VROverlayHandle_t overlayHandle,
+                                 std::string fileName,
+                                 std::string customErrorMsg = "" );
+OverlayError showOverlay( vr::VROverlayHandle_t overlayHandle,
+                          std::string customErrorMsg = "" );
+OverlayError hideOverlay( vr::VROverlayHandle_t overlayHandle,
+                          std::string customErrorMsg = "" );
+OverlayError setOverlayTransformAbsolute(
+    vr::VROverlayHandle_t overlayHandle,
+    vr::ETrackingUniverseOrigin trackingOrigin,
+    const vr::HmdMatrix34_t* trackingOriginToOverlayTransform,
+    std::string customErrorMsg = "" );
+
+std::string getOverlayKey( vr::VROverlayHandle_t overlayHandle );
+
+} // namespace ovr_overlay_wrapper