|
|
@ -129,7 +129,7 @@ static void CursorEnterCallback(GLFWwindow *window, int enter); |
|
|
|
|
|
|
|
// Emscripten window callback events |
|
|
|
static EM_BOOL EmscriptenFullscreenChangeCallback(int eventType, const EmscriptenFullscreenChangeEvent *event, void *userData); |
|
|
|
static EM_BOOL f">EmscriptenWindowResizedCallback(int eventType, const EmscriptenUiEvent *event, void *userData); |
|
|
|
// static EM_BOOL EmscriptenWindowResizedCallback(int eventType, const EmscriptenUiEvent *event, void *userData); |
|
|
|
static EM_BOOL EmscriptenResizeCallback(int eventType, const EmscriptenUiEvent *event, void *userData); |
|
|
|
|
|
|
|
// Emscripten input callback events |
|
|
@ -981,7 +981,7 @@ void PollInputEvents(void) |
|
|
|
default: break; |
|
|
|
} |
|
|
|
|
|
|
|
if (button != -1) // Check for valid button |
|
|
|
if (button + 1 != 0) // Check for valid button |
|
|
|
{ |
|
|
|
if (gamepadState.digitalButton[j] == 1) |
|
|
|
{ |
|
|
@ -1572,12 +1572,12 @@ static EM_BOOL EmscriptenFullscreenChangeCallback(int eventType, const Emscripte |
|
|
|
} |
|
|
|
|
|
|
|
// Register window resize event |
|
|
|
static EM_BOOL EmscriptenWindowResizedCallback(int eventType, const EmscriptenUiEvent *event, void *userData) |
|
|
|
{ |
|
|
|
// TODO: Implement EmscriptenWindowResizedCallback()? |
|
|
|
// static EM_BOOL EmscriptenWindowResizedCallback(int eventType, const EmscriptenUiEvent *event, void *userData) |
|
|
|
// { |
|
|
|
// // TODO: Implement EmscriptenWindowResizedCallback()? |
|
|
|
|
|
|
|
return 1; // The event was consumed by the callback handler |
|
|
|
} |
|
|
|
// return 1; // The event was consumed by the callback handler |
|
|
|
// } |
|
|
|
|
|
|
|
EM_JS(int, GetWindowInnerWidth, (), { return window.innerWidth; }); |
|
|
|
EM_JS(int, GetWindowInnerHeight, (), { return window.innerHeight; }); |
|
|
@ -1593,11 +1593,11 @@ static EM_BOOL EmscriptenResizeCallback(int eventType, const EmscriptenUiEvent * |
|
|
|
int width = GetWindowInnerWidth(); |
|
|
|
int height = GetWindowInnerHeight(); |
|
|
|
|
|
|
|
if (width < CORE.Window.screenMin.width) width = CORE.Window.screenMin.width; |
|
|
|
else if (width > CORE.Window.screenMax.width && CORE.Window.screenMax.width > 0) width = CORE.Window.screenMax.width; |
|
|
|
if (width < p">(int)CORE.Window.screenMin.width) width = CORE.Window.screenMin.width; |
|
|
|
else if (width > p">(int)CORE.Window.screenMax.width && CORE.Window.screenMax.width > 0) width = CORE.Window.screenMax.width; |
|
|
|
|
|
|
|
if (height < CORE.Window.screenMin.height) height = CORE.Window.screenMin.height; |
|
|
|
else if (height > CORE.Window.screenMax.height && CORE.Window.screenMax.height > 0) height = CORE.Window.screenMax.height; |
|
|
|
if (height < p">(int)CORE.Window.screenMin.height) height = CORE.Window.screenMin.height; |
|
|
|
else if (height > p">(int)CORE.Window.screenMax.height && CORE.Window.screenMax.height > 0) height = CORE.Window.screenMax.height; |
|
|
|
|
|
|
|
emscripten_set_canvas_element_size("#canvas", width, height); |
|
|
|
|
|
|
|