From f6f171b7c7f660cbd8f4c12a61c2752ebef3084a Mon Sep 17 00:00:00 2001 From: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com> Date: Fri, 11 Mar 2022 14:26:59 -0600 Subject: [PATCH 1/3] feat: add baseboards (#34) * feat: add baseboards * docs: baseboard * fix: test extension * chore: simplify rectangle * refactor: PR suggestions --- lib/game/components/baseboard.dart | 91 ++++++++++++++++++++++++ lib/game/components/components.dart | 1 + lib/game/pinball_game.dart | 26 +++++++ test/game/components/baseboard_test.dart | 76 ++++++++++++++++++++ test/game/pinball_game_test.dart | 9 +++ 5 files changed, 203 insertions(+) create mode 100644 lib/game/components/baseboard.dart create mode 100644 test/game/components/baseboard_test.dart diff --git a/lib/game/components/baseboard.dart b/lib/game/components/baseboard.dart new file mode 100644 index 00000000..9153d4f3 --- /dev/null +++ b/lib/game/components/baseboard.dart @@ -0,0 +1,91 @@ +import 'dart:math' as math; + +import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:pinball/game/game.dart'; + +/// {@template baseboard} +/// Straight, angled board piece to corral the [Ball] towards the [Flipper]s. +/// {@endtemplate} +class Baseboard extends BodyComponent { + /// {@macro baseboard} + Baseboard._({ + required Vector2 position, + required BoardSide side, + }) : _position = position, + _side = side; + + /// A left positioned [Baseboard]. + Baseboard.left({ + required Vector2 position, + }) : this._( + position: position, + side: BoardSide.left, + ); + + /// A right positioned [Baseboard]. + Baseboard.right({ + required Vector2 position, + }) : this._( + position: position, + side: BoardSide.right, + ); + + /// The width of the [Baseboard]. + static const width = 10.0; + + /// The height of the [Baseboard]. + static const height = 2.0; + + /// The position of the [Baseboard] body. + final Vector2 _position; + + /// Whether the [Baseboard] is on the left or right side of the board. + final BoardSide _side; + + List _createFixtureDefs() { + final fixtures = []; + + final circleShape1 = CircleShape()..radius = Baseboard.height / 2; + circleShape1.position.setValues( + -(Baseboard.width / 2) + circleShape1.radius, + 0, + ); + final circle1FixtureDef = FixtureDef(circleShape1); + fixtures.add(circle1FixtureDef); + + final circleShape2 = CircleShape()..radius = Baseboard.height / 2; + circleShape2.position.setValues( + (Baseboard.width / 2) - circleShape2.radius, + 0, + ); + final circle2FixtureDef = FixtureDef(circleShape2); + fixtures.add(circle2FixtureDef); + + final rectangle = PolygonShape() + ..setAsBoxXY( + (Baseboard.width - Baseboard.height) / 2, + Baseboard.height / 2, + ); + final rectangleFixtureDef = FixtureDef(rectangle); + fixtures.add(rectangleFixtureDef); + + return fixtures; + } + + @override + Body createBody() { + // TODO(allisonryan0002): share sweeping angle with flipper when components + // are grouped. + const angle = math.pi / 7; + + final bodyDef = BodyDef() + ..position = _position + ..type = BodyType.static + ..angle = _side.isLeft ? -angle : angle; + + final body = world.createBody(bodyDef); + _createFixtureDefs().forEach(body.createFixture); + + return body; + } +} diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index 89f60343..bcf9a92d 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -1,5 +1,6 @@ export 'anchor.dart'; export 'ball.dart'; +export 'baseboard.dart'; export 'board_side.dart'; export 'flipper.dart'; export 'pathway.dart'; diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index fbb68e63..c6b23dae 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -63,6 +63,7 @@ class PinballGame extends Forge2DGame ), ), ); + unawaited(_addBaseboards()); } void spawnBall() { @@ -103,6 +104,31 @@ class PinballGame extends Forge2DGame ), ); } + + Future _addBaseboards() async { + final spaceBetweenBaseboards = camera.viewport.effectiveSize.x / 2; + final baseboardY = camera.viewport.effectiveSize.y / 1.12; + + final leftBaseboard = Baseboard.left( + position: screenToWorld( + Vector2( + camera.viewport.effectiveSize.x / 2 - (spaceBetweenBaseboards / 2), + baseboardY, + ), + ), + ); + await add(leftBaseboard); + + final rightBaseboard = Baseboard.right( + position: screenToWorld( + Vector2( + camera.viewport.effectiveSize.x / 2 + (spaceBetweenBaseboards / 2), + baseboardY, + ), + ), + ); + await add(rightBaseboard); + } } class DebugPinballGame extends PinballGame with TapDetector { diff --git a/test/game/components/baseboard_test.dart b/test/game/components/baseboard_test.dart new file mode 100644 index 00000000..51002cef --- /dev/null +++ b/test/game/components/baseboard_test.dart @@ -0,0 +1,76 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball/game/game.dart'; + +import '../../helpers/helpers.dart'; + +void main() { + group('Baseboard', () { + TestWidgetsFlutterBinding.ensureInitialized(); + final flameTester = FlameTester(PinballGameTest.create); + + flameTester.test( + 'loads correctly', + (game) async { + await game.ready(); + final leftBaseboard = Baseboard.left(position: Vector2.zero()); + final rightBaseboard = Baseboard.right(position: Vector2.zero()); + await game.ensureAddAll([leftBaseboard, rightBaseboard]); + + expect(game.contains(leftBaseboard), isTrue); + expect(game.contains(rightBaseboard), isTrue); + }, + ); + + group('body', () { + flameTester.test( + 'positions correctly', + (game) async { + final position = Vector2.all(10); + final baseboard = Baseboard.left(position: position); + await game.ensureAdd(baseboard); + game.contains(baseboard); + + expect(baseboard.body.position, position); + }, + ); + + flameTester.test( + 'is static', + (game) async { + final baseboard = Baseboard.left(position: Vector2.zero()); + await game.ensureAdd(baseboard); + + expect(baseboard.body.bodyType, equals(BodyType.static)); + }, + ); + + flameTester.test( + 'is at an angle', + (game) async { + final leftBaseboard = Baseboard.left(position: Vector2.zero()); + final rightBaseboard = Baseboard.right(position: Vector2.zero()); + await game.ensureAddAll([leftBaseboard, rightBaseboard]); + + expect(leftBaseboard.body.angle, isNegative); + expect(rightBaseboard.body.angle, isPositive); + }, + ); + }); + + group('fixtures', () { + flameTester.test( + 'has three', + (game) async { + final baseboard = Baseboard.left(position: Vector2.zero()); + await game.ensureAdd(baseboard); + + expect(baseboard.body.fixtures.length, equals(3)); + }, + ); + }); + }); +} diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index faa55d11..a992a471 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -74,6 +74,15 @@ void main() { returnsNormally, ); }); + + flameTester.test( + 'has two Baseboards', + (game) async { + await game.ready(); + final baseboards = game.children.whereType().toList(); + expect(baseboards.length, 2); + }, + ); }); debugModeFlameTester.test('adds a ball on tap up', (game) async { From 03d48eac40316b08f4445bcb914c6ab86e6a1200 Mon Sep 17 00:00:00 2001 From: Erick Date: Fri, 11 Mar 2022 17:39:59 -0300 Subject: [PATCH 2/3] feat: adding bonus letters to board (#35) * feat: adding ball spawming upon click on debug mode * PR suggestions * fix: rebase * feat: adding bonus letter component * feat: bonus letter callback * feat: removing flip * feat: adding bonus letters to board * Apply suggestions from code review Co-authored-by: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com> * feat: improving bonus letters grouping * feat: removing not needed pump * feat: rebase fix * fix: re adding wrongly removed code during rebase * fix: lint * fix: flaky test * Apply suggestions from code review Co-authored-by: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com> Co-authored-by: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com> --- lib/game/bloc/game_state.dart | 4 + lib/game/components/bonus_word.dart | 134 +++++++++++ lib/game/components/components.dart | 1 + lib/game/pinball_game.dart | 20 ++ lib/game/view/pinball_game_page.dart | 2 + pubspec.lock | 6 +- pubspec.yaml | 8 +- test/game/bloc/game_state_test.dart | 28 +++ test/game/components/ball_test.dart | 7 +- test/game/components/bonus_word_test.dart | 244 +++++++++++++++++++++ test/game/components/plunger_test.dart | 2 +- test/game/view/pinball_game_page_test.dart | 2 +- test/helpers/builders.dart | 4 +- test/helpers/mocks.dart | 2 + 14 files changed, 450 insertions(+), 14 deletions(-) create mode 100644 lib/game/components/bonus_word.dart create mode 100644 test/game/components/bonus_word_test.dart diff --git a/lib/game/bloc/game_state.dart b/lib/game/bloc/game_state.dart index 2812a049..e2c39d1f 100644 --- a/lib/game/bloc/game_state.dart +++ b/lib/game/bloc/game_state.dart @@ -49,6 +49,10 @@ class GameState extends Equatable { /// Determines when the player has only one ball left. bool get isLastBall => balls == 1; + /// Shortcut method to check if the given [i] + /// is activated. + bool isLetterActivated(int i) => activatedBonusLetters.contains(i); + GameState copyWith({ int? score, int? balls, diff --git a/lib/game/components/bonus_word.dart b/lib/game/components/bonus_word.dart new file mode 100644 index 00000000..35412ecf --- /dev/null +++ b/lib/game/components/bonus_word.dart @@ -0,0 +1,134 @@ +// ignore_for_file: avoid_renaming_method_parameters + +import 'dart:async'; + +import 'package:flame/components.dart'; +import 'package:flame/effects.dart'; +import 'package:flame_bloc/flame_bloc.dart'; +import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flutter/material.dart'; +import 'package:pinball/game/game.dart'; + +/// {@template bonus_word} +/// Loads all [BonusLetter]s to compose a [BonusWord]. +/// {@endtemplate} +class BonusWord extends Component { + /// {@macro bonus_word} + BonusWord({required Vector2 position}) : _position = position; + + final Vector2 _position; + + @override + Future onLoad() async { + await super.onLoad(); + final letters = GameBloc.bonusWord.split(''); + + for (var i = 0; i < letters.length; i++) { + unawaited( + add( + BonusLetter( + position: _position - Vector2(16 - (i * 6), -30), + letter: letters[i], + index: i, + ), + ), + ); + } + } +} + +/// {@template bonus_letter} +/// [BodyType.static] sensor component, part of a word bonus, +/// which will activate its letter after contact with a [Ball]. +/// {@endtemplate} +class BonusLetter extends BodyComponent + with BlocComponent { + /// {@macro bonus_letter} + BonusLetter({ + required Vector2 position, + required String letter, + required int index, + }) : _position = position, + _letter = letter, + _index = index { + paint = Paint()..color = _disableColor; + } + + /// The area size of this [BonusLetter]. + static final areaSize = Vector2.all(4); + + static const _activeColor = Colors.green; + static const _disableColor = Colors.red; + + final Vector2 _position; + final String _letter; + final int _index; + + @override + Future onLoad() async { + await super.onLoad(); + + await add( + TextComponent( + position: Vector2(-1, -1), + text: _letter, + textRenderer: TextPaint( + style: const TextStyle(fontSize: 2, color: Colors.white), + ), + ), + ); + } + + @override + Body createBody() { + final shape = CircleShape()..radius = areaSize.x / 2; + + final fixtureDef = FixtureDef(shape)..isSensor = true; + + final bodyDef = BodyDef() + ..userData = this + ..position = _position + ..type = BodyType.static; + + return world.createBody(bodyDef)..createFixture(fixtureDef); + } + + @override + bool listenWhen(GameState? previousState, GameState newState) { + final wasActive = previousState?.isLetterActivated(_index) ?? false; + final isActive = newState.isLetterActivated(_index); + + return wasActive != isActive; + } + + @override + void onNewState(GameState state) { + final isActive = state.isLetterActivated(_index); + + add( + ColorEffect( + isActive ? _activeColor : _disableColor, + const Offset(0, 1), + EffectController(duration: 0.25), + ), + ); + } + + /// Activates this [BonusLetter], if it's not already activated. + void activate() { + final isActive = state?.isLetterActivated(_index) ?? false; + if (!isActive) { + gameRef.read().add(BonusLetterActivated(_index)); + } + } +} + +/// Triggers [BonusLetter.activate] method when a [BonusLetter] and a [Ball] +/// come in contact. +class BonusLetterBallContactCallback + extends ContactCallback { + @override + void begin(Ball ball, BonusLetter bonusLetter, Contact contact) { + bonusLetter.activate(); + } +} diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index bcf9a92d..6e663c26 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -2,6 +2,7 @@ export 'anchor.dart'; export 'ball.dart'; export 'baseboard.dart'; export 'board_side.dart'; +export 'bonus_word.dart'; export 'flipper.dart'; export 'pathway.dart'; export 'plunger.dart'; diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index c6b23dae..633c2351 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -48,6 +48,25 @@ class PinballGame extends Forge2DGame ), ); + unawaited(_addFlippers()); + + unawaited(_addBonusWord()); + } + + Future _addBonusWord() async { + await add( + BonusWord( + position: screenToWorld( + Vector2( + camera.viewport.effectiveSize.x / 2, + camera.viewport.effectiveSize.y - 50, + ), + ), + ), + ); + } + + Future _addFlippers() async { final flippersPosition = screenToWorld( Vector2( camera.viewport.effectiveSize.x / 2, @@ -73,6 +92,7 @@ class PinballGame extends Forge2DGame void _addContactCallbacks() { addContactCallback(BallScorePointsCallback()); addContactCallback(BottomWallBallContactCallback()); + addContactCallback(BonusLetterBallContactCallback()); } Future _addGameBoundaries() async { diff --git a/lib/game/view/pinball_game_page.dart b/lib/game/view/pinball_game_page.dart index 4af2168e..21bd4074 100644 --- a/lib/game/view/pinball_game_page.dart +++ b/lib/game/view/pinball_game_page.dart @@ -63,6 +63,8 @@ class _PinballGameViewState extends State { @override Widget build(BuildContext context) { return BlocListener( + listenWhen: (previous, current) => + previous.isGameOver != current.isGameOver, listener: (context, state) { if (state.isGameOver) { showDialog( diff --git a/pubspec.lock b/pubspec.lock index 4b375ff7..8ff31de7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -140,21 +140,21 @@ packages: name: flame url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-releasecandidate.2" + version: "1.1.0-releasecandidate.4" flame_bloc: dependency: "direct main" description: name: flame_bloc url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-releasecandidate.2" + version: "1.2.0-releasecandidate.4" flame_forge2d: dependency: "direct main" description: name: flame_forge2d url: "https://pub.dartlang.org" source: hosted - version: "0.9.0-releasecandidate.2" + version: "0.9.0-releasecandidate.4" flame_test: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 41b0d081..39b93fe7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,15 +9,15 @@ environment: dependencies: bloc: ^8.0.2 equatable: ^2.0.3 - flame: ^1.1.0-releasecandidate.2 - flame_bloc: ^1.2.0-releasecandidate.2 - flame_forge2d: ^0.9.0-releasecandidate.2 + flame: ^1.1.0-releasecandidate.4 + flame_bloc: ^1.2.0-releasecandidate.4 + flame_forge2d: ^0.9.0-releasecandidate.4 flutter: sdk: flutter flutter_bloc: ^8.0.1 flutter_localizations: sdk: flutter - geometry: + geometry: path: packages/geometry intl: ^0.17.0 pinball_theme: diff --git a/test/game/bloc/game_state_test.dart b/test/game/bloc/game_state_test.dart index 7b060984..8ab72e6c 100644 --- a/test/game/bloc/game_state_test.dart +++ b/test/game/bloc/game_state_test.dart @@ -126,6 +126,34 @@ void main() { ); }); + group('isLetterActivated', () { + test( + 'is true when the letter is activated', + () { + const gameState = GameState( + balls: 3, + score: 0, + activatedBonusLetters: [1], + bonusHistory: [], + ); + expect(gameState.isLetterActivated(1), isTrue); + }, + ); + + test( + 'is false when the letter is not activated', + () { + const gameState = GameState( + balls: 3, + score: 0, + activatedBonusLetters: [1], + bonusHistory: [], + ); + expect(gameState.isLetterActivated(0), isFalse); + }, + ); + }); + group('copyWith', () { test( 'throws AssertionError ' diff --git a/test/game/components/ball_test.dart b/test/game/components/ball_test.dart index 9f473e42..8ac32212 100644 --- a/test/game/components/ball_test.dart +++ b/test/game/components/ball_test.dart @@ -89,9 +89,10 @@ void main() { }); group('resetting a ball', () { - final gameBloc = MockGameBloc(); + late GameBloc gameBloc; setUp(() { + gameBloc = MockGameBloc(); whenListen( gameBloc, const Stream.empty(), @@ -99,7 +100,7 @@ void main() { ); }); - final tester = flameBlocTester(gameBloc: gameBloc); + final tester = flameBlocTester(gameBloc: () => gameBloc); tester.widgetTest( 'adds BallLost to GameBloc', @@ -118,7 +119,7 @@ void main() { (game, tester) async { await game.ready(); - game.children.whereType().first.removeFromParent(); + game.children.whereType().first.lost(); await game.ready(); // Making sure that all additions are done expect( diff --git a/test/game/components/bonus_word_test.dart b/test/game/components/bonus_word_test.dart new file mode 100644 index 00000000..129f68d1 --- /dev/null +++ b/test/game/components/bonus_word_test.dart @@ -0,0 +1,244 @@ +// ignore_for_file: cascade_invocations + +import 'package:bloc_test/bloc_test.dart'; +import 'package:flame/effects.dart'; +import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball/game/game.dart'; + +import '../../helpers/helpers.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('BonusWord', () { + final flameTester = FlameTester(PinballGameTest.create); + + flameTester.test( + 'loads the letters correctly', + (game) async { + await game.ready(); + + final bonusWord = game.children.whereType().first; + final letters = bonusWord.children.whereType(); + expect(letters.length, equals(GameBloc.bonusWord.length)); + }, + ); + }); + + group('BonusLetter', () { + final flameTester = FlameTester(PinballGameTest.create); + + flameTester.test( + 'loads correctly', + (game) async { + final bonusLetter = BonusLetter( + position: Vector2.zero(), + letter: 'G', + index: 0, + ); + await game.ensureAdd(bonusLetter); + await game.ready(); + + expect(game.contains(bonusLetter), isTrue); + }, + ); + + group('body', () { + flameTester.test( + 'positions correctly', + (game) async { + final position = Vector2.all(10); + final bonusLetter = BonusLetter( + position: position, + letter: 'G', + index: 0, + ); + await game.ensureAdd(bonusLetter); + game.contains(bonusLetter); + + expect(bonusLetter.body.position, position); + }, + ); + + flameTester.test( + 'is static', + (game) async { + final bonusLetter = BonusLetter( + position: Vector2.zero(), + letter: 'G', + index: 0, + ); + await game.ensureAdd(bonusLetter); + + expect(bonusLetter.body.bodyType, equals(BodyType.static)); + }, + ); + }); + + group('fixture', () { + flameTester.test( + 'exists', + (game) async { + final bonusLetter = BonusLetter( + position: Vector2.zero(), + letter: 'G', + index: 0, + ); + await game.ensureAdd(bonusLetter); + + expect(bonusLetter.body.fixtures[0], isA()); + }, + ); + + flameTester.test( + 'is sensor', + (game) async { + final bonusLetter = BonusLetter( + position: Vector2.zero(), + letter: 'G', + index: 0, + ); + await game.ensureAdd(bonusLetter); + + final fixture = bonusLetter.body.fixtures[0]; + expect(fixture.isSensor, isTrue); + }, + ); + + flameTester.test( + 'shape is circular', + (game) async { + final bonusLetter = BonusLetter( + position: Vector2.zero(), + letter: 'G', + index: 0, + ); + await game.ensureAdd(bonusLetter); + + final fixture = bonusLetter.body.fixtures[0]; + expect(fixture.shape.shapeType, equals(ShapeType.circle)); + expect(fixture.shape.radius, equals(2)); + }, + ); + }); + + group('bonus letter activation', () { + final gameBloc = MockGameBloc(); + + BonusLetter _getBonusLetter(PinballGame game) { + return game.children + .whereType() + .first + .children + .whereType() + .first; + } + + setUp(() { + whenListen( + gameBloc, + const Stream.empty(), + initialState: const GameState.initial(), + ); + }); + + final tester = flameBlocTester(gameBloc: () => gameBloc); + + tester.widgetTest( + 'adds BonusLetterActivated to GameBloc when not activated', + (game, tester) async { + await game.ready(); + + _getBonusLetter(game).activate(); + + await tester.pump(); + + verify(() => gameBloc.add(const BonusLetterActivated(0))).called(1); + }, + ); + + tester.widgetTest( + "doesn't add BonusLetterActivated to GameBloc when already activated", + (game, tester) async { + const state = GameState( + score: 0, + balls: 2, + activatedBonusLetters: [0], + bonusHistory: [], + ); + whenListen( + gameBloc, + Stream.value(state), + initialState: state, + ); + await game.ready(); + + _getBonusLetter(game).activate(); + await game.ready(); // Making sure that all additions are done + + verifyNever(() => gameBloc.add(const BonusLetterActivated(0))); + }, + ); + + tester.widgetTest( + 'adds a ColorEffect', + (game, tester) async { + await game.ready(); + + const state = GameState( + score: 0, + balls: 2, + activatedBonusLetters: [0], + bonusHistory: [], + ); + + final bonusLetter = _getBonusLetter(game); + + bonusLetter.onNewState(state); + await tester.pump(); + + expect( + bonusLetter.children.whereType().length, + equals(1), + ); + }, + ); + + tester.widgetTest( + 'only listens when there is a change on the letter status', + (game, tester) async { + await game.ready(); + + const state = GameState( + score: 0, + balls: 2, + activatedBonusLetters: [0], + bonusHistory: [], + ); + + final bonusLetter = _getBonusLetter(game); + + expect( + bonusLetter.listenWhen(const GameState.initial(), state), + isTrue, + ); + }, + ); + }); + + group('BonusLetterBallContactCallback', () { + test('calls ball.activate', () { + final ball = MockBall(); + final bonusLetter = MockBonusLetter(); + + final contactCallback = BonusLetterBallContactCallback(); + contactCallback.begin(ball, bonusLetter, MockContact()); + + verify(bonusLetter.activate).called(1); + }); + }); + }); +} diff --git a/test/game/components/plunger_test.dart b/test/game/components/plunger_test.dart index 02330b31..1ca29e85 100644 --- a/test/game/components/plunger_test.dart +++ b/test/game/components/plunger_test.dart @@ -227,7 +227,7 @@ void main() { ); }); - final flameTester = flameBlocTester(gameBloc: gameBloc); + final flameTester = flameBlocTester(gameBloc: () => gameBloc); group('initializes with', () { flameTester.test( diff --git a/test/game/view/pinball_game_page_test.dart b/test/game/view/pinball_game_page_test.dart index 9de36cde..dcf0c001 100644 --- a/test/game/view/pinball_game_page_test.dart +++ b/test/game/view/pinball_game_page_test.dart @@ -94,7 +94,7 @@ void main() { whenListen( gameBloc, Stream.value(state), - initialState: state, + initialState: GameState.initial(), ); await tester.pumpApp( diff --git a/test/helpers/builders.dart b/test/helpers/builders.dart index c77e55c5..d8ffd715 100644 --- a/test/helpers/builders.dart +++ b/test/helpers/builders.dart @@ -5,14 +5,14 @@ import 'package:pinball/game/game.dart'; import 'helpers.dart'; FlameTester flameBlocTester({ - required GameBloc gameBloc, + required GameBloc Function() gameBloc, }) { return FlameTester( PinballGameTest.create, pumpWidget: (gameWidget, tester) async { await tester.pumpWidget( BlocProvider.value( - value: gameBloc, + value: gameBloc(), child: gameWidget, ), ); diff --git a/test/helpers/mocks.dart b/test/helpers/mocks.dart index 46886752..c1c59377 100644 --- a/test/helpers/mocks.dart +++ b/test/helpers/mocks.dart @@ -37,3 +37,5 @@ class MockRawKeyUpEvent extends Mock implements RawKeyUpEvent { class MockTapUpInfo extends Mock implements TapUpInfo {} class MockEventPosition extends Mock implements EventPosition {} + +class MockBonusLetter extends Mock implements BonusLetter {} From 1539ab7bd3d15c6a73caf9baa7eab05d1e8a8f35 Mon Sep 17 00:00:00 2001 From: Erick Date: Mon, 14 Mar 2022 11:18:23 -0300 Subject: [PATCH 3/3] chore: update project to the latest flame and forge2d (#41) --- lib/game/components/ball.dart | 16 +++++-- lib/game/components/components.dart | 2 +- lib/game/components/flipper.dart | 43 +++++++++++-------- .../{anchor.dart => joint_anchor.dart} | 8 ++-- lib/game/components/plunger.dart | 10 ++--- pubspec.lock | 26 +++++------ pubspec.yaml | 6 +-- test/game/components/flipper_test.dart | 4 +- ...nchor_test.dart => joint_anchor_test.dart} | 10 ++--- 9 files changed, 69 insertions(+), 56 deletions(-) rename lib/game/components/{anchor.dart => joint_anchor.dart} (85%) rename test/game/components/{anchor_test.dart => joint_anchor_test.dart} (83%) diff --git a/lib/game/components/ball.dart b/lib/game/components/ball.dart index d5b05fa1..738ceec6 100644 --- a/lib/game/components/ball.dart +++ b/lib/game/components/ball.dart @@ -6,16 +6,18 @@ import 'package:pinball/game/game.dart'; /// A solid, [BodyType.dynamic] sphere that rolls and bounces along the /// [PinballGame]. /// {@endtemplate} -class Ball extends PositionBodyComponent { +class Ball extends BodyComponent { /// {@macro ball} Ball({ required Vector2 position, - }) : _position = position, - super(size: Vector2.all(2)); + }) : _position = position; /// The initial position of the [Ball] body. final Vector2 _position; + /// The size of the [Ball] + final Vector2 size = Vector2.all(2); + /// Asset location of the sprite that renders with the [Ball]. /// /// Sprite is preloaded by [PinballGameAssetsX]. @@ -26,7 +28,13 @@ class Ball extends PositionBodyComponent { await super.onLoad(); final sprite = await gameRef.loadSprite(spritePath); final tint = gameRef.theme.characterTheme.ballColor.withOpacity(0.5); - positionComponent = SpriteComponent(sprite: sprite, size: size)..tint(tint); + await add( + SpriteComponent( + sprite: sprite, + size: size, + anchor: Anchor.center, + )..tint(tint), + ); } @override diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index 6e663c26..71108fcc 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -1,9 +1,9 @@ -export 'anchor.dart'; export 'ball.dart'; export 'baseboard.dart'; export 'board_side.dart'; export 'bonus_word.dart'; export 'flipper.dart'; +export 'joint_anchor.dart'; export 'pathway.dart'; export 'plunger.dart'; export 'score_points.dart'; diff --git a/lib/game/components/flipper.dart b/lib/game/components/flipper.dart index 6c184383..9035daaf 100644 --- a/lib/game/components/flipper.dart +++ b/lib/game/components/flipper.dart @@ -1,25 +1,29 @@ import 'dart:async'; import 'dart:math' as math; -import 'package:flame/components.dart' show PositionComponent, SpriteComponent; +import 'package:flame/components.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:pinball/game/game.dart'; /// {@template flipper_group} /// Loads a [Flipper.right] and a [Flipper.left]. /// {@endtemplate} -class FlipperGroup extends PositionComponent { +class FlipperGroup extends Component { /// {@macro flipper_group} FlipperGroup({ - required Vector2 position, + required this.position, required this.spacing, - }) : super(position: position); + }); /// The amount of space between the [Flipper.right] and [Flipper.left]. final double spacing; + /// The position of this [FlipperGroup] + final Vector2 position; + @override Future onLoad() async { final leftFlipper = Flipper.left( @@ -45,15 +49,14 @@ class FlipperGroup extends PositionComponent { /// /// [Flipper] can be controlled by the player in an arc motion. /// {@endtemplate flipper} -class Flipper extends PositionBodyComponent with KeyboardHandler { +class Flipper extends BodyComponent with KeyboardHandler { /// {@macro flipper} Flipper._({ required Vector2 position, required this.side, required List keys, }) : _position = position, - _keys = keys, - super(size: Vector2(width, height)); + _keys = keys; /// A left positioned [Flipper]. Flipper.left({ @@ -124,14 +127,17 @@ class Flipper extends PositionBodyComponent with KeyboardHandler { /// Loads the sprite that renders with the [Flipper]. Future _loadSprite() async { final sprite = await gameRef.loadSprite(spritePath); - positionComponent = SpriteComponent( + final spriteComponent = SpriteComponent( sprite: sprite, - size: size, + size: Vector2(width, height), + anchor: Anchor.center, ); if (side.isRight) { - positionComponent!.flipHorizontally(); + spriteComponent.flipHorizontally(); } + + await add(spriteComponent); } /// Anchors the [Flipper] to the [RevoluteJoint] that controls its arc motion. @@ -160,11 +166,11 @@ class Flipper extends PositionBodyComponent with KeyboardHandler { final fixtures = []; final isLeft = side.isLeft; - final bigCircleShape = CircleShape()..radius = size.y / 2; + final bigCircleShape = CircleShape()..radius = height / 2; bigCircleShape.position.setValues( isLeft - ? -(size.x / 2) + bigCircleShape.radius - : (size.x / 2) - bigCircleShape.radius, + ? -(width / 2) + bigCircleShape.radius + : (width / 2) - bigCircleShape.radius, 0, ); final bigCircleFixtureDef = FixtureDef(bigCircleShape); @@ -173,8 +179,8 @@ class Flipper extends PositionBodyComponent with KeyboardHandler { final smallCircleShape = CircleShape()..radius = bigCircleShape.radius / 2; smallCircleShape.position.setValues( isLeft - ? (size.x / 2) - smallCircleShape.radius - : -(size.x / 2) + smallCircleShape.radius, + ? (width / 2) - smallCircleShape.radius + : -(width / 2) + smallCircleShape.radius, 0, ); final smallCircleFixtureDef = FixtureDef(smallCircleShape); @@ -205,6 +211,7 @@ class Flipper extends PositionBodyComponent with KeyboardHandler { @override Future onLoad() async { await super.onLoad(); + paint = Paint()..color = Colors.transparent; await Future.wait([ _loadSprite(), _anchorToJoint(), @@ -249,15 +256,15 @@ class Flipper extends PositionBodyComponent with KeyboardHandler { /// /// The end of a [Flipper] depends on its [Flipper.side]. /// {@endtemplate} -class FlipperAnchor extends Anchor { +class FlipperAnchor extends JointAnchor { /// {@macro flipper_anchor} FlipperAnchor({ required Flipper flipper, }) : super( position: Vector2( flipper.side.isLeft - ? flipper.body.position.x - flipper.size.x / 2 - : flipper.body.position.x + flipper.size.x / 2, + ? flipper.body.position.x - Flipper.width / 2 + : flipper.body.position.x + Flipper.width / 2, flipper.body.position.y, ), ); diff --git a/lib/game/components/anchor.dart b/lib/game/components/joint_anchor.dart similarity index 85% rename from lib/game/components/anchor.dart rename to lib/game/components/joint_anchor.dart index 0e78aa1c..05e62b73 100644 --- a/lib/game/components/anchor.dart +++ b/lib/game/components/joint_anchor.dart @@ -1,6 +1,6 @@ import 'package:flame_forge2d/flame_forge2d.dart'; -/// {@template anchor} +/// {@template joint_anchor} /// Non visual [BodyComponent] used to hold a [BodyType.dynamic] in [Joint]s /// with this [BodyType.static]. /// @@ -15,9 +15,9 @@ import 'package:flame_forge2d/flame_forge2d.dart'; /// ); /// ``` /// {@endtemplate} -class Anchor extends BodyComponent { - /// {@macro anchor} - Anchor({ +class JointAnchor extends BodyComponent { + /// {@macro joint_anchor} + JointAnchor({ required Vector2 position, }) : _position = position; diff --git a/lib/game/components/plunger.dart b/lib/game/components/plunger.dart index 2ec2f599..bf63b462 100644 --- a/lib/game/components/plunger.dart +++ b/lib/game/components/plunger.dart @@ -1,7 +1,7 @@ import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/services.dart'; -import 'package:pinball/game/game.dart' show Anchor; +import 'package:pinball/game/game.dart'; /// {@template plunger} /// [Plunger] serves as a spring, that shoots the ball on the right side of the @@ -77,9 +77,9 @@ class Plunger extends BodyComponent with KeyboardHandler { } /// {@template plunger_anchor} -/// [Anchor] positioned below a [Plunger]. +/// [JointAnchor] positioned below a [Plunger]. /// {@endtemplate} -class PlungerAnchor extends Anchor { +class PlungerAnchor extends JointAnchor { /// {@macro plunger_anchor} PlungerAnchor({ required Plunger plunger, @@ -92,11 +92,11 @@ class PlungerAnchor extends Anchor { } /// {@template plunger_anchor_prismatic_joint_def} -/// [PrismaticJointDef] between a [Plunger] and an [Anchor] with motion on +/// [PrismaticJointDef] between a [Plunger] and an [JointAnchor] with motion on /// the vertical axis. /// /// The [Plunger] is constrained vertically between its starting position and -/// the [Anchor]. The [Anchor] must be below the [Plunger]. +/// the [JointAnchor]. The [JointAnchor] must be below the [Plunger]. /// {@endtemplate} class PlungerAnchorPrismaticJointDef extends PrismaticJointDef { /// {@macro plunger_anchor_prismatic_joint_def} diff --git a/pubspec.lock b/pubspec.lock index 8ff31de7..73d0fc8d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "30.0.0" + version: "31.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.8.0" args: dependency: transitive description: @@ -35,14 +35,14 @@ packages: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "8.0.2" + version: "8.0.3" bloc_test: dependency: "direct dev" description: name: bloc_test url: "https://pub.dartlang.org" source: hosted - version: "9.0.2" + version: "9.0.3" boolean_selector: dependency: transitive description: @@ -140,21 +140,21 @@ packages: name: flame url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-releasecandidate.4" + version: "1.1.0-releasecandidate.5" flame_bloc: dependency: "direct main" description: name: flame_bloc url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-releasecandidate.4" + version: "1.2.0-releasecandidate.5" flame_forge2d: dependency: "direct main" description: name: flame_forge2d url: "https://pub.dartlang.org" source: hosted - version: "0.9.0-releasecandidate.4" + version: "0.9.0-releasecandidate.5" flame_test: dependency: "direct dev" description: @@ -190,7 +190,7 @@ packages: name: forge2d url: "https://pub.dartlang.org" source: hosted - version: "0.8.1" + version: "0.8.2" frontend_server_client: dependency: transitive description: @@ -218,7 +218,7 @@ packages: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.2.0" http_parser: dependency: transitive description: @@ -246,7 +246,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" logging: dependency: transitive description: @@ -351,14 +351,14 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.0.2" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" shelf: dependency: transitive description: @@ -489,7 +489,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.3.0" + version: "7.5.0" watcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 39b93fe7..18905a10 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: bloc: ^8.0.2 equatable: ^2.0.3 - flame: ^1.1.0-releasecandidate.4 - flame_bloc: ^1.2.0-releasecandidate.4 - flame_forge2d: ^0.9.0-releasecandidate.4 + flame: ^1.1.0-releasecandidate.5 + flame_bloc: ^1.2.0-releasecandidate.5 + flame_forge2d: ^0.9.0-releasecandidate.5 flutter: sdk: flutter flutter_bloc: ^8.0.1 diff --git a/test/game/components/flipper_test.dart b/test/game/components/flipper_test.dart index 070265bc..ead927bf 100644 --- a/test/game/components/flipper_test.dart +++ b/test/game/components/flipper_test.dart @@ -103,9 +103,7 @@ void main() { ) as Flipper; expect( - leftFlipper.body.position.x + - leftFlipper.size.x + - flipperGroup.spacing, + leftFlipper.body.position.x + Flipper.width + flipperGroup.spacing, equals(rightFlipper.body.position.x), ); }, diff --git a/test/game/components/anchor_test.dart b/test/game/components/joint_anchor_test.dart similarity index 83% rename from test/game/components/anchor_test.dart rename to test/game/components/joint_anchor_test.dart index 49721947..a65f9e1a 100644 --- a/test/game/components/anchor_test.dart +++ b/test/game/components/joint_anchor_test.dart @@ -10,13 +10,13 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - group('Anchor', () { + group('JointAnchor', () { final flameTester = FlameTester(PinballGameTest.create); flameTester.test( 'loads correctly', (game) async { - final anchor = Anchor(position: Vector2.zero()); + final anchor = JointAnchor(position: Vector2.zero()); await game.ready(); await game.ensureAdd(anchor); @@ -30,7 +30,7 @@ void main() { (game) async { await game.ready(); final position = Vector2.all(10); - final anchor = Anchor(position: position); + final anchor = JointAnchor(position: position); await game.ensureAdd(anchor); game.contains(anchor); @@ -42,7 +42,7 @@ void main() { 'is static', (game) async { await game.ready(); - final anchor = Anchor(position: Vector2.zero()); + final anchor = JointAnchor(position: Vector2.zero()); await game.ensureAdd(anchor); expect(anchor.body.bodyType, equals(BodyType.static)); @@ -54,7 +54,7 @@ void main() { flameTester.test( 'has none', (game) async { - final anchor = Anchor(position: Vector2.zero()); + final anchor = JointAnchor(position: Vector2.zero()); await game.ensureAdd(anchor); expect(anchor.body.fixtures, isEmpty);