diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-28 03:06:59 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-28 03:41:24 +0200 |
commit | eb10f250254a0153abd789e49a36945d996631a7 (patch) | |
tree | 5f7a0e290892f1137ccd28420991ef7981377cf6 /src/core/frontend/emu_window.cpp | |
parent | OpenGL: Remove unused RendererOpenGL fields (diff) | |
download | yuzu-eb10f250254a0153abd789e49a36945d996631a7.tar yuzu-eb10f250254a0153abd789e49a36945d996631a7.tar.gz yuzu-eb10f250254a0153abd789e49a36945d996631a7.tar.bz2 yuzu-eb10f250254a0153abd789e49a36945d996631a7.tar.lz yuzu-eb10f250254a0153abd789e49a36945d996631a7.tar.xz yuzu-eb10f250254a0153abd789e49a36945d996631a7.tar.zst yuzu-eb10f250254a0153abd789e49a36945d996631a7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/frontend/emu_window.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 5fdb3a7e8..4f7d54a33 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -5,10 +5,10 @@ #include <algorithm> #include <cmath> #include "common/assert.h" +#include "core/3ds.h" #include "core/core.h" #include "core/frontend/emu_window.h" #include "core/settings.h" -#include "video_core/video_core.h" /** * Check if the given x/y coordinates are within the touchpad specified by the framebuffer layout @@ -38,11 +38,9 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) { if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y)) return; - touch_x = VideoCore::kScreenBottomWidth * - (framebuffer_x - framebuffer_layout.bottom_screen.left) / + touch_x = Core::kScreenBottomWidth * (framebuffer_x - framebuffer_layout.bottom_screen.left) / (framebuffer_layout.bottom_screen.right - framebuffer_layout.bottom_screen.left); - touch_y = VideoCore::kScreenBottomHeight * - (framebuffer_y - framebuffer_layout.bottom_screen.top) / + touch_y = Core::kScreenBottomHeight * (framebuffer_y - framebuffer_layout.bottom_screen.top) / (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); touch_pressed = true; |