maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix RenderLoop to use (C) ResourceLoaderWrapper and destroy RL when viewer is destroyed

Browse Source
This commit is contained in:
Nick Fisher
2024-06-19 13:16:33 +08:00
parent 49b8e7023b
commit 7dc0e91e6b
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
thermion_dart/native/src/ThermionDartFFIApi.cpp
View File

@@ -15,7 +15,6 @@ extern "C"
} }
#include <pthread.h> #include <pthread.h>
#endif #endif
#include "ThermionDartFFIApi.h" #include "ThermionDartFFIApi.h"
@@ -52,6 +51,7 @@ public:
{ {
_stop = true; _stop = true;
pthread_join(t, NULL); pthread_join(t, NULL);
Log("Render loop killed");
} }
static void mainLoop(void* arg) { static void mainLoop(void* arg) {
@@ -103,48 +103,47 @@ public:
} }
} }
void createViewer(void *const context, void *const platform, void createViewer(void *const context,
void *const platform,
const char *uberArchivePath, const char *uberArchivePath,
const ResourceLoaderWrapperImpl *const loader, const ResourceLoaderWrapper *const loader,
void (*renderCallback)(void *), void (*renderCallback)(void *),
void *const owner, void *const owner,
void (*callback)(void *const)) void (*callback)(void *const))
{ {
_renderCallback = renderCallback; _renderCallback = renderCallback;
_renderCallbackOwner = owner; _renderCallbackOwner = owner;
std::packaged_task<FilamentViewer *()> lambda([=]() mutable std::packaged_task<void()> lambda([=]() mutable
{ {
FilamentViewer* viewer = nullptr;
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
_context = thermion_dart_web_create_gl_context(); _context = thermion_dart_web_create_gl_context();
auto success = emscripten_webgl_make_context_current((EMSCRIPTEN_WEBGL_CONTEXT_HANDLE)_context); auto success = emscripten_webgl_make_context_current((EMSCRIPTEN_WEBGL_CONTEXT_HANDLE)_context);
if(success != EMSCRIPTEN_RESULT_SUCCESS) { if(success != EMSCRIPTEN_RESULT_SUCCESS) {
std::cout << "Failed to make context current." << std::endl; std::cout << "Failed to make context current." << std::endl;
return viewer; return;
} }
glClearColor(0.0, 0.5, 0.5, 1.0); glClearColor(0.0, 0.5, 0.5, 1.0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
// emscripten_webgl_commit_frame(); // emscripten_webgl_commit_frame();
viewer = (FilamentViewer*) create_filament_viewer((void* const) _context, loader, platform, uberArchivePath); _viewer = (FilamentViewer*) create_filament_viewer((void* const) _context, loader, platform, uberArchivePath);
MAIN_THREAD_EM_ASM({ MAIN_THREAD_EM_ASM({
moduleArg.dartFilamentResolveCallback($0, $1); moduleArg.dartFilamentResolveCallback($0, $1);
}, callback, viewer); }, callback, _viewer);
#else #else
viewer = (FilamentViewer*)create_filament_viewer(context, loader, platform, uberArchivePath); _viewer = (FilamentViewer*)create_filament_viewer(context, loader, platform, uberArchivePath);
callback(viewer); callback(_viewer);
#endif #endif
_viewer = viewer; });
return viewer; });
auto fut = add_task(lambda); auto fut = add_task(lambda);
} }
void destroyViewer(FilamentViewer* viewer) void destroyViewer(FilamentViewer* viewer)
{ {
std::packaged_task<void()> lambda([=]() mutable std::packaged_task<void()> lambda([=]() mutable {
{
_rendering = false; _rendering = false;
_viewer = nullptr;
destroy_filament_viewer(viewer); destroy_filament_viewer(viewer);
}); });
auto fut = add_task(lambda); auto fut = add_task(lambda);
@@ -237,13 +236,15 @@ extern "C"
{ {
_rl = new RenderLoop(); _rl = new RenderLoop();
} }
_rl->createViewer(context, platform, uberArchivePath, (const ResourceLoaderWrapperImpl *const)loader, _rl->createViewer(context, platform, uberArchivePath, (const ResourceLoaderWrapper *const)loader,
renderCallback, renderCallbackOwner, callback); renderCallback, renderCallbackOwner, callback);
} }
EMSCRIPTEN_KEEPALIVE void destroy_filament_viewer_ffi(void *const viewer) EMSCRIPTEN_KEEPALIVE void destroy_filament_viewer_ffi(void *const viewer)
{ {
_rl->destroyViewer((FilamentViewer*)viewer); _rl->destroyViewer((FilamentViewer*)viewer);
delete _rl;
_rl = nullptr;
} }
EMSCRIPTEN_KEEPALIVE void create_swap_chain_ffi(void *const viewer, EMSCRIPTEN_KEEPALIVE void create_swap_chain_ffi(void *const viewer,