update to animation structures

lib/animations/animation_builder.dart

@@ -3,19 +3,37 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
 class Animation {
-  final Float32List morphWeights;
+  late final Float32List? morphData;
   final int numMorphWeights;
 
   final int numFrames;
   final double frameLengthInMs;
 
-  final List<String> boneNames;
-  final List<String> meshNames;
+  final List<String>? boneNames;
+  final List<String>? meshNames;
 
-  final Float32List boneTransforms;
+  final Float32List? boneTransforms;
 
-  Animation(this.morphWeights, this.numMorphWeights, this.boneTransforms,
+  Animation(this.morphData, this.numMorphWeights, this.boneTransforms,
       this.boneNames, this.meshNames, this.numFrames, this.frameLengthInMs);
+
+  Animation.from(
+      {required List<List<double>> morphData,
+      required this.numMorphWeights,
+      this.boneTransforms,
+      this.boneNames,
+      this.meshNames,
+      required this.numFrames,
+      required this.frameLengthInMs}) {
+    if (morphData.length != numFrames) {
+      throw Exception("Mismatched animation data with frame length");
+    }
+    this.morphData = Float32List(numMorphWeights * numFrames);
+    for (int i = 0; i < numFrames; i++) {
+      this.morphData!.setRange((i * numMorphWeights),
+          (i * numMorphWeights) + numMorphWeights, morphData[i]);
+    }
+  }
 }
 
 class AnimationBuilder {
@@ -39,7 +57,7 @@ class AnimationBuilder {
 
     int numFrames = _duration * 1000 ~/ _frameLengthInMs;
 
-    final _morphWeights = Float32List((numFrames * _numMorphWeights).toInt());
+    final morphData = Float32List((numFrames * _numMorphWeights).toInt());
 
     var frameStart = (_interpMorphStart! * 1000) ~/ _frameLengthInMs;
     var frameEnd = (_interpMorphEnd! * 1000) ~/ _frameLengthInMs;
@@ -50,12 +68,12 @@ class AnimationBuilder {
       var val = ((1 - linear) * _interpMorphStartValue!) +
           (linear * _interpMorphEndValue!);
       for (int j = 0; j < _numMorphWeights; j++) {
-        _morphWeights[(i * _numMorphWeights) + j] = val;
+        morphData[(i * _numMorphWeights) + j] = val;
       }
     }
 
     print(
-        "Created morphWeights of size ${_morphWeights.length} (${_morphWeights.lengthInBytes} for ${numFrames} frames");
+        "Created morphWeights of size ${morphData.length} (${morphData.lengthInBytes} for ${numFrames} frames");
 
     final boneTransforms = Float32List(numFrames * _boneTransforms.length * 7);
     print(
@@ -71,8 +89,8 @@ class AnimationBuilder {
           "frameData for frame $i ${boneTransforms.sublist(i * _boneTransforms.length * 7, (i * _boneTransforms.length * 7) + 7)}");
     }
 
-    return Animation(_morphWeights, _numMorphWeights, boneTransforms,
-        _boneNames, _meshNames, numFrames, _frameLengthInMs);
+    return Animation(morphData, _numMorphWeights, boneTransforms, _boneNames,
+        _meshNames, numFrames, _frameLengthInMs);
   }
 
   AnimationBuilder setFramerate(int framerate) {

lib/animations/animations.dart

@@ -4,6 +4,9 @@ class Vec3 {
   final double z;
 
   Vec3({this.x = 0, this.y = 0, this.z = 0});
+
+  factory Vec3.from(List<double> vals) =>
+      Vec3(x: vals[0], y: vals[1], z: vals[2]);
 }
 
 class Quaternion {
@@ -13,6 +16,9 @@ class Quaternion {
   double w = 1;
 
   Quaternion({this.x = 0, this.y = 0, this.z = 0, this.w = 1.0});
+
+  factory Quaternion.from(List<double> vals) =>
+      Quaternion(x: vals[0], y: vals[1], z: vals[2], w: vals[3]);
 }
 
 class BoneTransform {

lib/filament_controller.dart

@@ -222,7 +222,6 @@ class PolyvoxFilamentController extends FilamentController {
   Future<FilamentAsset> loadGlb(String path) async {
     print("Loading GLB at $path ");
     var asset = await _channel.invokeMethod("loadGlb", path);
-    print("Got asset : $asset ");
     return asset as FilamentAsset;
   }
 
@@ -283,13 +282,14 @@ class PolyvoxFilamentController extends FilamentController {
   }
 
   Future setAnimation(FilamentAsset asset, Animation animation) async {
+    print("Frmael en ${animation.frameLengthInMs}");
     await _channel.invokeMethod("setAnimation", [
       asset,
-      animation.morphWeights,
+      animation.morphData!,
       animation.numMorphWeights,
-      animation.boneTransforms,
-      animation.boneNames,
-      animation.meshNames,
+      animation.boneTransforms ?? Float32List(0),
+      animation.boneNames ?? <String>[],
+      animation.meshNames ?? <String>[],
       animation.numFrames,
       animation.frameLengthInMs
     ]);