refactor: bottom group to component

pull/224/head
Allison Ryan 3 years ago
parent ad9b8432e9
commit 2b71472c95

@ -1,7 +1,6 @@
import 'package:flame/components.dart'; import 'package:flame/components.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
/// {@template bottom_group} /// {@template bottom_group}
/// Grouping of the board's symmetrical bottom [Component]s. /// Grouping of the board's symmetrical bottom [Component]s.
@ -9,11 +8,11 @@ import 'package:pinball_flame/pinball_flame.dart';
/// The [BottomGroup] consists of [Flipper]s, [Baseboard]s and [Kicker]s. /// The [BottomGroup] consists of [Flipper]s, [Baseboard]s and [Kicker]s.
/// {@endtemplate} /// {@endtemplate}
// TODO(allisonryan0002): Consider renaming. // TODO(allisonryan0002): Consider renaming.
class BottomGroup extends Blueprint { class BottomGroup extends Component {
/// {@macro bottom_group} /// {@macro bottom_group}
BottomGroup() BottomGroup()
: super( : super(
components: [ children: [
_BottomGroupSide(side: BoardSide.right), _BottomGroupSide(side: BoardSide.right),
_BottomGroupSide(side: BoardSide.left), _BottomGroupSide(side: BoardSide.left),
], ],

@ -45,7 +45,7 @@ class PinballGame extends Forge2DGame
unawaited(add(CameraController(this))); unawaited(add(CameraController(this)));
unawaited(add(Backboard.waiting(position: Vector2(0, -88)))); unawaited(add(Backboard.waiting(position: Vector2(0, -88))));
await add(Drain()); await add(Drain());
await addFromBlueprint(BottomGroup()); await add(BottomGroup());
unawaited(addFromBlueprint(Boundaries())); unawaited(addFromBlueprint(Boundaries()));
unawaited(addFromBlueprint(LaunchRamp())); unawaited(addFromBlueprint(LaunchRamp()));

@ -4,7 +4,6 @@ import 'package:flame_test/flame_test.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
import '../../helpers/helpers.dart'; import '../../helpers/helpers.dart';
@ -24,8 +23,10 @@ void main() {
flameTester.test( flameTester.test(
'loads correctly', 'loads correctly',
(game) async { (game) async {
await game.addFromBlueprint(BottomGroup()); final bottomGroup = BottomGroup();
await game.ready(); await game.ensureAdd(bottomGroup);
expect(game.contains(bottomGroup), isTrue);
}, },
); );
@ -33,12 +34,13 @@ void main() {
flameTester.test( flameTester.test(
'one left flipper', 'one left flipper',
(game) async { (game) async {
await game.addFromBlueprint(BottomGroup()); final bottomGroup = BottomGroup();
await game.ready(); await game.ensureAdd(bottomGroup);
final leftFlippers = game.descendants().whereType<Flipper>().where( final leftFlippers =
(flipper) => flipper.side.isLeft, bottomGroup.descendants().whereType<Flipper>().where(
); (flipper) => flipper.side.isLeft,
);
expect(leftFlippers.length, equals(1)); expect(leftFlippers.length, equals(1));
}, },
); );
@ -46,12 +48,13 @@ void main() {
flameTester.test( flameTester.test(
'one right flipper', 'one right flipper',
(game) async { (game) async {
await game.addFromBlueprint(BottomGroup()); final bottomGroup = BottomGroup();
await game.ready(); await game.ensureAdd(bottomGroup);
final rightFlippers = game.descendants().whereType<Flipper>().where( final rightFlippers =
(flipper) => flipper.side.isRight, bottomGroup.descendants().whereType<Flipper>().where(
); (flipper) => flipper.side.isRight,
);
expect(rightFlippers.length, equals(1)); expect(rightFlippers.length, equals(1));
}, },
); );
@ -59,10 +62,11 @@ void main() {
flameTester.test( flameTester.test(
'two Baseboards', 'two Baseboards',
(game) async { (game) async {
await game.addFromBlueprint(BottomGroup()); final bottomGroup = BottomGroup();
await game.ready(); await game.ensureAdd(bottomGroup);
final basebottomGroups = game.descendants().whereType<Baseboard>(); final basebottomGroups =
bottomGroup.descendants().whereType<Baseboard>();
expect(basebottomGroups.length, equals(2)); expect(basebottomGroups.length, equals(2));
}, },
); );
@ -70,10 +74,10 @@ void main() {
flameTester.test( flameTester.test(
'two Kickers', 'two Kickers',
(game) async { (game) async {
await game.addFromBlueprint(BottomGroup()); final bottomGroup = BottomGroup();
await game.ready(); await game.ensureAdd(bottomGroup);
final kickers = game.descendants().whereType<Kicker>(); final kickers = bottomGroup.descendants().whereType<Kicker>();
expect(kickers.length, equals(2)); expect(kickers.length, equals(2));
}, },
); );

@ -80,6 +80,18 @@ void main() {
}, },
); );
flameTester.test(
'has only one BottomGroup',
(game) async {
await game.ready();
expect(
game.children.whereType<BottomGroup>().length,
equals(1),
);
},
);
flameTester.test( flameTester.test(
'has only one Plunger', 'has only one Plunger',
(game) async { (game) async {

Loading…
Cancel
Save