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

remove objective_c from dev_dependencies & change test_helper to create render target without importing textures

Browse Source
This commit is contained in:
Nick Fisher
2025-06-24 13:37:09 +08:00
parent ed5fb03aa4
commit 8a1f320bb7
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
thermion_dart/pubspec.yaml
View File

@@ -24,7 +24,6 @@ dependencies:
dev_dependencies: dev_dependencies:
ffigen: ^18.1.0 ffigen: ^18.1.0
objective_c: ^8.0.0
test: test:
mockito: ^5.0.0 mockito: ^5.0.0
build_runner: ^2.0.0 build_runner: ^2.0.0

31
thermion_dart/test/helpers.dart
View File

@@ -3,7 +3,6 @@ import 'dart:io';
import 'package:image/image.dart' as img; import 'package:image/image.dart' as img;
import 'package:image/image.dart'; import 'package:image/image.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:thermion_dart/src/swift/swift_bindings.g.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_filament_app.dart'; import 'package:thermion_dart/src/filament/src/implementation/ffi_filament_app.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_render_target.dart'; import 'package:thermion_dart/src/filament/src/implementation/ffi_render_target.dart';
import 'package:thermion_dart/src/filament/src/implementation/ffi_swapchain.dart'; import 'package:thermion_dart/src/filament/src/implementation/ffi_swapchain.dart';
@@ -189,13 +188,13 @@ class TestHelper {
/// ///
/// ///
/// ///
Future<ThermionTextureSwift> createTexture(int width, int height, // Future<ThermionTextureSwift> createTexture(int width, int height,
{bool depth = false, bool stencil = false}) async { // {bool depth = false, bool stencil = false}) async {
final object = ThermionTextureSwift(); // final object = ThermionTextureSwift();
object.initWithWidth_height_isDepth_isStencil_( // object.initWithWidth_height_isDepth_isStencil_(
width, height, depth, stencil); // width, height, depth, stencil);
return object; // return object;
} // }
Future<Uint8List> _loadResource(String uri) async { Future<Uint8List> _loadResource(String uri) async {
uri = uri.replaceAll("file://", ""); uri = uri.replaceAll("file://", "");
@@ -227,11 +226,11 @@ class TestHelper {
FFIRenderTarget? renderTarget; FFIRenderTarget? renderTarget;
if (createRenderTarget) { if (createRenderTarget) {
var metalColorTexture = await createTexture( // var metalColorTexture = await createTexture(
viewportDimensions.width, viewportDimensions.height); // viewportDimensions.width, viewportDimensions.height);
var metalDepthTexture = await createTexture( // var metalDepthTexture = await createTexture(
viewportDimensions.width, viewportDimensions.height, // viewportDimensions.width, viewportDimensions.height,
depth: true); // depth: true);
var color = await FilamentApp.instance! var color = await FilamentApp.instance!
.createTexture(viewportDimensions.width, viewportDimensions.height, .createTexture(viewportDimensions.width, viewportDimensions.height,
flags: { flags: {
@@ -240,7 +239,8 @@ class TestHelper {
TextureUsage.TEXTURE_USAGE_SAMPLEABLE TextureUsage.TEXTURE_USAGE_SAMPLEABLE
}, },
textureFormat: TextureFormat.RGBA32F, textureFormat: TextureFormat.RGBA32F,
importedTextureHandle: metalColorTexture.metalTextureAddress); // importedTextureHandle: metalColorTexture.metalTextureAddress
);
var width = await color.getWidth(); var width = await color.getWidth();
var height = await color.getHeight(); var height = await color.getHeight();
var depth = await FilamentApp.instance!.createTexture( var depth = await FilamentApp.instance!.createTexture(
@@ -254,7 +254,8 @@ class TestHelper {
textureFormat: createStencilBuffer textureFormat: createStencilBuffer
? TextureFormat.DEPTH32F_STENCIL8 ? TextureFormat.DEPTH32F_STENCIL8
: TextureFormat.DEPTH32F, : TextureFormat.DEPTH32F,
importedTextureHandle: metalDepthTexture.metalTextureAddress); // importedTextureHandle: metalDepthTexture.metalTextureAddress
);
renderTarget = await FilamentApp.instance!.createRenderTarget( renderTarget = await FilamentApp.instance!.createRenderTarget(
viewportDimensions.width, viewportDimensions.height, viewportDimensions.width, viewportDimensions.height,