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

remove old FFI references from FilamentController

Browse Source
This commit is contained in:
Nick Fisher
2023-09-22 08:20:36 +08:00
parent 6e7d5797a8
commit 6457b8b80b
1 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/filament_controller.dart
View File

@@ -1,10 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:ffi';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:ffi/ffi.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:polyvox_filament/animations/bone_animation_data.dart'; import 'package:polyvox_filament/animations/bone_animation_data.dart';
import 'package:polyvox_filament/animations/morph_animation_data.dart'; import 'package:polyvox_filament/animations/morph_animation_data.dart';
@@ -380,36 +375,36 @@ class FilamentController {
if (_viewer == null || _resizing) { if (_viewer == null || _resizing) {
throw Exception("No viewer available, ignoring"); throw Exception("No viewer available, ignoring");
} }
var data = calloc<Float>(animation.frameData.length); // var data = calloc<Float>(animation.frameData.length);
int offset = 0; // int offset = 0;
var numFrames = animation.frameData.length ~/ 7; // var numFrames = animation.frameData.length ~/ 7;
var boneNames = calloc<Pointer<Char>>(1); // var boneNames = calloc<Pointer<Char>>(1);
boneNames.elementAt(0).value = // boneNames.elementAt(0).value =
animation.boneName.toNativeUtf8().cast<Char>(); // animation.boneName.toNativeUtf8().cast<Char>();
var meshNames = calloc<Pointer<Char>>(animation.meshNames.length); // var meshNames = calloc<Pointer<Char>>(animation.meshNames.length);
for (int i = 0; i < animation.meshNames.length; i++) { // for (int i = 0; i < animation.meshNames.length; i++) {
meshNames.elementAt(i).value = // meshNames.elementAt(i).value =
animation.meshNames[i].toNativeUtf8().cast<Char>(); // animation.meshNames[i].toNativeUtf8().cast<Char>();
} // }
for (int i = 0; i < animation.frameData.length; i++) { // for (int i = 0; i < animation.frameData.length; i++) {
data.elementAt(offset).value = animation.frameData[i]; // data.elementAt(offset).value = animation.frameData[i];
offset += 1; // offset += 1;
} // }
await _channel.invokeMethod("setBoneAnimation", [ // await _channel.invokeMethod("setBoneAnimation", [
_assetManager, // _assetManager,
asset, // asset,
data, // data,
numFrames, // numFrames,
1, // 1,
boneNames, // boneNames,
meshNames, // meshNames,
animation.meshNames.length, // animation.meshNames.length,
animation.frameLengthInMs // animation.frameLengthInMs
]); // ]);
calloc.free(data); // calloc.free(data);
} }
Future removeAsset(FilamentEntity asset) async { Future removeAsset(FilamentEntity asset) async {
@@ -545,11 +540,7 @@ class FilamentController {
throw Exception("No viewer available, ignoring"); throw Exception("No viewer available, ignoring");
} }
assert(matrix.length == 16); assert(matrix.length == 16);
var ptr = calloc<Float>(16); await _channel.invokeMethod("setCameraModelMatrix", matrix);
for (int i = 0; i < 16; i++) {
ptr.elementAt(i).value = matrix[i];
}
await _channel.invokeMethod("setCameraModelMatrix", [ptr]);
} }
Future setTexture(FilamentEntity asset, String assetPath, Future setTexture(FilamentEntity asset, String assetPath,