Merge pull request #3632 from N00byKing/3dtv_botenable

Add Support for Stereoscopic 3D

src/core/frontend/emu_window.cpp

@@ -60,9 +60,17 @@ EmuWindow::~EmuWindow() {
  */
 static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigned framebuffer_x,
                                 unsigned framebuffer_y) {
-    return (
-        framebuffer_y >= layout.bottom_screen.top && framebuffer_y < layout.bottom_screen.bottom &&
-        framebuffer_x >= layout.bottom_screen.left && framebuffer_x < layout.bottom_screen.right);
+    if (Settings::values.toggle_3d) {
+        return (framebuffer_y >= layout.bottom_screen.top &&
+                framebuffer_y < layout.bottom_screen.bottom &&
+                framebuffer_x >= layout.bottom_screen.left / 2 &&
+                framebuffer_x < layout.bottom_screen.right / 2);
+    } else {
+        return (framebuffer_y >= layout.bottom_screen.top &&
+                framebuffer_y < layout.bottom_screen.bottom &&
+                framebuffer_x >= layout.bottom_screen.left &&
+                framebuffer_x < layout.bottom_screen.right);
+    }
 }
 
 std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) {
@@ -80,9 +88,16 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
         return;
 
     std::lock_guard<std::mutex> guard(touch_state->mutex);
-    touch_state->touch_x =
-        static_cast<float>(framebuffer_x - framebuffer_layout.bottom_screen.left) /
-        (framebuffer_layout.bottom_screen.right - framebuffer_layout.bottom_screen.left);
+    if (Settings::values.toggle_3d) {
+        touch_state->touch_x =
+            static_cast<float>(framebuffer_x - framebuffer_layout.bottom_screen.left / 2) /
+            (framebuffer_layout.bottom_screen.right / 2 -
+             framebuffer_layout.bottom_screen.left / 2);
+    } else {
+        touch_state->touch_x =
+            static_cast<float>(framebuffer_x - framebuffer_layout.bottom_screen.left) /
+            (framebuffer_layout.bottom_screen.right - framebuffer_layout.bottom_screen.left);
+    }
     touch_state->touch_y =
         static_cast<float>(framebuffer_y - framebuffer_layout.bottom_screen.top) /
         (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top);

src/core/hle/shared_page.cpp

@@ -8,6 +8,7 @@
 #include "core/core_timing.h"
 #include "core/hle/service/ptm/ptm.h"
 #include "core/hle/shared_page.h"
+#include "core/settings.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -83,6 +84,10 @@ void Init() {
     update_time_event =
         CoreTiming::RegisterEvent("SharedPage::UpdateTimeCallback", UpdateTimeCallback);
     CoreTiming::ScheduleEvent(0, update_time_event);
+
+    float slidestate =
+        Settings::values.toggle_3d ? (float_le)Settings::values.factor_3d / 100 : 0.0f;
+    shared_page.sliderstate_3d = slidestate;
 }
 
 void SetMacAddress(const MacAddress& addr) {

src/core/settings.h

@@ -132,6 +132,9 @@ struct Values {
     float bg_green;
     float bg_blue;
 
+    bool toggle_3d;
+    u8 factor_3d;
+
     // Audio
     std::string sink_id;
     bool enable_audio_stretching;