Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion flare_flutter/lib/cache.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'dart:async';

import 'package:pedantic/pedantic.dart';

import 'asset_provider.dart';
import 'cache_asset.dart';

Expand Down Expand Up @@ -55,7 +57,7 @@ abstract class Cache<T extends CacheAsset> {
assert(asset != null);

_assets[assetProvider] = asset;
asset.load(this, assetProvider);
unawaited(asset.load(this, assetProvider));
return asset.isAvailable ? asset : await asset.onLoaded() as T;
}

Expand Down
3 changes: 2 additions & 1 deletion flare_flutter/lib/cache_asset.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ abstract class CacheAsset {
return completer.future;
}

void load(Cache cache, AssetProvider assetProvider) => _cache = cache;
Future<void> load(Cache cache, AssetProvider assetProvider) async =>
_cache = cache;

void completeLoad() {
if (_callbacks != null) {
Expand Down
25 changes: 13 additions & 12 deletions flare_flutter/lib/flare_cache_asset.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:flutter/foundation.dart';

import 'asset_provider.dart';
Expand All @@ -25,17 +24,19 @@ class FlareCacheAsset extends CacheAsset {
}

@override
void load(Cache cache, AssetProvider assetProvider) {
super.load(cache, assetProvider);
assetProvider.load().then((ByteData data) {
if (useCompute) {
compute(FlutterActor.loadFromByteData, data)
.then((FlutterActor actor) => loadedActor(actor, assetProvider));
} else {
FlutterActor.loadFromByteData(data)
.then((FlutterActor actor) => loadedActor(actor, assetProvider));
}
});
Future<void> load(Cache cache, AssetProvider assetProvider) async {
await super.load(cache, assetProvider);

final data = await assetProvider.load();
if (data == null) {
print("Failed to load flare file from $assetProvider.");
return;
}

final actor = useCompute
? await compute(FlutterActor.loadFromByteData, data)
: await FlutterActor.loadFromByteData(data);
loadedActor(actor, assetProvider);
}

@override
Expand Down
1 change: 1 addition & 0 deletions flare_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies:
flare_dart:
path: ../flare_dart/
meta: ^1.0.5
pedantic: ^1.9.0
dev_dependencies:
flutter_test:
sdk: flutter