Refactor flat screen display to use overlay system

src/ModSettings.cpp

@@ -1,17 +1,10 @@
 #include "ModSettings.h"
 
-#include "mods/VR.hpp"
-
 namespace ModSettings {
     InternalSettings g_internalSettings;
 
     bool showFlatScreenDisplay()
     {
-        static auto vr = VR::get();
-        //TODO fix for openvr
-        if (vr->is_hmd_active() && vr->get_runtime()->is_openvr()) {
-            return false;
-        }
         return g_internalSettings.forceFlatScreen || g_internalSettings.showQuadDisplay;
     }
 }

src/mods/VR.cpp

@@ -1172,12 +1172,6 @@ void VR::on_draw_ui() {
             m_openxr->resolution_scale = m_resolution_scale->value();
         }
 
-        m_flat_screen_distance->draw("Flat Screen Distance");
-        if (ImGui::IsItemDeactivatedAfterEdit())
-        {
-            get_runtime()->m_flat_screen_distance = m_flat_screen_distance->value();
-        }
-
         m_horizontal_fov_scale->draw("Horizontal FOV Scale");
         if (ImGui::IsItemDeactivatedAfterEdit()) {
             get_runtime()->m_horizontal_fov_scale = m_horizontal_fov_scale->value();
@@ -1316,7 +1310,6 @@ void VR::on_config_load(const utility::Config& cfg, bool set_defaults) {
         get_runtime()->m_horizontal_fov_scale = m_horizontal_fov_scale->value();
         get_runtime()->m_vertical_fov_scale = m_vertical_fov_scale->value();
         get_runtime()->m_extended_fov_range = m_extended_fov_rage->value();
-        get_runtime()->m_flat_screen_distance = m_flat_screen_distance->value();
     }
     m_overlay_component.on_config_load(cfg, set_defaults);
 

src/mods/VR.hpp

@@ -619,7 +619,6 @@ class VR : public Mod {
     const ModSlider::Ptr m_horizontal_fov_scale{ ModSlider::create(generate_name("HorizontalFOVScale"), 0.0f, 1.0f, 1.0f) };
     const ModSlider::Ptr m_vertical_fov_scale{ ModSlider::create(generate_name("VerticalFOVScale"), 0.0f, 1.0f, 1.0f) };
     const ModToggle::Ptr m_extended_fov_rage{ ModToggle::create(generate_name("ExtendedScaleFovRange"), false) };
-    const ModSlider::Ptr m_flat_screen_distance{ ModSlider::create(generate_name("FlatSCreenDistance"), 0.0f, 2.0f, 1.5f) };
 
     const ModToggle::Ptr m_force_fps_settings{ ModToggle::create(generate_name("ForceFPS"), true) };
     const ModToggle::Ptr m_force_aa_settings{ ModToggle::create(generate_name("ForceAntiAliasing"), true) };

src/mods/vr/D3D11Component.cpp

@@ -437,6 +437,13 @@ vr::EVRCompositorError D3D11Component::on_frame(VR* vr) {
 
             auto& openxr_overlay = vr->get_overlay_component().get_openxr();
 
+            if (ModSettings::showFlatScreenDisplay()) {
+                const auto slate_quad = openxr_overlay.generate_slate_quad();
+                if (slate_quad) {
+                    quad_layers.push_back((XrCompositionLayerBaseHeader*)&slate_quad->get());
+                }
+            }
+
             if (m_openxr.ever_acquired((uint32_t)runtimes::OpenXR::SwapchainIndex::FRAMEWORK_UI)) {
                 const auto framework_quad = openxr_overlay.generate_framework_ui_quad();
 

src/mods/vr/D3D12Component.cpp

@@ -1,6 +1,7 @@
 #include <openvr.h>
 #include <utility/ScopeGuard.hpp>
 #include <aer/ConstantsPool.h>
+#include <ModSettings.h>
 
 #include "mods/VR.hpp"
 
@@ -234,6 +235,13 @@ vr::EVRCompositorError D3D12Component::on_frame(VR* vr) {
 
             auto& openxr_overlay = vr->get_overlay_component().get_openxr();
 
+            if (ModSettings::showFlatScreenDisplay()) {
+                const auto slate_quad = openxr_overlay.generate_slate_quad();
+                if (slate_quad) {
+                    quad_layers.push_back((XrCompositionLayerBaseHeader*)&slate_quad->get());
+                }
+            }
+
             if (m_openxr.ever_acquired((uint32_t)runtimes::OpenXR::SwapchainIndex::FRAMEWORK_UI)) {
                 const auto framework_quad = openxr_overlay.generate_framework_ui_quad();
                 if (framework_quad) {