Merge branch 'raysan5:master' into master
This commit is contained in:
commit
56ee233c2a
744
src/external/RGFW.h
vendored
744
src/external/RGFW.h
vendored
File diff suppressed because it is too large
Load Diff
|
|
@ -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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user