Merge branch 'raysan5:master' into master

This commit is contained in:
piecetou 2024-06-09 19:30:51 +10:00 committed by GitHub
commit 56ee233c2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 561 additions and 329 deletions

744
src/external/RGFW.h vendored

File diff suppressed because it is too large Load Diff

View File

@ -431,7 +431,11 @@ void SetWindowFocused(void)
// Get native window handle // Get native window handle
void *GetWindowHandle(void) void *GetWindowHandle(void)
{ {
return platform.window->src.window; #ifndef RGFW_WINDOWS
return (void*)platform.window->src.window;
#else
return platform.window->src.hwnd;
#endif
} }
// Get number of monitors // Get number of monitors
@ -890,8 +894,6 @@ void PollInputEvents(void)
CORE.Input.Mouse.currentPosition.x = (event->point.x - (platform.window->r.w / 2)) * 2; CORE.Input.Mouse.currentPosition.x = (event->point.x - (platform.window->r.w / 2)) * 2;
CORE.Input.Mouse.currentPosition.y = (event->point.y - (platform.window->r.h / 2)) * 2; CORE.Input.Mouse.currentPosition.y = (event->point.y - (platform.window->r.h / 2)) * 2;
RGFW_window_showMouse(platform.window, 1);
} }
else { else {
CORE.Input.Mouse.previousPosition = CORE.Input.Mouse.currentPosition; CORE.Input.Mouse.previousPosition = CORE.Input.Mouse.currentPosition;