townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed emscripten demo

Browse Source
This commit is contained in:
Michael Tesch 2019-01-25 11:03:26 +01:00
parent ee308dcfb3
commit 06116752c3
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Demo/CMakeLists.txt
View File

@ -165,8 +165,9 @@ if(TB_BUILD_DEMO_SDL2)
if(EMSCRIPTEN)
add_custom_command(TARGET TurboBadgerDemoSDL
PRE_LINK
COMMAND rsync -av --exclude='*.psd' ${CMAKE_SOURCE_DIR}/resources /tmp/resources
COMMAND rsync -av --include='*/' --include='*.txt' --include='*.png' --exclude='*' ${CMAKE_CURRENT_SOURCE_DIR}/demo01 /tmp/demo01 )
COMMAND rm -rf /tmp/resources /tmp/demo01
COMMAND rsync -av --exclude='*.psd' ${CMAKE_SOURCE_DIR}/resources /tmp/
COMMAND rsync -av --include='*/' --include='*.txt' --include='*.png' --exclude='*' ${CMAKE_CURRENT_SOURCE_DIR}/demo01 /tmp )
endif(EMSCRIPTEN)
endif(TB_BUILD_DEMO_SDL2)

2
Demo/platform/main.cpp
View File

@ -33,7 +33,7 @@ bool port_main(int argc, char* argv[])
#ifdef TB_TARGET_WINDOWS
// Set the current path to the directory of the app so we find
// assets also when visual studio start it.
// assets also when visual studio starts it.
char modname[MAX_PATH];
GetModuleFileName(NULL, modname, MAX_PATH);
TBTempBuffer buf;

34
Demo/platform/port_sdl2.cpp
View File

@ -5,6 +5,13 @@
#include <stdio.h>
#include <stddef.h>
#include <string.h>
#ifdef __EMSCRIPTEN__
#include <emscripten.h>
#include <emscripten/html5.h>
//#include <emscripten/bind.h>
#endif
#include "tb_skin.h"
#include "tb_system.h"
#include "tb_msg.h"
@ -198,8 +205,31 @@ AppBackendSDL2::~AppBackendSDL2()
g_renderer = nullptr;
}
#ifdef __EMSCRIPTEN__
//using namespace emscripten;
static AppBackendSDL2 *backend;
void mainloop()
{
// Event loop
SDL_Event event;
if (SDL_PollEvent(&event))
if (!backend->HandleSDLEvent(event))
SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "mainloop() unhandled SDL event: 0x%x\n", event.type);
// Decide when we should be called next
if (SDL_PollEvent(NULL))
emscripten_set_main_loop_timing(EM_TIMING_SETIMMEDIATE, 0);
else
emscripten_set_main_loop_timing(EM_TIMING_RAF, 1);
}
#endif // __EMSCRIPTEN__
void AppBackendSDL2::EventLoop()
{
#ifdef __EMSCRIPTEN__
backend = this;
emscripten_set_main_loop(mainloop, 0, 1);
#else
SDL_Event event;
do
{
@ -209,6 +239,7 @@ void AppBackendSDL2::EventLoop()
SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "Unhandled SDL event: 0x%x\n", event.type);
} while (!m_quit_requested);
#endif
}
void AppBackendSDL2::OnAppEvent(const EVENT &ev)
@ -237,8 +268,7 @@ void AppBackendSDL2::OnAppEvent(const EVENT &ev)
}
// Attempt to convert an sdl event to a TB event, return true if handled
bool
AppBackendSDL2::HandleSDLEvent(SDL_Event & event)
bool AppBackendSDL2::HandleSDLEvent(SDL_Event & event)
{
bool handled = true;
switch (event.type) {