refactor: removed all default ball, use dash

pull/279/head
RuiAlonso 3 years ago
parent 470e7a4f89
commit a9270af983

@ -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),
];
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

@ -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;
}
}

@ -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,

@ -11,7 +11,6 @@ class BallGame extends AssetsGame with TapDetector, Traceable {
List<String>? 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,

@ -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<TestGame>(),
matchesGoldenFile('golden/ball/default.png'),
);
},
);
flameTester.testGameWidget(
'android theme',
setUp: (game, tester) async {

@ -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));

@ -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));

@ -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));

@ -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,
];

@ -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,
];

@ -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,

Loading…
Cancel
Save