diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 642b6e14..d26c452b 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -14,11 +14,6 @@ extension PinballGameAssetsX on PinballGame { return [ images.load(components.Assets.images.boardBackground.keyName), - images.load(components.Assets.images.ball.ball.keyName), - images.load(androidTheme.ball.keyName), - images.load(dashTheme.ball.keyName), - images.load(dinoTheme.ball.keyName), - images.load(sparkyTheme.ball.keyName), images.load(components.Assets.images.ball.flameEffect.keyName), images.load(components.Assets.images.signpost.inactive.keyName), images.load(components.Assets.images.signpost.active1.keyName), @@ -136,6 +131,10 @@ extension PinballGameAssetsX on PinballGame { images.load(sparkyTheme.leaderboardIcon.keyName), images.load(androidTheme.leaderboardIcon.keyName), images.load(dinoTheme.leaderboardIcon.keyName), + images.load(androidTheme.ball.keyName), + images.load(dashTheme.ball.keyName), + images.load(dinoTheme.ball.keyName), + images.load(sparkyTheme.ball.keyName), images.load(Assets.images.components.background.path), ]; } diff --git a/packages/pinball_components/assets/images/ball/ball.png b/packages/pinball_components/assets/images/ball/ball.png deleted file mode 100644 index 43332c9a..00000000 Binary files a/packages/pinball_components/assets/images/ball/ball.png and /dev/null differ diff --git a/packages/pinball_components/lib/src/components/ball.dart b/packages/pinball_components/lib/src/components/ball.dart index ccab4332..6c4d0815 100644 --- a/packages/pinball_components/lib/src/components/ball.dart +++ b/packages/pinball_components/lib/src/components/ball.dart @@ -131,9 +131,7 @@ class _BallSpriteComponent extends SpriteComponent with HasGameRef { gameRef.images.fromCache(spriteAsset ?? Assets.images.ball.ball.keyName), ); this.sprite = sprite; - // TODO(ruimiguel): temp fix cause final assets are bigger than default one. - final spriteScaleSize = (spriteAsset != null) ? 12.5 : 10.0; - size = sprite.originalSize / spriteScaleSize; + size = sprite.originalSize / 12.5; } } diff --git a/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart b/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart index 259a9b41..eef7b1b6 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart @@ -7,7 +7,6 @@ class BallBoosterGame extends LineGame { BallBoosterGame() : super( imagesFileNames: [ - Assets.images.ball.ball.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName, diff --git a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart index a997fb31..78c0c331 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart @@ -11,7 +11,6 @@ class BallGame extends AssetsGame with TapDetector, Traceable { List? imagesFileNames, }) : super( imagesFileNames: [ - Assets.images.ball.ball.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName, diff --git a/packages/pinball_components/test/src/components/ball_test.dart b/packages/pinball_components/test/src/components/ball_test.dart index 8a166d7b..38af0c28 100644 --- a/packages/pinball_components/test/src/components/ball_test.dart +++ b/packages/pinball_components/test/src/components/ball_test.dart @@ -12,7 +12,6 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, Assets.images.ball.flameEffect.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, @@ -35,27 +34,6 @@ void main() { ); group('renders correctly', () { - flameTester.testGameWidget( - 'default', - setUp: (game, tester) async { - final ball = Ball()..initialPosition = Vector2.zero(); - await game.ready(); - await game.ensureAdd(ball); - - await tester.pump(); - - game.camera - ..followVector2(Vector2.zero()) - ..zoom = 8; - }, - verify: (game, tester) async { - await expectLater( - find.byGame(), - matchesGoldenFile('golden/ball/default.png'), - ); - }, - ); - flameTester.testGameWidget( 'android theme', setUp: (game, tester) async { diff --git a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart index e408243f..50407770 100644 --- a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart +++ b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart @@ -7,13 +7,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/src/components/chrome_dino/behaviors/behaviors.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart index 11b362a0..a3852cc2 100644 --- a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart +++ b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart @@ -9,13 +9,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/src/components/chrome_dino/behaviors/behaviors.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/packages/pinball_components/test/src/components/flipper_test.dart b/packages/pinball_components/test/src/components/flipper_test.dart index 3bff1474..314b1f77 100644 --- a/packages/pinball_components/test/src/components/flipper_test.dart +++ b/packages/pinball_components/test/src/components/flipper_test.dart @@ -4,6 +4,7 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../helpers/helpers.dart'; @@ -12,7 +13,7 @@ void main() { final assets = [ Assets.images.flipper.left.keyName, Assets.images.flipper.right.keyName, - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/test/game/components/controlled_ball_test.dart b/test/game/components/controlled_ball_test.dart index f2c00d64..13852a99 100644 --- a/test/game/components/controlled_ball_test.dart +++ b/test/game/components/controlled_ball_test.dart @@ -7,6 +7,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../helpers/helpers.dart'; @@ -24,7 +25,7 @@ class WrappedBallController extends BallController { void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, Assets.images.ball.flameEffect.keyName, ]; diff --git a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart index 3f8c8fdd..995572c4 100644 --- a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart +++ b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart @@ -17,7 +17,7 @@ import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, theme.Assets.images.dash.ball.keyName, ]; diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 7a6e13e2..9643b1da 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -26,7 +26,6 @@ void main() { Assets.images.backboard.backboardGameOver.keyName, Assets.images.backboard.display.keyName, Assets.images.boardBackground.keyName, - Assets.images.ball.ball.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName,