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

feat: (flutter) move DPR calculation to resizeTexture and add createViewerWithOptions method to ThermionFlutterFFI

Browse Source
This commit is contained in:
Nick Fisher
2024-09-05 17:51:22 +08:00
parent 04ecb4d56f
commit 4edc8aa85b
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_ffi.dart
View File

@@ -26,7 +26,12 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
final _textures = <ThermionFlutterTexture>{}; final _textures = <ThermionFlutterTexture>{};
Future<ThermionViewer> createViewer({String? uberArchivePath}) async { Future<ThermionViewer> createViewerWithOptions(
ThermionFlutterOptions options) async {
return createViewer(uberarchivePath: options.uberarchivePath);
}
Future<ThermionViewer> createViewer({String? uberarchivePath}) async {
var resourceLoader = Pointer<Void>.fromAddress( var resourceLoader = Pointer<Void>.fromAddress(
await _channel.invokeMethod("getResourceLoaderWrapper")); await _channel.invokeMethod("getResourceLoaderWrapper"));
@@ -58,7 +63,7 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
renderCallbackOwner: renderCallbackOwner, renderCallbackOwner: renderCallbackOwner,
driver: driverPtr, driver: driverPtr,
sharedContext: sharedContextPtr, sharedContext: sharedContextPtr,
uberArchivePath: uberArchivePath); uberArchivePath: uberarchivePath);
await _viewer!.initialized; await _viewer!.initialized;
return _viewer!; return _viewer!;
} }
@@ -115,7 +120,8 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
if (_textures.length > 1) { if (_textures.length > 1) {
throw Exception("Multiple textures not yet supported"); throw Exception("Multiple textures not yet supported");
} else if (_textures.length == 1) { } else if (_textures.length == 1) {
if (_textures.first.height == physicalHeight && _textures.first.width == physicalWidth) { if (_textures.first.height == physicalHeight &&
_textures.first.width == physicalWidth) {
return _textures.first; return _textures.first;
} else { } else {
await _viewer!.setRendering(false); await _viewer!.setRendering(false);
@@ -127,8 +133,8 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
_creatingTexture = true; _creatingTexture = true;
var result = await _channel var result = await _channel.invokeMethod("createTexture",
.invokeMethod("createTexture", [physicalWidth, physicalHeight, offsetLeft, offsetLeft]); [physicalWidth, physicalHeight, offsetLeft, offsetLeft]);
if (result == null || (result[0] == -1)) { if (result == null || (result[0] == -1)) {
throw Exception("Failed to create texture"); throw Exception("Failed to create texture");
@@ -140,12 +146,14 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
_logger.info( _logger.info(
"Created texture with flutter texture id ${flutterTextureId}, hardwareTextureId $hardwareTextureId and surfaceAddress $surfaceAddress"); "Created texture with flutter texture id ${flutterTextureId}, hardwareTextureId $hardwareTextureId and surfaceAddress $surfaceAddress");
_viewer?.viewportDimensions = (physicalWidth.toDouble(), physicalHeight.toDouble()); _viewer?.viewportDimensions =
(physicalWidth.toDouble(), physicalHeight.toDouble());
final texture = ThermionFlutterTexture( final texture = ThermionFlutterTexture(flutterTextureId, hardwareTextureId,
flutterTextureId, hardwareTextureId, physicalWidth, physicalHeight, surfaceAddress); physicalWidth, physicalHeight, surfaceAddress);
await _viewer?.createSwapChain(physicalWidth.toDouble(), physicalHeight.toDouble(), await _viewer?.createSwapChain(
physicalWidth.toDouble(), physicalHeight.toDouble(),
surface: texture.surfaceAddress == null surface: texture.surfaceAddress == null
? nullptr ? nullptr
: Pointer<Void>.fromAddress(texture.surfaceAddress!)); : Pointer<Void>.fromAddress(texture.surfaceAddress!));
@@ -153,7 +161,9 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
if (texture.hardwareTextureId != null) { if (texture.hardwareTextureId != null) {
// ignore: unused_local_variable // ignore: unused_local_variable
var renderTarget = await _viewer?.createRenderTarget( var renderTarget = await _viewer?.createRenderTarget(
physicalWidth.toDouble(), physicalHeight.toDouble(), texture.hardwareTextureId!); physicalWidth.toDouble(),
physicalHeight.toDouble(),
texture.hardwareTextureId!);
} }
await _viewer?.updateViewportAndCameraProjection( await _viewer?.updateViewportAndCameraProjection(
@@ -186,12 +196,20 @@ class ThermionFlutterFFI extends ThermionFlutterPlatform {
/// Called by [ThermionWidget] to resize a texture. Don't call this yourself. /// Called by [ThermionWidget] to resize a texture. Don't call this yourself.
/// ///
@override @override
Future<ThermionFlutterTexture?> resizeTexture(ThermionFlutterTexture texture, Future<ThermionFlutterTexture?> resizeTexture(
int width, int height, int offsetLeft, int offsetRight) async { ThermionFlutterTexture texture,
int width,
int height,
int offsetLeft,
int offsetTop,
double pixelRatio) async {
if (_resizing) { if (_resizing) {
throw Exception("Resize underway"); throw Exception("Resize underway");
} }
width = (width * pixelRatio).ceil();
height = (height * pixelRatio).ceil();
if ((width - _viewer!.viewportDimensions.$1).abs() < 0.001 || if ((width - _viewer!.viewportDimensions.$1).abs() < 0.001 ||
(height - _viewer!.viewportDimensions.$2).abs() < 0.001) { (height - _viewer!.viewportDimensions.$2).abs() < 0.001) {
return texture; return texture;