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

79
thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
View File

@@ -1,6 +1,10 @@
import 'dart:async';
import 'package:thermion_dart/src/filament/src/implementation/background_image.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_indirect_light.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_ktx1_bundle.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_swapchain.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_texture.dart';
import 'package:thermion_dart/src/filament/src/interface/ktx1_bundle.dart';
import '../../../../filament/src/implementation/ffi_asset.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_filament_app.dart';
import '../../../../filament/src/implementation/ffi_scene.dart';
@@ -204,7 +208,14 @@ class ThermionViewerFFI extends ThermionViewer {
Future setBackgroundImage(String path, {bool fillHeight = false}) async {
final imageData = await FilamentApp.instance!.loadResource(path);
_backgroundImage ??= await BackgroundImage.create(this, scene);
await _backgroundImage!.setImage(imageData);
bool isKtx = path.endsWith(".ktx");
if (isKtx) {
final bundle = await FFIKtx1Bundle.create(imageData);
await _backgroundImage!.setImageFromKtxBundle(bundle);
} else {
await _backgroundImage!.setImage(imageData);
}
return (_backgroundImage!.width!, _backgroundImage!.height!);
}
///
@@ -250,11 +261,9 @@ class ThermionViewerFFI extends ThermionViewer {
_skyboxTextureUploadComplete =
withVoidCallback((requestId, onTextureUploadComplete) async {
var skyboxTexturePointer = await withPointerCallback<TTexture>((cb) {
Texture_decodeKtxRenderThread(app.engine, data.address, data.length,
nullptr, requestId, onTextureUploadComplete, cb);
});
_skyboxTexture = FFITexture(app.engine, skyboxTexturePointer);
var bundle = await FFIKtx1Bundle.create(data);
_skyboxTexture = await bundle.createTexture() as FFITexture;
_skybox = await withPointerCallback<TSkybox>((cb) {
Engine_buildSkyboxRenderThread(app.engine, _skyboxTexture!.pointer, cb);
@@ -267,8 +276,6 @@ class ThermionViewerFFI extends ThermionViewer {
await completer.future;
}
Pointer<TTexture>? _iblTexture;
Pointer<TIndirectLight>? _indirectLight;
Future? _iblTextureUploadComplete;
///
@@ -288,23 +295,22 @@ class ThermionViewerFFI extends ThermionViewer {
var data = await FilamentApp.instance!.loadResource(lightingPath);
var harmonics = Float32List(27);
final bundle = await FFIKtx1Bundle.create(data);
_iblTexture = await withPointerCallback<TTexture>((cb) {
Texture_decodeKtxRenderThread(app.engine, data.address, data.length,
harmonics.address, requestId, onTextureUploadComplete, cb);
});
final texture = await bundle.createTexture();
final harmonics = bundle.getSphericalHarmonics();
final ibl = await FFIIndirectLight.fromIrradianceHarmonics(harmonics,
reflectionsTexture: texture, intensity: intensity);
await scene.setIndirectLight(ibl);
_indirectLight = await withPointerCallback<TIndirectLight>((cb) {
Engine_buildIndirectLightRenderThread(
app.engine, _iblTexture!, intensity, harmonics.address, cb);
});
if (FILAMENT_WASM) {
//stackRestore(stackPtr);
data.free();
}
data.free();
Scene_setIndirectLight(scene.scene, _indirectLight!);
completer.complete();
}).then((_) {
_iblTextureUploadComplete = null;
@@ -317,20 +323,9 @@ class ThermionViewerFFI extends ThermionViewer {
///
@override
Future rotateIbl(Matrix3 rotationMatrix) async {
if (_indirectLight == null) {
throw Exception("No IBL loaded");
}
late Pointer stackPtr;
if (FILAMENT_WASM) {
//stackPtr = stackSave();
}
IndirectLight_setRotation(_indirectLight!, rotationMatrix.storage.address);
if (FILAMENT_WASM) {
//stackRestore(stackPtr);
rotationMatrix.storage.free();
var ibl = await scene.getIndirectLight();
if (ibl != null) {
await ibl.rotate(rotationMatrix);
}
}
@@ -366,24 +361,16 @@ class ThermionViewerFFI extends ThermionViewer {
///
///
@override
Future removeIbl() async {
Future removeIbl({bool destroy = true}) async {
var ibl = await scene.getIndirectLight();
await scene.setIndirectLight(null);
if (ibl != null && destroy) {
await ibl.destroy();
}
if (_iblTextureUploadComplete != null) {
await _iblTextureUploadComplete!;
_iblTextureUploadComplete = null;
}
if (_indirectLight != null) {
Scene_setIndirectLight(scene.scene, nullptr);
await withVoidCallback(
(requestId, cb) => Engine_destroyIndirectLightRenderThread(
app.engine,
_indirectLight!,
requestId,
cb,
),
);
_indirectLight = null;
_iblTexture = null;
}
}
final _lights = <ThermionEntity>{};

8
thermion_dart/lib/src/viewer/src/thermion_viewer_base.dart
View File

@@ -89,7 +89,7 @@ abstract class ThermionViewer {
Future loadSkybox(String skyboxPath);
///
/// Removes the skybox from the scene.
/// Removes the skybox from the scene and destroys all associated resources.
///
Future removeSkybox();
@@ -106,8 +106,10 @@ abstract class ThermionViewer {
///
/// Removes the image-based light from the scene.
/// If [destroy] is true, the indirect light and all associated resources
/// (irradiance/reflection textures) will be destroyed.
///
Future removeIbl();
Future removeIbl({bool destroy = true});
///
/// Adds a direct light to the scene.
@@ -123,7 +125,7 @@ abstract class ThermionViewer {
Future removeLight(ThermionEntity light);
///
/// Remove all lights (excluding IBL) from the scene.
/// Remove all direct lights from the scene.
///
Future destroyLights();