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

add generic parameter to NativeHandle, rather than getNativeHandle()

Browse Source
This commit is contained in:
Nick Fisher
2025-06-27 11:33:50 +08:00
parent 5ac4da5075
commit 48b631b0a8
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
thermion_dart/lib/src/filament/src/implementation/ffi_material.dart
View File

@@ -200,8 +200,8 @@ class FFIMaterialInstance extends MaterialInstance<Pointer<TMaterialInstance>> {
} }
@override @override
T getNativeHandle<T>() { Pointer<TMaterialInstance> getNativeHandle() {
return pointer as T; return pointer;
} }
} }

6
thermion_dart/lib/src/filament/src/implementation/ffi_scene.dart
View File

@@ -6,13 +6,17 @@ import 'package:thermion_dart/src/filament/src/interface/skybox.dart';
import 'package:thermion_dart/thermion_dart.dart'; import 'package:thermion_dart/thermion_dart.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
class FFIScene extends Scene { class FFIScene extends Scene<Pointer<TScene>> {
late final _logger = Logger(this.runtimeType.toString()); late final _logger = Logger(this.runtimeType.toString());
final Pointer<TScene> scene; final Pointer<TScene> scene;
FFIScene(this.scene); FFIScene(this.scene);
Pointer<TScene> getNativeHandle() {
return scene;
}
@override @override
Future add(ThermionAsset asset) async { Future add(ThermionAsset asset) async {
SceneAsset_addToScene(asset.getHandle(), scene); SceneAsset_addToScene(asset.getHandle(), scene);

4
thermion_dart/lib/src/filament/src/implementation/ffi_swapchain.dart
View File

@@ -1,10 +1,10 @@
import 'package:thermion_dart/thermion_dart.dart'; import 'package:thermion_dart/thermion_dart.dart';
class FFISwapChain extends SwapChain<Pointer> { class FFISwapChain extends SwapChain<Pointer<TSwapChain>> {
final Pointer<TSwapChain> pointer; final Pointer<TSwapChain> pointer;
T getNativeHandle<T>() => pointer as T; Pointer<TSwapChain> getNativeHandle() => pointer;
FFISwapChain(this.pointer); FFISwapChain(this.pointer);

4
thermion_dart/lib/src/filament/src/implementation/ffi_view.dart
View File

@@ -150,8 +150,8 @@ class FFIView extends View {
View_setRenderQuality(view, quality.index); View_setRenderQuality(view, quality.index);
} }
Future setScene(covariant FFIScene scene) async { Future setScene(Scene scene) async {
View_setScene(view, scene.scene); View_setScene(view, scene.getNativeHandle());
} }
@override @override

2
thermion_dart/lib/src/filament/src/interface/native_handle.dart
View File

@@ -7,5 +7,5 @@
/// not a compile-time error). /// not a compile-time error).
/// ///
abstract class NativeHandle<T> { abstract class NativeHandle<T> {
T getNativeHandle<T>(); T getNativeHandle();
} }

4
thermion_dart/lib/src/filament/src/interface/scene.dart
View File

@@ -1,7 +1,9 @@
import 'package:thermion_dart/src/filament/src/interface/native_handle.dart';
import 'package:thermion_dart/src/filament/src/interface/skybox.dart'; import 'package:thermion_dart/src/filament/src/interface/skybox.dart';
import 'package:thermion_dart/thermion_dart.dart'; import 'package:thermion_dart/thermion_dart.dart';
abstract class Scene { abstract class Scene<T> extends NativeHandle<T> {
/// Adds all renderable entities in [asset] to this scene. /// Adds all renderable entities in [asset] to this scene.
/// ///
/// ///