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

gizmo improvements, use render thread methods for createCamera, allow setParent null to unparent transform

Browse Source
This commit is contained in:
Nick Fisher
2024-11-30 14:02:39 +08:00
parent abbf2d5391
commit c117555b2c
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1661,13 +1661,13 @@ class ThermionViewerFFI extends ThermionViewer {
/// ///
/// ///
@override @override
Future setParent(ThermionEntity child, ThermionEntity parent, Future setParent(ThermionEntity child, ThermionEntity? parent,
{bool preserveScaling = false}) async { {bool preserveScaling = false}) async {
if (_sceneManager == null) { if (_sceneManager == null) {
throw Exception("Asset manager must be non-null"); throw Exception("Asset manager must be non-null");
} }
TransformManager_setParent( TransformManager_setParent(_transformManager!, child,
_transformManager!, child, parent, preserveScaling); parent ?? FILAMENT_ENTITY_NULL, preserveScaling);
} }
/// ///
@@ -1954,9 +1954,12 @@ class ThermionViewerFFI extends ThermionViewer {
} }
Future<Camera> createCamera() async { Future<Camera> createCamera() async {
var cameraPtr = SceneManager_createCamera(_sceneManager!); var cameraPtr = await withPointerCallback<TCamera>((cb) {
SceneManager_createCameraRenderThread(_sceneManager!, cb);
});
var engine = Viewer_getEngine(_viewer!); var engine = Viewer_getEngine(_viewer!);
var camera = FFICamera(cameraPtr, engine, _transformManager!); var camera = FFICamera(cameraPtr, engine, _transformManager!);
await camera.setLensProjection();
return camera; return camera;
} }
@@ -1969,7 +1972,9 @@ class ThermionViewerFFI extends ThermionViewer {
/// ///
Future setActiveCamera(FFICamera camera) async { Future setActiveCamera(FFICamera camera) async {
final view = (await getViewAt(0)) as FFIView; final view = (await getViewAt(0)) as FFIView;
View_setCamera(view.view, camera.camera); await withVoidCallback((cb) {
View_setCameraRenderThread(view.view, camera.camera, cb);
});
} }
/// ///
@@ -2036,8 +2041,22 @@ class ThermionViewerFFI extends ThermionViewer {
SceneManager_getOverlayEntityCount(_sceneManager!); SceneManager_getOverlayEntityCount(_sceneManager!);
final overlayEntities = List<ThermionEntity>.generate(overlayEntityCount, final overlayEntities = List<ThermionEntity>.generate(overlayEntityCount,
(i) => SceneManager_getOverlayEntityAt(_sceneManager!, i)).toSet(); (i) => SceneManager_getOverlayEntityAt(_sceneManager!, i)).toSet();
return FFIGizmo(view, gizmo.cast<TSceneAsset>(), _sceneManager!, _engine!,
nullptr, overlayEntities); final gizmoEntityCount =
SceneAsset_getChildEntityCount(gizmo.cast<TSceneAsset>());
final gizmoEntities = Int32List(gizmoEntityCount);
SceneAsset_getChildEntities(
gizmo.cast<TSceneAsset>(), gizmoEntities.address);
return FFIGizmo(
view,
gizmo.cast<TSceneAsset>(),
_sceneManager!,
_engine!,
nullptr,
overlayEntities,
gizmoEntities.toSet()
..add(SceneAsset_getEntity(gizmo.cast<TSceneAsset>())));
} }
} }