Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 14:15:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #562 from jonian/sdl-mouse-fix

Browse source 
SDL: Fix mouse coords
This commit is contained in:
wheremyfoodat 2024-07-26 09:44:55 +00:00 • committed by GitHub
commit b7bc520afa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -502,7 +502,7 @@ if(NOT BUILD_HYDRA_CORE AND NOT BUILD_LIBRETRO_CORE)
)
else()
set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp src/panda_sdl/frontend_sdl.cpp src/panda_sdl/mappings.cpp)
set(FRONTEND_HEADER_FILES "")
set(FRONTEND_HEADER_FILES "include/panda_sdl/frontend_sdl.hpp")
endif()
target_link_libraries(Alber PRIVATE AlberCore)

2
include/panda_sdl/frontend_sdl.hpp
View file

@ -23,6 +23,8 @@ class FrontendSDL {
SDL_GameController* gameController = nullptr;
InputMappings keyboardMappings;
u32 windowWidth = 400;
u32 windowHeight = 480;
int gameControllerID;
bool programRunning = true;

24
src/panda_sdl/frontend_sdl.cpp
View file

@ -162,8 +162,13 @@ void FrontendSDL::run() {
if (emu.romType == ROMType::None) break;
if (event.button.button == SDL_BUTTON_LEFT) {
const s32 x = event.button.x;
const s32 y = event.button.y;
if (windowWidth == 0 || windowHeight == 0) [[unlikely]] {
break;
}
// Go from window positions to [0, 400) for x and [0, 480) for y
const s32 x = (s32)std::round(event.button.x * 400.f / windowWidth);
const s32 y = (s32)std::round(event.button.y * 480.f / windowHeight);
// Check if touch falls in the touch screen area
if (y >= 240 && y <= 480 && x >= 40 && x < 40 + 320) {
@ -242,8 +247,13 @@ void FrontendSDL::run() {
// Handle "dragging" across the touchscreen
if (hid.isTouchScreenPressed()) {
const s32 x = event.motion.x;
const s32 y = event.motion.y;
if (windowWidth == 0 || windowHeight == 0) [[unlikely]] {
break;
}
// Go from window positions to [0, 400) for x and [0, 480) for y
const s32 x = (s32)std::round(event.motion.x * 400.f / windowWidth);
const s32 y = (s32)std::round(event.motion.y * 480.f / windowHeight);
// Check if touch falls in the touch screen area and register the new touch screen position
if (y >= 240 && y <= 480 && x >= 40 && x < 40 + 320) {
@ -293,9 +303,9 @@ void FrontendSDL::run() {
case SDL_WINDOWEVENT: {
auto type = event.window.event;
if (type == SDL_WINDOWEVENT_RESIZED) {
const u32 width = event.window.data1;
const u32 height = event.window.data2;
emu.setOutputSize(width, height);
windowWidth = event.window.data1;
windowHeight = event.window.data2;
emu.setOutputSize(windowWidth, windowHeight);
}
}
}