diff --git a/packages/pinball_components/lib/src/components/sign_post.dart b/packages/pinball_components/lib/src/components/sign_post.dart index 50119b77..ca75b0e9 100644 --- a/packages/pinball_components/lib/src/components/sign_post.dart +++ b/packages/pinball_components/lib/src/components/sign_post.dart @@ -81,8 +81,7 @@ class _SignPostSpriteComponent // sprites[spriteState] = Sprite( // gameRef.images.fromCache(spriteState.path), // ); - sprites[spriteState] = - Sprite(await gameRef.images.load(spriteState.path)); + sprites[spriteState] = await gameRef.loadSprite(spriteState.path); } current = _SignPostSpriteState.inactive; diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/sign_post_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/sign_post_game.dart index 86d87963..3126ed64 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/sign_post_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/sign_post_game.dart @@ -17,13 +17,6 @@ class SignPostGame extends BasicBallGame with Traceable, TapDetector { Future onLoad() async { await super.onLoad(); - await Future.wait([ - loadSprite(Assets.images.signPost.inactive.keyName), - loadSprite(Assets.images.signPost.active1.keyName), - loadSprite(Assets.images.signPost.active2.keyName), - loadSprite(Assets.images.signPost.active3.keyName), - ]); - camera.followVector2(Vector2.zero()); await add(SignPost()..priority = 1); await traceAllBodies(); diff --git a/packages/pinball_components/test/src/components/sign_post_test.dart b/packages/pinball_components/test/src/components/sign_post_test.dart index 2a59fe51..62a97c9a 100644 --- a/packages/pinball_components/test/src/components/sign_post_test.dart +++ b/packages/pinball_components/test/src/components/sign_post_test.dart @@ -7,25 +7,14 @@ import 'package:pinball_components/pinball_components.dart'; import '../../helpers/helpers.dart'; -// TODO(allisonryan0002): Refactor loading assets in test with -// https://github.com/VGVentures/pinball/pull/204 - void main() { TestWidgetsFlutterBinding.ensureInitialized(); final flameTester = FlameTester(TestGame.new); group('SignPost', () { - final assets = [ - Assets.images.signPost.inactive.keyName, - Assets.images.signPost.active1.keyName, - Assets.images.signPost.active2.keyName, - Assets.images.signPost.active3.keyName, - ]; - flameTester.test( 'loads correctly', (game) async { - await game.images.loadAll(assets); final signPost = SignPost(); await game.ready(); await game.ensureAdd(signPost); @@ -38,7 +27,6 @@ void main() { flameTester.testGameWidget( 'inactive sprite', setUp: (game, tester) async { - await game.images.loadAll(assets); await game.ensureAdd(SignPost()); game.camera.followVector2(Vector2.zero()); }, @@ -53,8 +41,6 @@ void main() { flameTester.testGameWidget( 'active1 sprite', setUp: (game, tester) async { - await game.images.loadAll(assets); - final signPost = SignPost(); await game.ensureAdd(signPost); signPost.progress(); @@ -72,8 +58,6 @@ void main() { flameTester.testGameWidget( 'active2 sprite', setUp: (game, tester) async { - await game.images.loadAll(assets); - final signPost = SignPost(); await game.ensureAdd(signPost); signPost @@ -93,8 +77,6 @@ void main() { flameTester.testGameWidget( 'active3 sprite', setUp: (game, tester) async { - await game.images.loadAll(assets); - final signPost = SignPost(); await game.ensureAdd(signPost); signPost @@ -116,7 +98,6 @@ void main() { flameTester.test( 'progress changes correctly between four sprites', (game) async { - await game.images.loadAll(assets); final signPost = SignPost(); await game.ready(); await game.ensureAdd(signPost);