From 18bb45dcd8a85751daa63269186a575f3dfdb70c Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Thu, 19 Sep 2024 09:16:06 +0800 Subject: [PATCH] use TMaterialInstance for FFI API, add priority/layer params to load_glb_from_buffer --- thermion_dart/native/src/ThermionDartFFIApi.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/thermion_dart/native/src/ThermionDartFFIApi.cpp b/thermion_dart/native/src/ThermionDartFFIApi.cpp index f8153fca..80ca6222 100644 --- a/thermion_dart/native/src/ThermionDartFFIApi.cpp +++ b/thermion_dart/native/src/ThermionDartFFIApi.cpp @@ -407,12 +407,14 @@ extern "C" size_t length, int numInstances, bool keepData, + int priority, + int layer, void (*callback)(EntityId)) { std::packaged_task lambda( [=]() mutable { - auto entity = load_glb_from_buffer(sceneManager, data, length, keepData); + auto entity = load_glb_from_buffer(sceneManager, data, length, keepData, priority, layer); callback(entity); return entity; }); @@ -840,14 +842,14 @@ extern "C" uint16_t *indices, int numIndices, int primitiveType, - const char *materialPath, + TMaterialInstance * materialInstance, bool keepData, void (*callback)(EntityId)) { std::packaged_task lambda( [=] { - auto entity = create_geometry(sceneManager, vertices, numVertices, normals, numNormals, uvs, numUvs, indices, numIndices, primitiveType, materialPath); + auto entity = create_geometry(sceneManager, vertices, numVertices, normals, numNormals, uvs, numUvs, indices, numIndices, primitiveType, materialInstance, keepData); #ifdef __EMSCRIPTEN__ MAIN_THREAD_EM_ASM({ moduleArg.dartFilamentResolveCallback($0,$1);