isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ feat: forcibly draw cursor and map right joystick to cursor

Browse Source
This commit is contained in:
Helloyunho 2025-07-02 21:15:11 +09:00
parent 1fc404b9dd
commit 2782e0a1f2
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ISLE/isleapp.cpp
View File

@ -88,6 +88,11 @@ MxS32 g_targetDepth = 16;
// GLOBAL: ISLE 0x410064 // GLOBAL: ISLE 0x410064
MxS32 g_reqEnableRMDevice = FALSE; MxS32 g_reqEnableRMDevice = FALSE;
float g_lastJoystickMouseX = 0;
float g_lastJoystickMouseY = 0;
float g_lastMouseX = 0;
float g_lastMouseY = 0;
// STRING: ISLE 0x4101dc // STRING: ISLE 0x4101dc
#define WINDOW_TITLE "LEGO®" #define WINDOW_TITLE "LEGO®"
@ -373,6 +378,27 @@ SDL_AppResult SDL_AppIterate(void* appstate)
if (g_mousemoved) { if (g_mousemoved) {
g_mousemoved = FALSE; g_mousemoved = FALSE;
} }
if (g_lastJoystickMouseX != 0 || g_lastJoystickMouseY != 0) {
g_mousemoved = TRUE;
g_lastMouseX = SDL_clamp(g_lastMouseX + g_lastJoystickMouseX, 0, 640);
g_lastMouseY = SDL_clamp(g_lastMouseY + g_lastJoystickMouseY, 0, 480);
if (InputManager()) {
InputManager()->QueueEvent(
c_notificationMouseMove,
g_mousedown ? LegoEventNotificationParam::c_lButtonState : 0,
g_lastMouseX,
g_lastMouseY,
0
);
}
if (g_isle->GetDrawCursor()) {
VideoManager()->MoveCursor(Min((MxS32) g_lastMouseX, 639), Min((MxS32) g_lastMouseY, 479));
}
}
} }
return SDL_APP_CONTINUE; return SDL_APP_CONTINUE;
@ -466,6 +492,44 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event)
} }
break; break;
} }
case SDL_EVENT_JOYSTICK_AXIS_MOTION: {
if (event->gaxis.axis == SDL_XBOX_AXIS_RIGHT_X) {
g_lastJoystickMouseX = ((float) event->gaxis.value) / SDL_JOYSTICK_AXIS_MAX * 4;
}
else if (event->gaxis.axis == SDL_XBOX_AXIS_RIGHT_Y) {
g_lastJoystickMouseY = -((float) event->gaxis.value) / SDL_JOYSTICK_AXIS_MAX * 4;
}
else if (event->gaxis.axis == SDL_XBOX_AXIS_RIGHT_TRIGGER) {
SDL_Log("Right trigger axis motion: %d", event->gaxis.value);
if (event->gaxis.value != SDL_JOYSTICK_AXIS_MIN) {
g_mousedown = TRUE;
if (InputManager()) {
InputManager()->QueueEvent(
c_notificationButtonDown,
LegoEventNotificationParam::c_lButtonState,
g_lastMouseX,
g_lastMouseY,
0
);
}
}
else {
g_mousedown = FALSE;
if (InputManager()) {
InputManager()->QueueEvent(
c_notificationButtonUp,
LegoEventNotificationParam::c_lButtonState,
g_lastMouseX,
g_lastMouseY,
0
);
}
}
}
break;
}
case SDL_EVENT_MOUSE_MOTION: case SDL_EVENT_MOUSE_MOTION:
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
if (detectedTouchEvents) { if (detectedTouchEvents) {

4
LEGO1/omni/src/video/mxdisplaysurface.cpp
View File

@ -1032,10 +1032,6 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
return NULL; return NULL;
} }
if (ddsd.ddpfPixelFormat.dwRGBBitCount != 16) {
return NULL;
}
ddsd.dwWidth = 16; ddsd.dwWidth = 16;
ddsd.dwHeight = 16; ddsd.dwHeight = 16;
ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;