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

add Dart IndirectLight and Ktx1Bundle classes, and separate KTX decoding from skybox/IBL creation

Browse Source
This commit is contained in:
Nick Fisher
2025-06-12 11:31:44 +08:00
parent f252c86152
commit ad26fc4563
16 changed files with 424 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
thermion_dart/native/src/c_api/TTexture.cpp
View File

@@ -94,33 +94,49 @@ namespace thermion
return reinterpret_cast<TLinearImage *>(linearImage);
}
EMSCRIPTEN_KEEPALIVE TTexture *Texture_decodeKtx(
TEngine *tEngine,
uint8_t *ktxData,
size_t length,
float *sphericalHarmonics,
uint32_t requestId,
VoidCallback onTextureUploadComplete)
EMSCRIPTEN_KEEPALIVE TKtx1Bundle *Ktx1Bundle_create(uint8_t *ktxData, size_t length)
{
auto *bundle = new image::Ktx1Bundle(ktxData, static_cast<uint32_t>(length));
return reinterpret_cast<TKtx1Bundle *>(bundle);
}
auto engine = reinterpret_cast<filament::Engine *>(tEngine);
EMSCRIPTEN_KEEPALIVE bool Ktx1Bundle_isCubemap(TKtx1Bundle *tBundle)
{
auto *bundle = reinterpret_cast<image::Ktx1Bundle *>(tBundle);
return bundle->isCubemap();
}
auto copy = new std::vector<uint8_t>(ktxData, ktxData + length);
image::Ktx1Bundle *bundle =
new image::Ktx1Bundle(static_cast<const uint8_t *>(copy->data()),
static_cast<uint32_t>(length));
EMSCRIPTEN_KEEPALIVE void Ktx1Bundle_destroy(
TKtx1Bundle *tBundle)
{
auto *bundle = reinterpret_cast<image::Ktx1Bundle *>(tBundle);
delete bundle;
}
EMSCRIPTEN_KEEPALIVE void Ktx1Bundle_getSphericalHarmonics(TKtx1Bundle *tBundle, float *sphericalHarmonics)
{
auto *bundle = reinterpret_cast<image::Ktx1Bundle *>(tBundle);
filament::math::float3 harmonics[9];
if (sphericalHarmonics)
{
bundle->getSphericalHarmonics(harmonics);
memcpy(sphericalHarmonics, harmonics, 27 * sizeof(float));
}
}
EMSCRIPTEN_KEEPALIVE TTexture *Ktx1Reader_createTexture(
TEngine *tEngine,
TKtx1Bundle *tBundle,
uint32_t requestId,
VoidCallback onTextureUploadComplete)
{
auto engine = reinterpret_cast<filament::Engine *>(tEngine);
auto *bundle = reinterpret_cast<image::Ktx1Bundle *>(tBundle);
std::vector<void *> *callbackData = new std::vector<void *>{
reinterpret_cast<void *>(onTextureUploadComplete),
reinterpret_cast<void *>(bundle),
reinterpret_cast<void *>(copy),
reinterpret_cast<void *>(requestId)};
auto *texture =
@@ -130,9 +146,7 @@ namespace thermion
std::vector<void*>* vec = (std::vector<void*>*)userdata;
void *callbackPtr = vec->at(0);
image::Ktx1Bundle *bundle = reinterpret_cast<image::Ktx1Bundle *>(vec->at(1));
std::vector<uint8_t> *copy = reinterpret_cast<std::vector<uint8_t>*>(vec->at(2));
uintptr_t requestId = (uintptr_t)vec->at(3);
uintptr_t requestId = (uintptr_t)vec->at(2);
delete vec;
@@ -140,9 +154,7 @@ namespace thermion
{
auto callback = ((VoidCallback)callbackPtr);
callback(requestId);
}
delete bundle;
delete copy; },
} },
(void *)callbackData);
return reinterpret_cast<TTexture *>(texture);
}

24
thermion_dart/native/src/c_api/ThermionDartRenderThreadApi.cpp
View File

@@ -864,7 +864,9 @@ extern "C"
#ifdef EMSCRIPTEN
static std::unordered_map<uint32_t, std::function<void(int32_t)>> _emscriptenWrappers;
static void Emscripten_voidCallback(int32_t requestId) {
EMSCRIPTEN_KEEPALIVE static void Emscripten_voidCallback(int32_t requestId) {
Log("Emscripten_voidCallback: requestId %d", requestId);
auto it = _emscriptenWrappers.find(requestId);
if (it != _emscriptenWrappers.end()) {
it->second(requestId);
@@ -876,19 +878,23 @@ extern "C"
#endif
EMSCRIPTEN_KEEPALIVE void Texture_decodeKtxRenderThread(
TEngine *tEngine, uint8_t *ktxData, size_t length, float *sphericalHarmonics, uint32_t requestId, VoidCallback onTextureUploadComplete, void (*onComplete)(TTexture *)) {
EMSCRIPTEN_KEEPALIVE void Ktx1Reader_createTextureRenderThread(
TEngine *tEngine, TKtx1Bundle *tBundle, uint32_t requestId, VoidCallback onTextureUploadComplete, void (*onComplete)(TTexture *)) {
#ifdef EMSCRIPTEN
if(onTextureUploadComplete) {
_emscriptenWrappers[requestId] = [=](int32_t requestId) {
PROXY(onTextureUploadComplete(requestId));
};
}
#endif
std::packaged_task<void()> lambda(
[=]() mutable
{
#ifdef EMSCRIPTEN
std::function<void(int32_t)> wrapper = [=](int32_t requestId) {
PROXY(onTextureUploadComplete(requestId));
};
_emscriptenWrappers[requestId] = wrapper;
auto *texture = Texture_decodeKtx(tEngine, ktxData, length, sphericalHarmonics, requestId, Emscripten_voidCallback);
auto *texture = Ktx1Reader_createTexture(tEngine, tBundle, requestId, onTextureUploadComplete ? Emscripten_voidCallback : nullptr);
#else
auto *texture = Texture_decodeKtx(tEngine, ktxData, length, sphericalHarmonics, requestId, onTextureUploadComplete);
auto *texture = Ktx1Reader_createTexture(tEngine, tBundle, requestId, onTextureUploadComplete);
#endif
PROXY(onComplete(texture));
});