From de5844aae1355fd0dfa312ac44399136414d675d Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 23 May 2023 20:49:54 -0700 Subject: [PATCH] Minor main loop change for Emscripten --- project/src/backend/sdl/SDLApplication.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/project/src/backend/sdl/SDLApplication.cpp b/project/src/backend/sdl/SDLApplication.cpp index 07b7e81fd..c60f3af0b 100644 --- a/project/src/backend/sdl/SDLApplication.cpp +++ b/project/src/backend/sdl/SDLApplication.cpp @@ -42,12 +42,6 @@ namespace lime { framePeriod = 1000.0 / 60.0; - #ifdef EMSCRIPTEN - emscripten_cancel_main_loop (); - emscripten_set_main_loop (UpdateFrame, 0, 0); - emscripten_set_main_loop_timing (EM_TIMING_RAF, 1); - #endif - currentUpdate = 0; lastUpdate = 0; nextUpdate = 0; @@ -95,6 +89,12 @@ namespace lime { Init (); + #ifdef EMSCRIPTEN + emscripten_cancel_main_loop (); + emscripten_set_main_loop (UpdateFrame, 0, 0); + emscripten_set_main_loop_timing (EM_TIMING_RAF, 1); + #endif + #if defined(IPHONE) || defined(EMSCRIPTEN) return 0; @@ -891,7 +891,7 @@ namespace lime { currentUpdate = SDL_GetTicks (); - #if defined (IPHONE) + #if defined (IPHONE) || defined (EMSCRIPTEN) if (currentUpdate >= nextUpdate) { @@ -901,12 +901,6 @@ namespace lime { } - #elif defined (EMSCRIPTEN) - - event.type = SDL_USEREVENT; - HandleEvent (&event); - event.type = -1; - #else if (currentUpdate >= nextUpdate) {