Video and Steam VR Tab Re-work + keyboard binds (#289)

* changed color overlay to use gain values instead of overlay * moved SS/Motion smoothing, and filter to video tab * began refactor of steamVR qml page * added misc toggles to steamvr tab * added imu fallback and DND, and some qml formatting * added Camera Settings to SteamVR page * changed formatting to minimize height * added video profiles cleaned up steamvr controller * delta comparison change * added profiles for video * fixed display bug in colorgroupbox and removed frivoulous saves * removed commented code * added custom keybind buttons
2019-09-01 02:35:00 -05:00
parent 5452144157
commit 4b0be27ff6
24 changed files with 1750 additions and 1257 deletions
@@ -10,51 +10,43 @@ namespace advsettings
 // forward declaration
 class OverlayController;

-struct SteamVRProfile
-{
-    std::string profileName;
-
-    bool includesSupersampling = false;
-    float supersampling = 1.0f;
-
-    bool includesSupersampleFiltering = false;
-    bool supersampleFiltering = false;
-    bool motionSmooth = false;
-    bool includesMotionSmoothing = false;
-    bool supersampleOverride = false;
-};
-
 class SteamVRTabController : public QObject
 {
    Q_OBJECT
-    Q_PROPERTY( float superSampling READ superSampling WRITE setSuperSampling
-                    NOTIFY superSamplingChanged )
+    Q_PROPERTY( bool systemButton READ systemButton WRITE setSystemButton NOTIFY
+                    systemButtonChanged )
+    Q_PROPERTY( bool multipleDriver READ multipleDriver WRITE setMultipleDriver
+                    NOTIFY multipleDriverChanged )

-    Q_PROPERTY( bool motionSmoothing READ motionSmoothing WRITE
-                    setMotionSmoothing NOTIFY motionSmoothingChanged )
-    Q_PROPERTY( bool allowSupersampleFiltering READ allowSupersampleFiltering
-                    WRITE setAllowSupersampleFiltering NOTIFY
-                        allowSupersampleFilteringChanged )
-    Q_PROPERTY(
-        bool allowSupersampleOverride READ allowSupersampleOverride WRITE
-            setAllowSupersampleOverride NOTIFY allowSupersampleOverrideChanged )
+    Q_PROPERTY( bool noFadeToGrid READ noFadeToGrid WRITE setNoFadeToGrid NOTIFY
+                    noFadeToGridChanged )

    Q_PROPERTY( bool performanceGraph READ performanceGraph WRITE
                    setPerformanceGraph NOTIFY performanceGraphChanged )
+    Q_PROPERTY( bool dnd READ dnd WRITE setDND NOTIFY dNDChanged )
+
+    Q_PROPERTY( bool cameraActive READ cameraActive WRITE setCameraActive NOTIFY
+                    cameraActiveChanged )
+    Q_PROPERTY( bool cameraBounds READ cameraBounds WRITE setCameraBounds NOTIFY
+                    cameraBoundsChanged )
+    Q_PROPERTY( bool cameraRoom READ cameraRoom WRITE setCameraRoom NOTIFY
+                    cameraRoomChanged )
+    Q_PROPERTY( bool cameraDashboard READ cameraDashboard WRITE
+                    setCameraDashboard NOTIFY cameraDashboardChanged )

 private:
    OverlayController* parent;

-    float m_superSampling = 1.0;
-    bool m_motionSmoothing = true;
-    bool m_allowSupersampleFiltering = true;
-    bool m_allowSupersampleOverride = false;
    bool m_performanceGraphToggle = false;
+    bool m_systemButtonToggle = false;
+    bool m_noFadeToGridToggle = false;
+    bool m_multipleDriverToggle = false;
+    bool m_dnd = false;

-    void initMotionSmoothing();
-    void initSupersampleOverride();
-
-    std::vector<SteamVRProfile> steamvrProfiles;
+    bool m_cameraActive = false;
+    bool m_cameraBounds = false;
+    bool m_cameraRoom = false;
+    bool m_cameraDashboard = false;

    unsigned settingsUpdateCounter = 0;

@@ -65,44 +57,44 @@ public:
    void eventLoopTick();
    void dashboardLoopTick();

-    float superSampling() const;
-    bool motionSmoothing() const;
-    bool allowSupersampleFiltering() const;
-    bool allowSupersampleOverride() const;
    bool performanceGraph() const;
+    bool noFadeToGrid() const;
+    bool multipleDriver() const;
+    bool systemButton() const;
+    bool dnd() const;

-    void reloadSteamVRProfiles();
-    void saveSteamVRProfiles();
-
-    Q_INVOKABLE int getSteamVRProfileCount();
-    Q_INVOKABLE QString getSteamVRProfileName( unsigned index );
+    bool cameraActive() const;
+    bool cameraBounds() const;
+    bool cameraRoom() const;
+    bool cameraDashboard() const;

 public slots:
-    void setSuperSampling( float value, bool notify = true );
-    void setMotionSmoothing( bool value, bool notify = true );
-    void setAllowSupersampleFiltering( bool value, bool notify = true );
-    void setAllowSupersampleOverride( bool value, bool notify = true );
+
    void setPerformanceGraph( bool value, bool notify = true );
+    void setSystemButton( bool value, bool notify = true );
+    void setNoFadeToGrid( bool value, bool notify = true );
+    void setMultipleDriver( bool value, bool notify = true );
+    void setDND( bool value, bool notify = true );

-    void addSteamVRProfile( QString name,
-                            bool includeSupersampling,
-                            bool includeSupersampleFiltering,
-                            bool includeMotionSmoothing );
-    void applySteamVRProfile( unsigned index );
-    void deleteSteamVRProfile( unsigned index );
+    void setCameraActive( bool value, bool notify = true );
+    void setCameraBounds( bool value, bool notify = true );
+    void setCameraRoom( bool value, bool notify = true );
+    void setCameraDashboard( bool value, bool notify = true );

-    void reset();
    void restartSteamVR();

 signals:
-    void superSamplingChanged( float value );
-    void motionSmoothingChanged( bool value );
-    void allowSupersampleFilteringChanged( bool value );
-    void allowSupersampleOverrideChanged( bool value );
-    void performanceGraphChanged( bool value );

-    void steamVRProfilesUpdated();
-    void steamVRProfileAdded();
+    void performanceGraphChanged( bool value );
+    void multipleDriverChanged( bool value );
+    void systemButtonChanged( bool value );
+    void noFadeToGridChanged( bool value );
+    void dNDChanged( bool value );
+
+    void cameraActiveChanged( bool value );
+    void cameraBoundsChanged( bool value );
+    void cameraRoomChanged( bool value );
+    void cameraDashboardChanged( bool value );
 };

 } // namespace advsettings