diff --git a/.github/workflows/share_repository.yaml b/.github/workflows/share_repository.yaml new file mode 100644 index 00000000..2860902b --- /dev/null +++ b/.github/workflows/share_repository.yaml @@ -0,0 +1,18 @@ +name: share_repository + +on: + push: + paths: + - "packages/share_repository/**" + - ".github/workflows/share_repository.yaml" + + pull_request: + paths: + - "packages/share_repository/**" + - ".github/workflows/share_repository.yaml" + +jobs: + build: + uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1 + with: + working_directory: packages/share_repository diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index fc914ebf..7d4b23f7 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -4,7 +4,6 @@ export 'camera_controller.dart'; export 'controlled_ball.dart'; export 'controlled_flipper.dart'; export 'controlled_plunger.dart'; -export 'controlled_sparky_computer.dart'; export 'flutter_forest.dart'; export 'game_flow_controller.dart'; export 'google_word.dart'; diff --git a/lib/game/components/controlled_ball.dart b/lib/game/components/controlled_ball.dart index 6b983cea..4f089a7c 100644 --- a/lib/game/components/controlled_ball.dart +++ b/lib/game/components/controlled_ball.dart @@ -62,10 +62,13 @@ class BallController extends ComponentController Future turboCharge() async { gameRef.read().add(const SparkyTurboChargeActivated()); - // TODO(allisonryan0002): adjust delay to match animation duration once - // given animations. component.stop(); - await Future.delayed(const Duration(seconds: 1)); + // TODO(alestiago): Refactor this hard coded duration once the following is + // merged: + // https://github.com/flame-engine/flame/pull/1564 + await Future.delayed( + const Duration(milliseconds: 2583), + ); component.resume(); await component.boost(Vector2(40, 110)); } diff --git a/lib/game/components/controlled_sparky_computer.dart b/lib/game/components/controlled_sparky_computer.dart deleted file mode 100644 index 65190a1f..00000000 --- a/lib/game/components/controlled_sparky_computer.dart +++ /dev/null @@ -1,52 +0,0 @@ -// ignore_for_file: avoid_renaming_method_parameters - -import 'package:flame/components.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart'; -import 'package:pinball/game/game.dart'; -import 'package:pinball_components/pinball_components.dart'; -import 'package:pinball_flame/pinball_flame.dart'; - -/// {@template controlled_sparky_computer} -/// [SparkyComputer] with a [SparkyComputerController] attached. -/// {@endtemplate} -class ControlledSparkyComputer extends SparkyComputer - with Controls, HasGameRef { - /// {@macro controlled_sparky_computer} - ControlledSparkyComputer() : super() { - controller = SparkyComputerController(this); - } - - @override - Future onLoad() async { - await super.onLoad(); - gameRef.addContactCallback(SparkyComputerSensorBallContactCallback()); - } -} - -/// {@template sparky_computer_controller} -/// Controller attached to a [SparkyComputer] that handles its game related -/// logic. -/// {@endtemplate} -// TODO(allisonryan0002): listen for turbo charge game bonus and animate Sparky. -class SparkyComputerController - extends ComponentController { - /// {@macro sparky_computer_controller} - SparkyComputerController(ControlledSparkyComputer controlledComputer) - : super(controlledComputer); -} - -/// {@template sparky_computer_sensor_ball_contact_callback} -/// Turbo charges the [Ball] when it enters the [SparkyComputer] -/// {@endtemplate} -@visibleForTesting -class SparkyComputerSensorBallContactCallback - extends ContactCallback { - /// {@macro sparky_computer_sensor_ball_contact_callback} - SparkyComputerSensorBallContactCallback(); - - @override - void begin(_, ControlledBall ball, __) { - ball.controller.turboCharge(); - } -} diff --git a/lib/game/components/sparky_fire_zone.dart b/lib/game/components/sparky_fire_zone.dart index 6d78d32b..a5450761 100644 --- a/lib/game/components/sparky_fire_zone.dart +++ b/lib/game/components/sparky_fire_zone.dart @@ -1,10 +1,10 @@ // ignore_for_file: avoid_renaming_method_parameters -import 'package:flame/components.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_flame/pinball_flame.dart'; /// {@template sparky_fire_zone} /// Area positioned at the top left of the [Board] where the [Ball] @@ -12,29 +12,21 @@ import 'package:pinball_components/pinball_components.dart'; /// /// When a [Ball] hits [SparkyBumper]s, the bumper animates. /// {@endtemplate} -class SparkyFireZone extends Component with HasGameRef { +class SparkyFireZone extends Blueprint { /// {@macro sparky_fire_zone} - SparkyFireZone(); - - @override - Future onLoad() async { - await super.onLoad(); - - gameRef.addContactCallback(SparkyBumperBallContactCallback()); - - final lowerLeftBumper = _SparkyBumper.a() - ..initialPosition = Vector2(-22.9, -41.65); - final upperLeftBumper = _SparkyBumper.b() - ..initialPosition = Vector2(-21.25, -57.9); - final rightBumper = _SparkyBumper.c() - ..initialPosition = Vector2(-3.3, -52.55); - - await addAll([ - lowerLeftBumper, - upperLeftBumper, - rightBumper, - ]); - } + SparkyFireZone() + : super( + components: [ + _SparkyBumper.a()..initialPosition = Vector2(-22.9, -41.65), + _SparkyBumper.b()..initialPosition = Vector2(-21.25, -57.9), + _SparkyBumper.c()..initialPosition = Vector2(-3.3, -52.55), + SparkyComputerSensor()..initialPosition = Vector2(-13, -49.8), + SparkyAnimatronic()..position = Vector2(-13.8, -58.2), + ], + blueprints: [ + SparkyComputer(), + ], + ); } // TODO(alestiago): Revisit ScorePoints logic once the FlameForge2D @@ -48,6 +40,14 @@ class _SparkyBumper extends SparkyBumper with ScorePoints { @override int get points => 20; + + @override + Future onLoad() async { + await super.onLoad(); + // TODO(alestiago): Revisit once this has been merged: + // https://github.com/flame-engine/flame/pull/1547 + gameRef.addContactCallback(SparkyBumperBallContactCallback()); + } } /// Listens when a [Ball] bounces bounces against a [SparkyBumper]. @@ -63,3 +63,48 @@ class SparkyBumperBallContactCallback sparkyBumper.animate(); } } + +/// {@template sparky_computer_sensor} +/// Small sensor body used to detect when a ball has entered the +/// [SparkyComputer]. +/// {@endtemplate} +// TODO(alestiago): Revisit once this has been merged: +// https://github.com/flame-engine/flame/pull/1547 +class SparkyComputerSensor extends BodyComponent with InitialPosition { + /// {@macro sparky_computer_sensor} + SparkyComputerSensor() { + renderBody = false; + } + + @override + Body createBody() { + final shape = CircleShape()..radius = 0.1; + final fixtureDef = FixtureDef(shape, isSensor: true); + final bodyDef = BodyDef( + position: initialPosition, + userData: this, + ); + return world.createBody(bodyDef)..createFixture(fixtureDef); + } + + @override + Future onLoad() async { + await super.onLoad(); + // TODO(alestiago): Revisit once this has been merged: + // https://github.com/flame-engine/flame/pull/1547 + gameRef.addContactCallback(SparkyComputerSensorBallContactCallback()); + } +} + +@visibleForTesting +// TODO(alestiago): Revisit once this has been merged: +// https://github.com/flame-engine/flame/pull/1547 +// ignore: public_member_api_docs +class SparkyComputerSensorBallContactCallback + extends ContactCallback { + @override + void begin(_, ControlledBall controlledBall, __) { + controlledBall.controller.turboCharge(); + controlledBall.gameRef.firstChild()?.playing = true; + } +} diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 1cd4f194..9dc88562 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -43,8 +43,11 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.dash.bumper.b.inactive.keyName), images.load(components.Assets.images.dash.bumper.main.active.keyName), images.load(components.Assets.images.dash.bumper.main.inactive.keyName), + images.load(components.Assets.images.plunger.plunger.keyName), + images.load(components.Assets.images.plunger.rocket.keyName), images.load(components.Assets.images.boundary.bottom.keyName), images.load(components.Assets.images.boundary.outer.keyName), + images.load(components.Assets.images.boundary.outerBottom.keyName), images.load(components.Assets.images.spaceship.saucer.keyName), images.load(components.Assets.images.spaceship.bridge.keyName), images.load(components.Assets.images.spaceship.ramp.boardOpening.keyName), @@ -80,12 +83,11 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.alienBumper.b.inactive.keyName), images.load(components.Assets.images.chromeDino.mouth.keyName), images.load(components.Assets.images.chromeDino.head.keyName), - images.load(components.Assets.images.plunger.plunger.keyName), - images.load(components.Assets.images.plunger.rocket.keyName), - images.load(components.Assets.images.sparky.computer.base.keyName), images.load(components.Assets.images.sparky.computer.top.keyName), - images.load(components.Assets.images.sparky.bumper.a.active.keyName), + images.load(components.Assets.images.sparky.computer.base.keyName), + images.load(components.Assets.images.sparky.animatronic.keyName), images.load(components.Assets.images.sparky.bumper.a.inactive.keyName), + images.load(components.Assets.images.sparky.bumper.a.active.keyName), images.load(components.Assets.images.sparky.bumper.b.active.keyName), images.load(components.Assets.images.sparky.bumper.b.inactive.keyName), images.load(components.Assets.images.sparky.bumper.c.active.keyName), diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index d73fb33c..55a6b23a 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flame/components.dart'; +import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_bloc/flame_bloc.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; @@ -49,13 +50,13 @@ class PinballGame extends Forge2DGame // TODO(allisonryan0002): banish Wall and Board classes in later PR. await add(BottomWall()); unawaited(addFromBlueprint(Boundaries())); - unawaited(addFromBlueprint(ControlledSparkyComputer())); + unawaited(addFromBlueprint(LaunchRamp())); final launcher = Launcher(); unawaited(addFromBlueprint(launcher)); unawaited(add(Board())); unawaited(add(AlienZone())); - unawaited(add(SparkyFireZone())); + await addFromBlueprint(SparkyFireZone()); unawaited(addFromBlueprint(Slingshots())); unawaited(addFromBlueprint(DinoWalls())); unawaited(_addBonusWord()); @@ -134,7 +135,7 @@ class _GameBallsController extends ComponentController } } -class DebugPinballGame extends PinballGame with TapDetector { +class DebugPinballGame extends PinballGame with FPSCounter, TapDetector { DebugPinballGame({ required PinballTheme theme, required PinballAudio audio, @@ -149,6 +150,7 @@ class DebugPinballGame extends PinballGame with TapDetector { Future onLoad() async { await super.onLoad(); await _loadBackground(); + await add(_DebugInformation()); } // TODO(alestiago): Move to PinballGame once we have the real background @@ -191,3 +193,35 @@ class _DebugGameBallsController extends _GameBallsController { return noBallsLeft && canBallRespawn; } } + +class _DebugInformation extends Component with HasGameRef { + _DebugInformation() : super(priority: RenderPriority.debugInfo); + + @override + PositionType get positionType => PositionType.widget; + + final _debugTextPaint = TextPaint( + style: const TextStyle( + color: Colors.green, + fontSize: 10, + ), + ); + + final _debugBackgroundPaint = Paint()..color = Colors.white; + + @override + void render(Canvas canvas) { + final debugText = [ + 'FPS: ${gameRef.fps().toStringAsFixed(1)}', + 'BALLS: ${gameRef.descendants().whereType().length}', + ].join(' | '); + + final height = _debugTextPaint.measureTextHeight(debugText); + final position = Vector2(0, gameRef.camera.canvasSize.y - height); + canvas.drawRect( + position & Vector2(gameRef.camera.canvasSize.x, height), + _debugBackgroundPaint, + ); + _debugTextPaint.render(canvas, debugText, position); + } +} diff --git a/lib/leaderboard/models/leader_board_entry.dart b/lib/leaderboard/models/leader_board_entry.dart index cfd5ffd4..a86975dd 100644 --- a/lib/leaderboard/models/leader_board_entry.dart +++ b/lib/leaderboard/models/leader_board_entry.dart @@ -36,7 +36,7 @@ extension LeaderboardEntryDataX on LeaderboardEntryData { rank: position.toString(), playerInitials: playerInitials, score: score, - character: character.toTheme.character, + character: character.toTheme.leaderboardIcon, ); } } diff --git a/lib/theme/view/character_selection_page.dart b/lib/theme/view/character_selection_page.dart index 22aaee22..ef37270b 100644 --- a/lib/theme/view/character_selection_page.dart +++ b/lib/theme/view/character_selection_page.dart @@ -124,7 +124,7 @@ class CharacterImageButton extends StatelessWidget { ), child: Padding( padding: const EdgeInsets.all(8), - child: characterTheme.character.image(), + child: characterTheme.icon.image(), ), ), ); diff --git a/packages/pinball_components/assets/images/boundary/outer-bottom.png b/packages/pinball_components/assets/images/boundary/outer-bottom.png new file mode 100644 index 00000000..508bcee8 Binary files /dev/null and b/packages/pinball_components/assets/images/boundary/outer-bottom.png differ diff --git a/packages/pinball_components/assets/images/sparky/animatronic.png b/packages/pinball_components/assets/images/sparky/animatronic.png new file mode 100644 index 00000000..cc57e405 Binary files /dev/null and b/packages/pinball_components/assets/images/sparky/animatronic.png differ diff --git a/packages/pinball_components/assets/images/sparky/computer/base.png b/packages/pinball_components/assets/images/sparky/computer/base.png index 2e8fe362..188e4329 100644 Binary files a/packages/pinball_components/assets/images/sparky/computer/base.png and b/packages/pinball_components/assets/images/sparky/computer/base.png differ diff --git a/packages/pinball_components/assets/images/sparky/computer/top.png b/packages/pinball_components/assets/images/sparky/computer/top.png index d9f3bc6c..085771cd 100644 Binary files a/packages/pinball_components/assets/images/sparky/computer/top.png and b/packages/pinball_components/assets/images/sparky/computer/top.png differ diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index 0d67f870..4d4cda7d 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -86,6 +86,10 @@ class $AssetsImagesBoundaryGen { AssetGenImage get bottom => const AssetGenImage('assets/images/boundary/bottom.png'); + /// File path: assets/images/boundary/outer-bottom.png + AssetGenImage get outerBottom => + const AssetGenImage('assets/images/boundary/outer-bottom.png'); + /// File path: assets/images/boundary/outer.png AssetGenImage get outer => const AssetGenImage('assets/images/boundary/outer.png'); @@ -257,6 +261,8 @@ class $AssetsImagesSpaceshipGen { class $AssetsImagesSparkyGen { const $AssetsImagesSparkyGen(); + AssetGenImage get animatronic => + const AssetGenImage('assets/images/sparky/animatronic.png'); $AssetsImagesSparkyBumperGen get bumper => const $AssetsImagesSparkyBumperGen(); $AssetsImagesSparkyComputerGen get computer => diff --git a/packages/pinball_components/lib/src/components/boundaries.dart b/packages/pinball_components/lib/src/components/boundaries.dart index 254cbfcf..86e1844e 100644 --- a/packages/pinball_components/lib/src/components/boundaries.dart +++ b/packages/pinball_components/lib/src/components/boundaries.dart @@ -13,6 +13,7 @@ class Boundaries extends Blueprint { components: [ _BottomBoundary(), _OuterBoundary(), + _OuterBottomBoundarySpriteComponent(), ], ); } @@ -91,8 +92,10 @@ class _OuterBoundary extends BodyComponent with InitialPosition { /// {@macro outer_boundary} _OuterBoundary() : super( - priority: RenderPriority.outerBoudary, - children: [_OuterBoundarySpriteComponent()], + priority: RenderPriority.outerBoundary, + children: [ + _OuterBoundarySpriteComponent(), + ], ) { renderBody = false; } @@ -157,3 +160,25 @@ class _OuterBoundarySpriteComponent extends SpriteComponent with HasGameRef { size = sprite.originalSize / 10; } } + +class _OuterBottomBoundarySpriteComponent extends SpriteComponent + with HasGameRef { + _OuterBottomBoundarySpriteComponent() + : super( + priority: RenderPriority.outerBottomBoundary, + anchor: Anchor.center, + position: Vector2(0, 71), + ); + + @override + Future onLoad() async { + await super.onLoad(); + final sprite = Sprite( + gameRef.images.fromCache( + Assets.images.boundary.outerBottom.keyName, + ), + ); + this.sprite = sprite; + size = sprite.originalSize / 10; + } +} diff --git a/packages/pinball_components/lib/src/components/components.dart b/packages/pinball_components/lib/src/components/components.dart index 9ea39d69..57e93abb 100644 --- a/packages/pinball_components/lib/src/components/components.dart +++ b/packages/pinball_components/lib/src/components/components.dart @@ -29,5 +29,6 @@ export 'slingshot.dart'; export 'spaceship.dart'; export 'spaceship_rail.dart'; export 'spaceship_ramp.dart'; +export 'sparky_animatronic.dart'; export 'sparky_bumper.dart'; export 'sparky_computer.dart'; diff --git a/packages/pinball_components/lib/src/components/dash_animatronic.dart b/packages/pinball_components/lib/src/components/dash_animatronic.dart index f1c5b145..47e1e08f 100644 --- a/packages/pinball_components/lib/src/components/dash_animatronic.dart +++ b/packages/pinball_components/lib/src/components/dash_animatronic.dart @@ -38,17 +38,9 @@ class DashAnimatronic extends SpriteAnimationComponent with HasGameRef { textureSize: textureSize, loop: false, ), - ); - } - - @override - void update(double dt) { - super.update(dt); - if (animation != null) { - if (animation!.isLastFrame) { - animation!.reset(); + )..onComplete = () { + animation?.reset(); playing = false; - } - } + }; } } diff --git a/packages/pinball_components/lib/src/components/google_letter.dart b/packages/pinball_components/lib/src/components/google_letter.dart index 1ed31435..43a4c113 100644 --- a/packages/pinball_components/lib/src/components/google_letter.dart +++ b/packages/pinball_components/lib/src/components/google_letter.dart @@ -78,6 +78,7 @@ class _GoogleLetterSprite extends SpriteComponent with HasGameRef { Future onLoad() async { await super.onLoad(); + // TODO(alestiago): Used cached assets. final sprite = await gameRef.loadSprite(_path); this.sprite = sprite; // TODO(alestiago): Size correctly once the assets are provided. diff --git a/packages/pinball_components/lib/src/components/kicker.dart b/packages/pinball_components/lib/src/components/kicker.dart index 26e6c8f9..f6963d7c 100644 --- a/packages/pinball_components/lib/src/components/kicker.dart +++ b/packages/pinball_components/lib/src/components/kicker.dart @@ -136,6 +136,7 @@ class _KickerSpriteComponent extends SpriteComponent with HasGameRef { Future onLoad() async { await super.onLoad(); + // TODO(alestiago): Used cached asset. final sprite = await gameRef.loadSprite( (_side.isLeft) ? Assets.images.kicker.left.keyName diff --git a/packages/pinball_components/lib/src/components/plunger.dart b/packages/pinball_components/lib/src/components/plunger.dart index efa8817a..295c799d 100644 --- a/packages/pinball_components/lib/src/components/plunger.dart +++ b/packages/pinball_components/lib/src/components/plunger.dart @@ -148,6 +148,7 @@ class _PlungerSpriteAnimationGroupComponent Future onLoad() async { await super.onLoad(); + // TODO(alestiago): Used cached images. final spriteSheet = await gameRef.images.load( Assets.images.plunger.plunger.keyName, ); diff --git a/packages/pinball_components/lib/src/components/render_priority.dart b/packages/pinball_components/lib/src/components/render_priority.dart index b179cce9..d2438db9 100644 --- a/packages/pinball_components/lib/src/components/render_priority.dart +++ b/packages/pinball_components/lib/src/components/render_priority.dart @@ -39,7 +39,9 @@ abstract class RenderPriority { static const int bottomBoundary = _above + dinoBottomWall; - static const int outerBoudary = _above + background; + static const int outerBoundary = _above + background; + + static const int outerBottomBoundary = _above + rocket; // Bottom Group @@ -47,7 +49,7 @@ abstract class RenderPriority { // Launcher - static const int launchRamp = _above + outerBoudary; + static const int launchRamp = _above + outerBoundary; static const int launchRampForegroundRailing = _below + ballOnBoard; @@ -113,4 +115,7 @@ abstract class RenderPriority { // Score Text static const int scoreText = _above + spaceshipRampForegroundRailing; + + // Debug information + static const int debugInfo = _above + scoreText; } diff --git a/packages/pinball_components/lib/src/components/sparky_animatronic.dart b/packages/pinball_components/lib/src/components/sparky_animatronic.dart new file mode 100644 index 00000000..714a5700 --- /dev/null +++ b/packages/pinball_components/lib/src/components/sparky_animatronic.dart @@ -0,0 +1,46 @@ +import 'package:flame/components.dart'; +import 'package:pinball_components/pinball_components.dart'; + +/// {@template sparky_animatronic} +/// Animated Sparky that sits on top of the [SparkyComputer]. +/// {@endtemplate} +class SparkyAnimatronic extends SpriteAnimationComponent with HasGameRef { + /// {@macro sparky_animatronic} + SparkyAnimatronic() + : super( + anchor: Anchor.center, + playing: false, + priority: RenderPriority.sparkyAnimatronic, + ); + + @override + Future onLoad() async { + await super.onLoad(); + + final spriteSheet = gameRef.images.fromCache( + Assets.images.sparky.animatronic.keyName, + ); + + const amountPerRow = 9; + const amountPerColumn = 7; + final textureSize = Vector2( + spriteSheet.width / amountPerRow, + spriteSheet.height / amountPerColumn, + ); + size = textureSize / 10; + + animation = SpriteAnimation.fromFrameData( + spriteSheet, + SpriteAnimationData.sequenced( + amount: (amountPerRow * amountPerColumn) - 1, + amountPerRow: amountPerRow, + stepTime: 1 / 24, + textureSize: textureSize, + loop: false, + ), + )..onComplete = () { + animation?.reset(); + playing = false; + }; + } +} diff --git a/packages/pinball_components/lib/src/components/sparky_computer.dart b/packages/pinball_components/lib/src/components/sparky_computer.dart index 4cec4c59..481de63d 100644 --- a/packages/pinball_components/lib/src/components/sparky_computer.dart +++ b/packages/pinball_components/lib/src/components/sparky_computer.dart @@ -7,9 +7,6 @@ import 'package:pinball_flame/pinball_flame.dart'; /// {@template sparky_computer} /// A computer owned by Sparky. -/// -/// Register a [ContactCallback] for [SparkyComputerSensor] to listen when -/// something enters the [SparkyComputer]. /// {@endtemplate} class SparkyComputer extends Blueprint { /// {@macro sparky_computer} @@ -18,7 +15,6 @@ class SparkyComputer extends Blueprint { components: [ _ComputerBase(), _ComputerTopSpriteComponent(), - SparkyComputerSensor(), ], ); } @@ -104,24 +100,3 @@ class _ComputerTopSpriteComponent extends SpriteComponent with HasGameRef { size = sprite.originalSize / 10; } } - -/// {@template sparky_computer_sensor} -/// Small sensor body used to detect when a ball has entered the -/// [SparkyComputer]. -/// {@endtemplate} -class SparkyComputerSensor extends BodyComponent with InitialPosition { - /// {@macro sparky_computer_sensor} - SparkyComputerSensor() { - renderBody = false; - } - - @override - Body createBody() { - final shape = CircleShape()..radius = 0.1; - final fixtureDef = FixtureDef(shape, isSensor: true); - final bodyDef = BodyDef() - ..position = initialPosition - ..userData = this; - return world.createBody(bodyDef)..createFixture(fixtureDef); - } -} diff --git a/packages/pinball_components/pubspec.yaml b/packages/pinball_components/pubspec.yaml index 7df3429a..a7cb8367 100644 --- a/packages/pinball_components/pubspec.yaml +++ b/packages/pinball_components/pubspec.yaml @@ -61,6 +61,7 @@ flutter: - assets/images/slingshot/ - assets/images/alien_bumper/a/ - assets/images/alien_bumper/b/ + - assets/images/sparky/ - assets/images/sparky/computer/ - assets/images/sparky/bumper/a/ - assets/images/sparky/bumper/b/ diff --git a/packages/pinball_components/sandbox/lib/common/add_game.dart b/packages/pinball_components/sandbox/lib/common/add_game.dart new file mode 100644 index 00000000..5b6388d3 --- /dev/null +++ b/packages/pinball_components/sandbox/lib/common/add_game.dart @@ -0,0 +1,36 @@ +import 'package:dashbook/dashbook.dart'; +import 'package:flame/game.dart'; +import 'package:sandbox/common/common.dart'; + +const _path = + 'https://github.com/VGVentures/pinball/tree/main/packages/pinball_components/sandbox/lib/stories/'; + +extension StoryAddGame on Story { + void addGame({ + required String title, + required String description, + required Game Function(DashbookContext) gameBuilder, + }) { + final _chapter = Chapter( + title, + (DashbookContext context) { + final game = gameBuilder(context); + if (game is Traceable) { + game.trace = context.boolProperty('Trace', true); + } + + return GameWidget(game: game); + }, + this, + codeLink: '$_path${name.toPath()}/${title.toPath()}', + info: description, + ); + chapters.add(_chapter); + } +} + +extension on String { + String toPath() { + return replaceAll(' ', '_')..toLowerCase(); + } +} diff --git a/packages/pinball_components/sandbox/lib/common/common.dart b/packages/pinball_components/sandbox/lib/common/common.dart index bb232e24..53010f5e 100644 --- a/packages/pinball_components/sandbox/lib/common/common.dart +++ b/packages/pinball_components/sandbox/lib/common/common.dart @@ -1,3 +1,3 @@ +export 'add_game.dart'; export 'games.dart'; -export 'methods.dart'; export 'trace.dart'; diff --git a/packages/pinball_components/sandbox/lib/common/games.dart b/packages/pinball_components/sandbox/lib/common/games.dart index 4fb158bd..89d16450 100644 --- a/packages/pinball_components/sandbox/lib/common/games.dart +++ b/packages/pinball_components/sandbox/lib/common/games.dart @@ -5,16 +5,25 @@ import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; -abstract class BasicGame extends Forge2DGame { - BasicGame() { +abstract class AssetsGame extends Forge2DGame { + AssetsGame({ + List? imagesFileNames, + }) : _imagesFileNames = imagesFileNames { images.prefix = ''; } -} -abstract class BasicKeyboardGame extends BasicGame - with HasKeyboardHandlerComponents {} + final List? _imagesFileNames; + + @override + Future onLoad() async { + await super.onLoad(); + if (_imagesFileNames != null) { + await images.loadAll(_imagesFileNames!); + } + } +} -abstract class LineGame extends BasicGame with PanDetector { +abstract class LineGame extends AssetsGame with PanDetector { Vector2? _lineEnd; @override diff --git a/packages/pinball_components/sandbox/lib/common/methods.dart b/packages/pinball_components/sandbox/lib/common/methods.dart deleted file mode 100644 index 35198922..00000000 --- a/packages/pinball_components/sandbox/lib/common/methods.dart +++ /dev/null @@ -1,3 +0,0 @@ -String buildSourceLink(String path) { - return 'https://github.com/VGVentures/pinball/tree/main/packages/pinball_components/sandbox/lib/stories/$path'; -} diff --git a/packages/pinball_components/sandbox/lib/common/trace.dart b/packages/pinball_components/sandbox/lib/common/trace.dart index d35568ea..6129a779 100644 --- a/packages/pinball_components/sandbox/lib/common/trace.dart +++ b/packages/pinball_components/sandbox/lib/common/trace.dart @@ -35,7 +35,7 @@ mixin Traceable on Forge2DGame { .forEach((bodyComponent) => bodyComponent.trace()); descendants() - .whereType() + .whereType() .forEach((sprite) => sprite.setOpacity(0.5)); } } diff --git a/packages/pinball_components/sandbox/lib/main.dart b/packages/pinball_components/sandbox/lib/main.dart index 73ae296c..8709d694 100644 --- a/packages/pinball_components/sandbox/lib/main.dart +++ b/packages/pinball_components/sandbox/lib/main.dart @@ -16,9 +16,6 @@ void main() { addLayerStories(dashbook); addEffectsStories(dashbook); addFlipperStories(dashbook); - addSpaceshipStories(dashbook); - addSpaceshipRampStories(dashbook); - addSpaceshipRailStories(dashbook); addBaseboardStories(dashbook); addChromeDinoStories(dashbook); addDashNestBumperStories(dashbook); @@ -27,7 +24,6 @@ void main() { addSlingshotStories(dashbook); addSparkyBumperStories(dashbook); addAlienZoneStories(dashbook); - addZoomStories(dashbook); addBoundariesStories(dashbook); addGoogleWordStories(dashbook); addLaunchRampStories(dashbook); diff --git a/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_a_game.dart b/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_a_game.dart index fec10fe0..4832a468 100644 --- a/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_a_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_a_game.dart @@ -4,10 +4,17 @@ import 'package:flame/extensions.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class AlienBumperAGame extends BasicBallGame { - AlienBumperAGame() : super(color: const Color(0xFF0000FF)); - - static const info = ''' +class AlienBumperAGame extends BallGame { + AlienBumperAGame() + : super( + color: const Color(0xFF0000FF), + imagesFileNames: [ + Assets.images.alienBumper.a.active.keyName, + Assets.images.alienBumper.a.inactive.keyName, + ], + ); + + static const description = ''' Shows how a AlienBumperA is rendered. - Activate the "trace" parameter to overlay the body. @@ -17,16 +24,10 @@ class AlienBumperAGame extends BasicBallGame { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.alienBumper.a.active.keyName, - Assets.images.alienBumper.a.inactive.keyName, - ]); - - final center = screenToWorld(camera.viewport.canvasSize! / 2); - final alienBumperA = AlienBumper.a() - ..initialPosition = Vector2(center.x - 20, center.y - 20) - ..priority = 1; - await add(alienBumperA); + camera.followVector2(Vector2.zero()); + await add( + AlienBumper.a()..priority = 1, + ); await traceAllBodies(); } diff --git a/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_b_game.dart b/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_b_game.dart index 0218127b..abb206ca 100644 --- a/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_b_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/alien_zone/alien_bumper_b_game.dart @@ -4,10 +4,17 @@ import 'package:flame/extensions.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class AlienBumperBGame extends BasicBallGame { - AlienBumperBGame() : super(color: const Color(0xFF0000FF)); - - static const info = ''' +class AlienBumperBGame extends BallGame { + AlienBumperBGame() + : super( + color: const Color(0xFF0000FF), + imagesFileNames: [ + Assets.images.alienBumper.b.active.keyName, + Assets.images.alienBumper.b.inactive.keyName, + ], + ); + + static const description = ''' Shows how a AlienBumperB is rendered. - Activate the "trace" parameter to overlay the body. @@ -17,16 +24,10 @@ class AlienBumperBGame extends BasicBallGame { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.alienBumper.b.active.keyName, - Assets.images.alienBumper.b.inactive.keyName, - ]); - - final center = screenToWorld(camera.viewport.canvasSize! / 2); - final alienBumperB = AlienBumper.b() - ..initialPosition = Vector2(center.x - 10, center.y + 10) - ..priority = 1; - await add(alienBumperB); + camera.followVector2(Vector2.zero()); + await add( + AlienBumper.b()..priority = 1, + ); await traceAllBodies(); } diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship/basic_spaceship_game.dart b/packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_game.dart similarity index 79% rename from packages/pinball_components/sandbox/lib/stories/spaceship/basic_spaceship_game.dart rename to packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_game.dart index 6c00f476..ad897dd4 100644 --- a/packages/pinball_components/sandbox/lib/stories/spaceship/basic_spaceship_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_game.dart @@ -6,8 +6,8 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:sandbox/common/common.dart'; -class BasicSpaceshipGame extends BasicGame with TapDetector { - static const info = ''' +class SpaceshipGame extends AssetsGame with TapDetector { + static const description = ''' Shows how a Spaceship works. - Tap anywhere on the screen to spawn a Ball into the game. @@ -18,10 +18,10 @@ class BasicSpaceshipGame extends BasicGame with TapDetector { await super.onLoad(); camera.followVector2(Vector2.zero()); - - unawaited( - addFromBlueprint(Spaceship(position: Vector2.zero())), + await addFromBlueprint( + Spaceship(position: Vector2.zero()), ); + await ready(); } @override diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart b/packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_rail_game.dart similarity index 82% rename from packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart rename to packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_rail_game.dart index 471333c3..2a13fb5e 100644 --- a/packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_rail_game.dart @@ -6,7 +6,7 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SpaceshipRailGame extends BasicBallGame { +class SpaceshipRailGame extends BallGame { SpaceshipRailGame() : super( color: Colors.blue, @@ -14,7 +14,7 @@ class SpaceshipRailGame extends BasicBallGame { ballLayer: Layer.spaceshipExitRail, ); - static const info = ''' + static const description = ''' Shows how SpaceshipRail are rendered. - Activate the "trace" parameter to overlay the body. @@ -26,10 +26,8 @@ class SpaceshipRailGame extends BasicBallGame { await super.onLoad(); camera.followVector2(Vector2(-30, -10)); - - final spaceshipRail = SpaceshipRail(); - unawaited(addFromBlueprint(spaceshipRail)); - + await addFromBlueprint(SpaceshipRail()); + await ready(); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart b/packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_ramp_game.dart similarity index 59% rename from packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart rename to packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_ramp_game.dart index f259b28b..1817f40a 100644 --- a/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/alien_zone/spaceship_ramp_game.dart @@ -7,15 +7,27 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SpaceshipRampGame extends BasicBallGame with KeyboardEvents { +class SpaceshipRampGame extends BallGame with KeyboardEvents { SpaceshipRampGame() : super( color: Colors.blue, ballPriority: RenderPriority.ballOnSpaceshipRamp, ballLayer: Layer.spaceshipEntranceRamp, + imagesFileNames: [ + Assets.images.spaceship.ramp.railingBackground.keyName, + Assets.images.spaceship.ramp.main.keyName, + Assets.images.spaceship.ramp.boardOpening.keyName, + Assets.images.spaceship.ramp.railingForeground.keyName, + Assets.images.spaceship.ramp.arrow.inactive.keyName, + Assets.images.spaceship.ramp.arrow.active1.keyName, + Assets.images.spaceship.ramp.arrow.active2.keyName, + Assets.images.spaceship.ramp.arrow.active3.keyName, + Assets.images.spaceship.ramp.arrow.active4.keyName, + Assets.images.spaceship.ramp.arrow.active5.keyName, + ], ); - static const info = ''' + static const description = ''' Shows how SpaceshipRamp is rendered. - Activate the "trace" parameter to overlay the body. @@ -29,22 +41,10 @@ class SpaceshipRampGame extends BasicBallGame with KeyboardEvents { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.spaceship.ramp.railingBackground.keyName, - Assets.images.spaceship.ramp.main.keyName, - Assets.images.spaceship.ramp.boardOpening.keyName, - Assets.images.spaceship.ramp.railingForeground.keyName, - Assets.images.spaceship.ramp.arrow.inactive.keyName, - Assets.images.spaceship.ramp.arrow.active1.keyName, - Assets.images.spaceship.ramp.arrow.active2.keyName, - Assets.images.spaceship.ramp.arrow.active3.keyName, - Assets.images.spaceship.ramp.arrow.active4.keyName, - Assets.images.spaceship.ramp.arrow.active5.keyName, - ]); - - _spaceshipRamp = SpaceshipRamp(); - await addFromBlueprint(_spaceshipRamp); camera.followVector2(Vector2(-12, -50)); + await addFromBlueprint( + _spaceshipRamp = SpaceshipRamp(), + ); await traceAllBodies(); } diff --git a/packages/pinball_components/sandbox/lib/stories/alien_zone/stories.dart b/packages/pinball_components/sandbox/lib/stories/alien_zone/stories.dart index 4bc758f9..b4e7c1b6 100644 --- a/packages/pinball_components/sandbox/lib/stories/alien_zone/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/alien_zone/stories.dart @@ -1,25 +1,36 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/alien_zone/alien_bumper_a_game.dart'; import 'package:sandbox/stories/alien_zone/alien_bumper_b_game.dart'; +import 'package:sandbox/stories/alien_zone/spaceship_game.dart'; +import 'package:sandbox/stories/alien_zone/spaceship_rail_game.dart'; +import 'package:sandbox/stories/alien_zone/spaceship_ramp_game.dart'; void addAlienZoneStories(Dashbook dashbook) { dashbook.storiesOf('Alien Zone') - ..add( - 'Alien Bumper A', - (context) => GameWidget( - game: AlienBumperAGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('alien_zone/alien_bumper_a.dart'), - info: AlienBumperAGame.info, + ..addGame( + title: 'Alien Bumper A', + description: AlienBumperAGame.description, + gameBuilder: (_) => AlienBumperAGame(), ) - ..add( - 'Alien Bumper B', - (context) => GameWidget( - game: AlienBumperBGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('alien_zone/alien_bumper_b.dart'), - info: AlienBumperAGame.info, + ..addGame( + title: 'Alien Bumper B', + description: AlienBumperBGame.description, + gameBuilder: (_) => AlienBumperBGame(), + ) + ..addGame( + title: 'Spaceship', + description: SpaceshipGame.description, + gameBuilder: (_) => SpaceshipGame(), + ) + ..addGame( + title: 'Spaceship Rail', + description: SpaceshipRailGame.description, + gameBuilder: (_) => SpaceshipRailGame(), + ) + ..addGame( + title: 'Spaceship Ramp', + description: SpaceshipRampGame.description, + gameBuilder: (_) => SpaceshipRampGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/backboard/backboard_game_over_game.dart b/packages/pinball_components/sandbox/lib/stories/backboard/backboard_game_over_game.dart index 691b1656..639a4b57 100644 --- a/packages/pinball_components/sandbox/lib/stories/backboard/backboard_game_over_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/backboard/backboard_game_over_game.dart @@ -1,21 +1,22 @@ -import 'package:flame/components.dart'; +import 'package:flame/input.dart'; import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart' hide Assets; import 'package:pinball_theme/pinball_theme.dart'; import 'package:sandbox/common/common.dart'; -class BackboardGameOverGame extends BasicKeyboardGame { - BackboardGameOverGame(this.score, this.character); +class BackboardGameOverGame extends AssetsGame + with HasKeyboardHandlerComponents { + BackboardGameOverGame(this.score, this.character) + : super( + imagesFileNames: characterIconPaths.values.toList(), + ); - static const info = ''' - Simple example showing the game over mode of the backboard. + static const description = ''' + Shows how the Backboard in game over mode is rendered. - Select a character to update the character icon. '''; - final int score; - final String character; - static final characterIconPaths = { 'Dash': Assets.images.dash.leaderboardIcon.keyName, 'Sparky': Assets.images.sparky.leaderboardIcon.keyName, @@ -23,14 +24,16 @@ class BackboardGameOverGame extends BasicKeyboardGame { 'Dino': Assets.images.dino.leaderboardIcon.keyName, }; + final int score; + + final String character; + @override Future onLoad() async { camera ..followVector2(Vector2.zero()) ..zoom = 5; - await images.loadAll(characterIconPaths.values.toList()); - await add( Backboard.gameOver( position: Vector2(0, 20), diff --git a/packages/pinball_components/sandbox/lib/stories/backboard/backboard_waiting_game.dart b/packages/pinball_components/sandbox/lib/stories/backboard/backboard_waiting_game.dart index 71f5c09a..6da9206c 100644 --- a/packages/pinball_components/sandbox/lib/stories/backboard/backboard_waiting_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/backboard/backboard_waiting_game.dart @@ -2,9 +2,14 @@ import 'package:flame/components.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; -class BackboardWaitingGame extends BasicGame { - static const info = ''' - Simple example showing the waiting mode of the backboard. +class BackboardWaitingGame extends AssetsGame { + BackboardWaitingGame() + : super( + imagesFileNames: [], + ); + + static const description = ''' + Shows how the Backboard in waiting mode is rendered. '''; @override @@ -13,7 +18,8 @@ class BackboardWaitingGame extends BasicGame { ..followVector2(Vector2.zero()) ..zoom = 5; - final backboard = Backboard.waiting(position: Vector2(0, 20)); - await add(backboard); + await add( + Backboard.waiting(position: Vector2(0, 20)), + ); } } diff --git a/packages/pinball_components/sandbox/lib/stories/backboard/stories.dart b/packages/pinball_components/sandbox/lib/stories/backboard/stories.dart index cc05ba4f..b8c85d10 100644 --- a/packages/pinball_components/sandbox/lib/stories/backboard/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/backboard/stories.dart @@ -1,32 +1,25 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/backboard/backboard_game_over_game.dart'; import 'package:sandbox/stories/backboard/backboard_waiting_game.dart'; void addBackboardStories(Dashbook dashbook) { dashbook.storiesOf('Backboard') - ..add( - 'Waiting mode', - (context) => GameWidget( - game: BackboardWaitingGame(), - ), - codeLink: buildSourceLink('backboard/waiting.dart'), - info: BackboardWaitingGame.info, + ..addGame( + title: 'Waiting', + description: BackboardWaitingGame.description, + gameBuilder: (_) => BackboardWaitingGame(), ) - ..add( - 'Game over', - (context) => GameWidget( - game: BackboardGameOverGame( - context.numberProperty('Score', 9000000000).toInt(), - context.listProperty( - 'Character', - BackboardGameOverGame.characterIconPaths.keys.first, - BackboardGameOverGame.characterIconPaths.keys.toList(), - ), + ..addGame( + title: 'Game over', + description: BackboardGameOverGame.description, + gameBuilder: (context) => BackboardGameOverGame( + context.numberProperty('Score', 9000000000).toInt(), + context.listProperty( + 'Character', + BackboardGameOverGame.characterIconPaths.keys.first, + BackboardGameOverGame.characterIconPaths.keys.toList(), ), ), - codeLink: buildSourceLink('backboard/game_over.dart'), - info: BackboardGameOverGame.info, ); } 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 2fa4462e..7f07de97 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 @@ -4,7 +4,7 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; class BallBoosterGame extends LineGame { - static const info = ''' + static const description = ''' Shows how a Ball with a boost works. - Drag to launch a boosted Ball. 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 17bd0723..e57a0322 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 @@ -3,14 +3,20 @@ import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; -class BasicBallGame extends BasicGame with TapDetector, Traceable { - BasicBallGame({ +class BallGame extends AssetsGame with TapDetector, Traceable { + BallGame({ this.color = Colors.blue, this.ballPriority = 0, this.ballLayer = Layer.all, - }); + List? imagesFileNames, + }) : super( + imagesFileNames: [ + Assets.images.ball.ball.keyName, + if (imagesFileNames != null) ...imagesFileNames, + ], + ); - static const info = ''' + static const description = ''' Shows how a Ball works. - Tap anywhere on the screen to spawn a ball into the game. diff --git a/packages/pinball_components/sandbox/lib/stories/ball/stories.dart b/packages/pinball_components/sandbox/lib/stories/ball/stories.dart index 64892d22..eb472282 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/stories.dart @@ -1,5 +1,4 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:flutter/material.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/ball_booster_game.dart'; @@ -7,22 +6,16 @@ import 'package:sandbox/stories/ball/basic_ball_game.dart'; void addBallStories(Dashbook dashbook) { dashbook.storiesOf('Ball') - ..add( - 'Basic', - (context) => GameWidget( - game: BasicBallGame( - color: context.colorProperty('color', Colors.blue), - )..trace = context.boolProperty('Trace', true), + ..addGame( + title: 'Colored', + description: BallGame.description, + gameBuilder: (context) => BallGame( + color: context.colorProperty('color', Colors.blue), ), - codeLink: buildSourceLink('ball/basic.dart'), - info: BasicBallGame.info, ) - ..add( - 'Booster', - (context) => GameWidget( - game: BallBoosterGame(), - ), - codeLink: buildSourceLink('ball/ball_booster.dart'), - info: BallBoosterGame.info, + ..addGame( + title: 'Booster', + description: BallBoosterGame.description, + gameBuilder: (context) => BallBoosterGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/baseboard/baseboard_game.dart b/packages/pinball_components/sandbox/lib/stories/baseboard/baseboard_game.dart index 3dab5c6f..4e86f732 100644 --- a/packages/pinball_components/sandbox/lib/stories/baseboard/baseboard_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/baseboard/baseboard_game.dart @@ -1,10 +1,17 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class BaseboardGame extends BasicBallGame with Traceable { - static const info = ''' +class BaseboardGame extends BallGame { + BaseboardGame() + : super( + imagesFileNames: [ + Assets.images.baseboard.left.keyName, + Assets.images.baseboard.right.keyName, + ], + ); + + static const description = ''' Shows how the Baseboards are rendered. - Activate the "trace" parameter to overlay the body. @@ -15,22 +22,14 @@ class BaseboardGame extends BasicBallGame with Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.baseboard.left.keyName, - Assets.images.baseboard.right.keyName, - ]); - final center = screenToWorld(camera.viewport.canvasSize! / 2); - final leftBaseboard = Baseboard(side: BoardSide.left) - ..initialPosition = center - Vector2(25, 0) - ..priority = 1; - final rightBaseboard = Baseboard(side: BoardSide.right) - ..initialPosition = center + Vector2(25, 0) - ..priority = 1; - await addAll([ - leftBaseboard, - rightBaseboard, + Baseboard(side: BoardSide.left) + ..initialPosition = center - Vector2(25, 0) + ..priority = 1, + Baseboard(side: BoardSide.right) + ..initialPosition = center + Vector2(25, 0) + ..priority = 1, ]); await traceAllBodies(); diff --git a/packages/pinball_components/sandbox/lib/stories/baseboard/stories.dart b/packages/pinball_components/sandbox/lib/stories/baseboard/stories.dart index 2e4d3090..b07e3a73 100644 --- a/packages/pinball_components/sandbox/lib/stories/baseboard/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/baseboard/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/baseboard/baseboard_game.dart'; void addBaseboardStories(Dashbook dashbook) { - dashbook.storiesOf('Baseboard').add( - 'Basic', - (context) => GameWidget( - game: BaseboardGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('baseboard_game/basic.dart'), - info: BaseboardGame.info, + dashbook.storiesOf('Baseboard').addGame( + title: 'Traced', + description: BaseboardGame.description, + gameBuilder: (_) => BaseboardGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/boundaries/boundaries_game.dart b/packages/pinball_components/sandbox/lib/stories/boundaries/boundaries_game.dart index ca7c8cc8..cf78750d 100644 --- a/packages/pinball_components/sandbox/lib/stories/boundaries/boundaries_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/boundaries/boundaries_game.dart @@ -1,11 +1,19 @@ import 'package:flame/extensions.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class BoundariesGame extends BasicBallGame with Traceable { - static const info = ''' +class BoundariesGame extends BallGame { + BoundariesGame() + : super( + imagesFileNames: [ + Assets.images.boundary.outer.keyName, + Assets.images.boundary.outerBottom.keyName, + Assets.images.boundary.bottom.keyName, + ], + ); + + static const description = ''' Shows how Boundaries are rendered. - Activate the "trace" parameter to overlay the body. @@ -16,18 +24,11 @@ class BoundariesGame extends BasicBallGame with Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.boundary.outer.keyName, - Assets.images.boundary.bottom.keyName, - ]); - - await addFromBlueprint(Boundaries()); - await ready(); - camera ..followVector2(Vector2.zero()) ..zoom = 6; - + await addFromBlueprint(Boundaries()); + await ready(); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/boundaries/stories.dart b/packages/pinball_components/sandbox/lib/stories/boundaries/stories.dart index bebb0df7..02bb87b4 100644 --- a/packages/pinball_components/sandbox/lib/stories/boundaries/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/boundaries/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/boundaries/boundaries_game.dart'; void addBoundariesStories(Dashbook dashbook) { - dashbook.storiesOf('Boundaries').add( - 'Basic', - (context) => GameWidget( - game: BoundariesGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('boundaries_game/basic.dart'), - info: BoundariesGame.info, + dashbook.storiesOf('Boundaries').addGame( + title: 'Traced', + description: BoundariesGame.description, + gameBuilder: (_) => BoundariesGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/chrome_dino/chrome_dino_game.dart b/packages/pinball_components/sandbox/lib/stories/chrome_dino/chrome_dino_game.dart index 94bf6e44..2e6831e3 100644 --- a/packages/pinball_components/sandbox/lib/stories/chrome_dino/chrome_dino_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/chrome_dino/chrome_dino_game.dart @@ -2,7 +2,7 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; class ChromeDinoGame extends Forge2DGame { - static const info = 'Shows how a ChromeDino is rendered.'; + static const description = 'Shows how a ChromeDino is rendered.'; @override Future onLoad() async { diff --git a/packages/pinball_components/sandbox/lib/stories/chrome_dino/stories.dart b/packages/pinball_components/sandbox/lib/stories/chrome_dino/stories.dart index fb7c2ee1..391cdca7 100644 --- a/packages/pinball_components/sandbox/lib/stories/chrome_dino/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/chrome_dino/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/chrome_dino/chrome_dino_game.dart'; void addChromeDinoStories(Dashbook dashbook) { - dashbook.storiesOf('Chrome Dino').add( - 'Basic', - (context) => GameWidget( - game: ChromeDinoGame(), - ), - codeLink: buildSourceLink('chrome_dino/basic.dart'), - info: ChromeDinoGame.info, + dashbook.storiesOf('Chrome Dino').addGame( + title: 'Trace', + description: ChromeDinoGame.description, + gameBuilder: (_) => ChromeDinoGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/zoom/basic_zoom_game.dart b/packages/pinball_components/sandbox/lib/stories/effects/camera_zoom_game.dart similarity index 89% rename from packages/pinball_components/sandbox/lib/stories/zoom/basic_zoom_game.dart rename to packages/pinball_components/sandbox/lib/stories/effects/camera_zoom_game.dart index f1c17fe9..11f2b776 100644 --- a/packages/pinball_components/sandbox/lib/stories/zoom/basic_zoom_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/effects/camera_zoom_game.dart @@ -3,8 +3,8 @@ import 'package:flame/input.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; -class BasicCameraZoomGame extends BasicGame with TapDetector { - static const info = ''' +class CameraZoomGame extends AssetsGame with TapDetector { + static const description = ''' Shows how CameraZoom can be used. - Tap to zoom in/out. diff --git a/packages/pinball_components/sandbox/lib/stories/effects/fire_effect_game.dart b/packages/pinball_components/sandbox/lib/stories/effects/fire_effect_game.dart index 9e2acaf4..3ca8ec1a 100644 --- a/packages/pinball_components/sandbox/lib/stories/effects/fire_effect_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/effects/fire_effect_game.dart @@ -3,7 +3,7 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; class FireEffectGame extends LineGame { - static const info = ''' + static const description = ''' Shows how the FireEffect renders. - Drag a line to define the trail direction. diff --git a/packages/pinball_components/sandbox/lib/stories/effects/stories.dart b/packages/pinball_components/sandbox/lib/stories/effects/stories.dart index 37ba434e..9b022987 100644 --- a/packages/pinball_components/sandbox/lib/stories/effects/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/effects/stories.dart @@ -1,13 +1,18 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; +import 'package:sandbox/stories/effects/camera_zoom_game.dart'; import 'package:sandbox/stories/effects/fire_effect_game.dart'; void addEffectsStories(Dashbook dashbook) { - dashbook.storiesOf('Effects').add( - 'Fire Effect', - (context) => GameWidget(game: FireEffectGame()), - codeLink: buildSourceLink('effects/fire_effect.dart'), - info: FireEffectGame.info, - ); + dashbook.storiesOf('Effects') + ..addGame( + title: 'Fire', + description: FireEffectGame.description, + gameBuilder: (_) => FireEffectGame(), + ) + ..addGame( + title: 'CameraZoom', + description: CameraZoomGame.description, + gameBuilder: (_) => CameraZoomGame(), + ); } diff --git a/packages/pinball_components/sandbox/lib/stories/flipper/flipper_game.dart b/packages/pinball_components/sandbox/lib/stories/flipper/flipper_game.dart index 40a638b9..789fa8b4 100644 --- a/packages/pinball_components/sandbox/lib/stories/flipper/flipper_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flipper/flipper_game.dart @@ -2,12 +2,19 @@ import 'package:flame/input.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class FlipperGame extends BasicBallGame with KeyboardEvents, Traceable { - static const info = ''' +class FlipperGame extends BallGame with KeyboardEvents { + FlipperGame() + : super( + imagesFileNames: [ + Assets.images.flipper.left.keyName, + Assets.images.flipper.right.keyName, + ], + ); + + static const description = ''' Shows how Flippers are rendered. - Activate the "trace" parameter to overlay the body. @@ -33,21 +40,12 @@ class FlipperGame extends BasicBallGame with KeyboardEvents, Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.flipper.left.keyName, - Assets.images.flipper.right.keyName, - ]); - final center = screenToWorld(camera.viewport.canvasSize! / 2); - - leftFlipper = Flipper(side: BoardSide.left) - ..initialPosition = center - Vector2(Flipper.size.x, 0); - rightFlipper = Flipper(side: BoardSide.right) - ..initialPosition = center + Vector2(Flipper.size.x, 0); - await addAll([ - leftFlipper, - rightFlipper, + leftFlipper = Flipper(side: BoardSide.left) + ..initialPosition = center - Vector2(Flipper.size.x, 0), + rightFlipper = Flipper(side: BoardSide.right) + ..initialPosition = center + Vector2(Flipper.size.x, 0), ]); await traceAllBodies(); diff --git a/packages/pinball_components/sandbox/lib/stories/flipper/stories.dart b/packages/pinball_components/sandbox/lib/stories/flipper/stories.dart index f8aa0075..2ef2a4b6 100644 --- a/packages/pinball_components/sandbox/lib/stories/flipper/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/flipper/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/flipper/flipper_game.dart'; void addFlipperStories(Dashbook dashbook) { - dashbook.storiesOf('Flipper').add( - 'Basic', - (context) => GameWidget( - game: FlipperGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('flipper/basic.dart'), - info: FlipperGame.info, + dashbook.storiesOf('Flipper').addGame( + title: 'Traced', + description: FlipperGame.description, + gameBuilder: (_) => FlipperGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart index 1ccd7e8e..3580a175 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart @@ -2,11 +2,18 @@ import 'dart:async'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class BigDashNestBumperGame extends BasicBallGame with Traceable { - static const info = ''' +class BigDashNestBumperGame extends BallGame { + BigDashNestBumperGame() + : super( + imagesFileNames: [ + Assets.images.dash.bumper.main.active.keyName, + Assets.images.dash.bumper.main.inactive.keyName, + ], + ); + + static const description = ''' Shows how a BigDashNestBumper is rendered. - Activate the "trace" parameter to overlay the body. @@ -16,13 +23,10 @@ class BigDashNestBumperGame extends BasicBallGame with Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.dash.bumper.main.active.keyName, - Assets.images.dash.bumper.main.inactive.keyName, - ]); - camera.followVector2(Vector2.zero()); - await add(DashNestBumper.main()..priority = 1); + await add( + DashNestBumper.main()..priority = 1, + ); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart index fd7ce93c..349dd811 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart @@ -2,11 +2,20 @@ import 'dart:async'; import 'package:flame/input.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SignpostGame extends BasicBallGame with Traceable, TapDetector { - static const info = ''' +class SignpostGame extends BallGame { + SignpostGame() + : super( + imagesFileNames: [ + Assets.images.signpost.inactive.keyName, + Assets.images.signpost.active1.keyName, + Assets.images.signpost.active2.keyName, + Assets.images.signpost.active3.keyName, + ], + ); + + static const description = ''' Shows how a Signpost is rendered. - Activate the "trace" parameter to overlay the body. @@ -17,13 +26,6 @@ class SignpostGame extends BasicBallGame with Traceable, TapDetector { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.signpost.inactive.keyName, - Assets.images.signpost.active1.keyName, - Assets.images.signpost.active2.keyName, - Assets.images.signpost.active3.keyName, - ]); - camera.followVector2(Vector2.zero()); await add(Signpost()); await traceAllBodies(); diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart index b0a621fa..071f6aa1 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart @@ -2,11 +2,18 @@ import 'dart:async'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SmallDashNestBumperAGame extends BasicBallGame with Traceable { - static const info = ''' +class SmallDashNestBumperAGame extends BallGame { + SmallDashNestBumperAGame() + : super( + imagesFileNames: [ + Assets.images.dash.bumper.a.active.keyName, + Assets.images.dash.bumper.a.inactive.keyName, + ], + ); + + static const description = ''' Shows how a SmallDashNestBumper ("a") is rendered. - Activate the "trace" parameter to overlay the body. @@ -16,11 +23,6 @@ class SmallDashNestBumperAGame extends BasicBallGame with Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.dash.bumper.a.active.keyName, - Assets.images.dash.bumper.a.inactive.keyName, - ]); - camera.followVector2(Vector2.zero()); await add(DashNestBumper.a()..priority = 1); await traceAllBodies(); diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart index 5512d4c9..a47b9962 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart @@ -2,11 +2,18 @@ import 'dart:async'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SmallDashNestBumperBGame extends BasicBallGame with Traceable { - static const info = ''' +class SmallDashNestBumperBGame extends BallGame { + SmallDashNestBumperBGame() + : super( + imagesFileNames: [ + Assets.images.dash.bumper.b.active.keyName, + Assets.images.dash.bumper.b.inactive.keyName, + ], + ); + + static const description = ''' Shows how a SmallDashNestBumper ("b") is rendered. - Activate the "trace" parameter to overlay the body. @@ -16,11 +23,6 @@ class SmallDashNestBumperBGame extends BasicBallGame with Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.dash.bumper.b.active.keyName, - Assets.images.dash.bumper.b.inactive.keyName, - ]); - camera.followVector2(Vector2.zero()); await add(DashNestBumper.b()..priority = 1); await traceAllBodies(); diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart index a563a09a..ef9c1ffb 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart @@ -1,5 +1,4 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/flutter_forest/big_dash_nest_bumper_game.dart'; import 'package:sandbox/stories/flutter_forest/signpost_game.dart'; @@ -8,39 +7,24 @@ import 'package:sandbox/stories/flutter_forest/small_dash_nest_bumper_b_game.dar void addDashNestBumperStories(Dashbook dashbook) { dashbook.storiesOf('Flutter Forest') - ..add( - 'Signpost', - (context) => GameWidget( - game: SignpostGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('flutter_forest/signpost.dart'), - info: SignpostGame.info, + ..addGame( + title: 'Signpost', + description: SignpostGame.description, + gameBuilder: (_) => SignpostGame(), ) - ..add( - 'Big Dash Nest Bumper', - (context) => GameWidget( - game: BigDashNestBumperGame() - ..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('flutter_forest/big_dash_nest_bumper.dart'), - info: BigDashNestBumperGame.info, + ..addGame( + title: 'Big Dash Nest Bumper', + description: BigDashNestBumperGame.description, + gameBuilder: (_) => BigDashNestBumperGame(), ) - ..add( - 'Small Dash Nest Bumper A', - (context) => GameWidget( - game: SmallDashNestBumperAGame() - ..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('flutter_forest/small_dash_nest_bumper_a.dart'), - info: SmallDashNestBumperAGame.info, + ..addGame( + title: 'Small Dash Nest Bumper A', + description: SmallDashNestBumperAGame.description, + gameBuilder: (_) => SmallDashNestBumperAGame(), ) - ..add( - 'Small Dash Nest Bumper B', - (context) => GameWidget( - game: SmallDashNestBumperBGame() - ..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('flutter_forest/small_dash_nest_bumper_b.dart'), - info: SmallDashNestBumperBGame.info, + ..addGame( + title: 'Small Dash Nest Bumper B', + description: SmallDashNestBumperBGame.description, + gameBuilder: (_) => SmallDashNestBumperBGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart b/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart index ad6e556b..d8022e57 100644 --- a/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart @@ -5,10 +5,10 @@ import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class GoogleLetterGame extends BasicBallGame { +class GoogleLetterGame extends BallGame { GoogleLetterGame() : super(color: const Color(0xFF009900)); - static const info = ''' + static const description = ''' Shows how a GoogleLetter is rendered. - Tap anywhere on the screen to spawn a ball into the game. diff --git a/packages/pinball_components/sandbox/lib/stories/google_word/stories.dart b/packages/pinball_components/sandbox/lib/stories/google_word/stories.dart index 290bf9dd..858a9a30 100644 --- a/packages/pinball_components/sandbox/lib/stories/google_word/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/google_word/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/google_word/google_letter_game.dart'; void addGoogleWordStories(Dashbook dashbook) { - dashbook.storiesOf('Google Word').add( - 'Letter', - (context) => GameWidget( - game: GoogleLetterGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('google_word/letter.dart'), - info: GoogleLetterGame.info, + dashbook.storiesOf('Google Word').addGame( + title: 'Letter 0', + description: GoogleLetterGame.description, + gameBuilder: (_) => GoogleLetterGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/kicker/kicker_game.dart b/packages/pinball_components/sandbox/lib/stories/kicker/kicker_game.dart index add7b205..9b7d96cc 100644 --- a/packages/pinball_components/sandbox/lib/stories/kicker/kicker_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/kicker/kicker_game.dart @@ -1,10 +1,9 @@ import 'package:flame/extensions.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class KickerGame extends BasicBallGame with Traceable { - static const info = ''' +class KickerGame extends BallGame { + static const description = ''' Shows how Kickers are rendered. - Activate the "trace" parameter to overlay the body. @@ -16,14 +15,14 @@ class KickerGame extends BasicBallGame with Traceable { await super.onLoad(); final center = screenToWorld(camera.viewport.canvasSize! / 2); - - final leftKicker = Kicker(side: BoardSide.left) - ..initialPosition = Vector2(center.x - (Kicker.size.x * 2), center.y); - await add(leftKicker); - - final rightKicker = Kicker(side: BoardSide.right) - ..initialPosition = Vector2(center.x + (Kicker.size.x * 2), center.y); - await add(rightKicker); + await addAll( + [ + Kicker(side: BoardSide.left) + ..initialPosition = Vector2(center.x - (Kicker.size.x * 2), center.y), + Kicker(side: BoardSide.right) + ..initialPosition = Vector2(center.x + (Kicker.size.x * 2), center.y), + ], + ); await traceAllBodies(); } diff --git a/packages/pinball_components/sandbox/lib/stories/kicker/stories.dart b/packages/pinball_components/sandbox/lib/stories/kicker/stories.dart index 77d6ff29..cfebb7e4 100644 --- a/packages/pinball_components/sandbox/lib/stories/kicker/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/kicker/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/kicker/kicker_game.dart'; void addKickerStories(Dashbook dashbook) { - dashbook.storiesOf('Kickers').add( - 'Basic', - (context) => GameWidget( - game: KickerGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('kicker_game/basic.dart'), - info: KickerGame.info, + dashbook.storiesOf('Kickers').addGame( + title: 'Traced', + description: KickerGame.description, + gameBuilder: (_) => KickerGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/launch_ramp/launch_ramp_game.dart b/packages/pinball_components/sandbox/lib/stories/launch_ramp/launch_ramp_game.dart index 2d636e30..1be94133 100644 --- a/packages/pinball_components/sandbox/lib/stories/launch_ramp/launch_ramp_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/launch_ramp/launch_ramp_game.dart @@ -6,7 +6,7 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class LaunchRampGame extends BasicBallGame { +class LaunchRampGame extends BallGame { LaunchRampGame() : super( color: Colors.blue, @@ -14,7 +14,7 @@ class LaunchRampGame extends BasicBallGame { ballLayer: Layer.launcher, ); - static const info = ''' + static const description = ''' Shows how LaunchRamp are rendered. - Activate the "trace" parameter to overlay the body. @@ -28,10 +28,8 @@ class LaunchRampGame extends BasicBallGame { camera ..followVector2(Vector2(0, 0)) ..zoom = 7.5; - - final launchRamp = LaunchRamp(); - unawaited(addFromBlueprint(launchRamp)); - + await addFromBlueprint(LaunchRamp()); + await ready(); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/launch_ramp/stories.dart b/packages/pinball_components/sandbox/lib/stories/launch_ramp/stories.dart index 083a4584..e02ec093 100644 --- a/packages/pinball_components/sandbox/lib/stories/launch_ramp/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/launch_ramp/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/launch_ramp/launch_ramp_game.dart'; void addLaunchRampStories(Dashbook dashbook) { - dashbook.storiesOf('LaunchRamp').add( - 'Basic', - (context) => GameWidget( - game: LaunchRampGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('launch_ramp/basic.dart'), - info: LaunchRampGame.info, + dashbook.storiesOf('LaunchRamp').addGame( + title: 'Traced', + description: LaunchRampGame.description, + gameBuilder: (_) => LaunchRampGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/layer/basic_layer_game.dart b/packages/pinball_components/sandbox/lib/stories/layer/layer_game.dart similarity index 61% rename from packages/pinball_components/sandbox/lib/stories/layer/basic_layer_game.dart rename to packages/pinball_components/sandbox/lib/stories/layer/layer_game.dart index 60d72ff3..40dcc824 100644 --- a/packages/pinball_components/sandbox/lib/stories/layer/basic_layer_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/layer/layer_game.dart @@ -2,36 +2,35 @@ import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; +import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class BasicLayerGame extends BasicGame with TapDetector { - BasicLayerGame({required this.color}); - - static const info = ''' +class LayerGame extends BallGame with TapDetector { + static const description = ''' Shows how Layers work when a Ball hits other components. - Tap anywhere on the screen to spawn a Ball into the game. '''; - final Color color; - @override Future onLoad() async { - await add(BigSquare()..initialPosition = Vector2(30, -40)); - await add(SmallSquare()..initialPosition = Vector2(50, -40)); - await add(UnlayeredSquare()..initialPosition = Vector2(60, -40)); - } - - @override - void onTapUp(TapUpInfo info) { - add( - Ball(baseColor: color)..initialPosition = info.eventPosition.game, + await addAll( + [ + _BigSquare()..initialPosition = Vector2(30, -40), + _SmallSquare()..initialPosition = Vector2(50, -40), + _UnlayeredSquare()..initialPosition = Vector2(60, -40), + ], ); } } -class BigSquare extends BodyComponent with InitialPosition, Layered { - BigSquare() { +class _BigSquare extends BodyComponent with InitialPosition, Layered { + _BigSquare() + : super( + children: [ + _UnlayeredSquare()..initialPosition = Vector2.all(4), + _SmallSquare()..initialPosition = Vector2.all(-4), + ], + ) { paint = Paint() ..color = const Color.fromARGB(255, 8, 218, 241) ..style = PaintingStyle.stroke; @@ -42,27 +41,13 @@ class BigSquare extends BodyComponent with InitialPosition, Layered { Body createBody() { final shape = PolygonShape()..setAsBoxXY(16, 16); final fixtureDef = FixtureDef(shape); - final bodyDef = BodyDef()..position = initialPosition; - return world.createBody(bodyDef)..createFixture(fixtureDef); } - - @override - Future onLoad() async { - await super.onLoad(); - - await addAll( - [ - UnlayeredSquare()..initialPosition = Vector2.all(4), - SmallSquare()..initialPosition = Vector2.all(-4), - ], - ); - } } -class SmallSquare extends BodyComponent with InitialPosition, Layered { - SmallSquare() { +class _SmallSquare extends BodyComponent with InitialPosition, Layered { + _SmallSquare() { paint = Paint() ..color = const Color.fromARGB(255, 27, 241, 8) ..style = PaintingStyle.stroke; @@ -73,15 +58,13 @@ class SmallSquare extends BodyComponent with InitialPosition, Layered { Body createBody() { final shape = PolygonShape()..setAsBoxXY(2, 2); final fixtureDef = FixtureDef(shape); - final bodyDef = BodyDef()..position = initialPosition; - return world.createBody(bodyDef)..createFixture(fixtureDef); } } -class UnlayeredSquare extends BodyComponent with InitialPosition { - UnlayeredSquare() { +class _UnlayeredSquare extends BodyComponent with InitialPosition { + _UnlayeredSquare() { paint = Paint() ..color = const Color.fromARGB(255, 241, 8, 8) ..style = PaintingStyle.stroke; @@ -91,9 +74,7 @@ class UnlayeredSquare extends BodyComponent with InitialPosition { Body createBody() { final shape = PolygonShape()..setAsBoxXY(3, 3); final fixtureDef = FixtureDef(shape); - final bodyDef = BodyDef()..position = initialPosition; - return world.createBody(bodyDef)..createFixture(fixtureDef); } } diff --git a/packages/pinball_components/sandbox/lib/stories/layer/stories.dart b/packages/pinball_components/sandbox/lib/stories/layer/stories.dart index 12ac028b..64d21b87 100644 --- a/packages/pinball_components/sandbox/lib/stories/layer/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/layer/stories.dart @@ -1,18 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:sandbox/common/common.dart'; -import 'package:sandbox/stories/layer/basic_layer_game.dart'; +import 'package:sandbox/stories/layer/layer_game.dart'; void addLayerStories(Dashbook dashbook) { - dashbook.storiesOf('Layer').add( - 'Layer', - (context) => GameWidget( - game: BasicLayerGame( - color: context.colorProperty('color', Colors.blue), - ), - ), - codeLink: buildSourceLink('layer/basic.dart'), - info: BasicLayerGame.info, + dashbook.storiesOf('Layer').addGame( + title: 'Example', + description: LayerGame.description, + gameBuilder: (_) => LayerGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart b/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart index baaab21b..29eded8c 100644 --- a/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart @@ -5,10 +5,10 @@ import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class PlungerGame extends BasicBallGame with KeyboardEvents, Traceable { +class PlungerGame extends BallGame with KeyboardEvents, Traceable { PlungerGame() : super(color: const Color(0xFFFF0000)); - static const info = ''' + static const description = ''' Shows how Plunger is rendered. - Activate the "trace" parameter to overlay the body. @@ -27,11 +27,10 @@ class PlungerGame extends BasicBallGame with KeyboardEvents, Traceable { await super.onLoad(); final center = screenToWorld(camera.viewport.canvasSize! / 2); - - plunger = Plunger(compressionDistance: 29) - ..initialPosition = Vector2(center.x - (Kicker.size.x * 2), center.y); - await add(plunger); - + await add( + plunger = Plunger(compressionDistance: 29) + ..initialPosition = Vector2(center.x - (Kicker.size.x * 2), center.y), + ); await traceAllBodies(); } diff --git a/packages/pinball_components/sandbox/lib/stories/plunger/stories.dart b/packages/pinball_components/sandbox/lib/stories/plunger/stories.dart index 86061dc2..af54435a 100644 --- a/packages/pinball_components/sandbox/lib/stories/plunger/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/plunger/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/plunger/plunger_game.dart'; void addPlungerStories(Dashbook dashbook) { - dashbook.storiesOf('Plunger').add( - 'Basic', - (context) => GameWidget( - game: PlungerGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('plunger_game/basic.dart'), - info: PlungerGame.info, + dashbook.storiesOf('Plunger').addGame( + title: 'Traced', + description: PlungerGame.description, + gameBuilder: (_) => PlungerGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/score_text/basic.dart b/packages/pinball_components/sandbox/lib/stories/score_text/score_text_game.dart similarity index 88% rename from packages/pinball_components/sandbox/lib/stories/score_text/basic.dart rename to packages/pinball_components/sandbox/lib/stories/score_text/score_text_game.dart index 49b83863..aa776405 100644 --- a/packages/pinball_components/sandbox/lib/stories/score_text/basic.dart +++ b/packages/pinball_components/sandbox/lib/stories/score_text/score_text_game.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/common/common.dart'; -class ScoreTextBasicGame extends BasicGame with TapDetector { - static const info = ''' +class ScoreTextGame extends AssetsGame with TapDetector { + static const description = ''' Simple game to show how score text works, - Tap anywhere on the screen to spawn an text on the given location. diff --git a/packages/pinball_components/sandbox/lib/stories/score_text/stories.dart b/packages/pinball_components/sandbox/lib/stories/score_text/stories.dart index 85caef1b..c4899a27 100644 --- a/packages/pinball_components/sandbox/lib/stories/score_text/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/score_text/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; -import 'package:sandbox/stories/score_text/basic.dart'; +import 'package:sandbox/stories/score_text/score_text_game.dart'; void addScoreTextStories(Dashbook dashbook) { - dashbook.storiesOf('ScoreText').add( - 'Basic', - (context) => GameWidget( - game: ScoreTextBasicGame(), - ), - codeLink: buildSourceLink('score_text/basic.dart'), - info: ScoreTextBasicGame.info, + dashbook.storiesOf('ScoreText').addGame( + title: 'Basic', + description: ScoreTextGame.description, + gameBuilder: (_) => ScoreTextGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/slingshot/slingshot_game.dart b/packages/pinball_components/sandbox/lib/stories/slingshot/slingshot_game.dart index a0f54ea4..28858088 100644 --- a/packages/pinball_components/sandbox/lib/stories/slingshot/slingshot_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/slingshot/slingshot_game.dart @@ -1,11 +1,18 @@ import 'package:flame/extensions.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SlingshotGame extends BasicBallGame with Traceable { - static const info = ''' +class SlingshotGame extends BallGame { + SlingshotGame() + : super( + imagesFileNames: [ + Assets.images.slingshot.upper.keyName, + Assets.images.slingshot.lower.keyName, + ], + ); + + static const description = ''' Shows how Slingshots are rendered. - Activate the "trace" parameter to overlay the body. @@ -16,13 +23,9 @@ class SlingshotGame extends BasicBallGame with Traceable { Future onLoad() async { await super.onLoad(); - await images.loadAll([ - Assets.images.slingshot.upper.keyName, - Assets.images.slingshot.lower.keyName, - ]); - - await addFromBlueprint(Slingshots()); camera.followVector2(Vector2.zero()); + await addFromBlueprint(Slingshots()); + await ready(); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/slingshot/stories.dart b/packages/pinball_components/sandbox/lib/stories/slingshot/stories.dart index 70dfa021..e4c04a0f 100644 --- a/packages/pinball_components/sandbox/lib/stories/slingshot/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/slingshot/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/slingshot/slingshot_game.dart'; void addSlingshotStories(Dashbook dashbook) { - dashbook.storiesOf('Slingshots').add( - 'Basic', - (context) => GameWidget( - game: SlingshotGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('slingshot_game/basic.dart'), - info: SlingshotGame.info, + dashbook.storiesOf('Slingshots').addGame( + title: 'Traced', + description: SlingshotGame.description, + gameBuilder: (_) => SlingshotGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship/stories.dart b/packages/pinball_components/sandbox/lib/stories/spaceship/stories.dart deleted file mode 100644 index ac7720a0..00000000 --- a/packages/pinball_components/sandbox/lib/stories/spaceship/stories.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; -import 'package:sandbox/common/common.dart'; -import 'package:sandbox/stories/spaceship/basic_spaceship_game.dart'; - -void addSpaceshipStories(Dashbook dashbook) { - dashbook.storiesOf('Spaceship').add( - 'Basic', - (context) => GameWidget( - game: BasicSpaceshipGame(), - ), - codeLink: buildSourceLink('spaceship/basic.dart'), - info: BasicSpaceshipGame.info, - ); -} diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship_rail/stories.dart b/packages/pinball_components/sandbox/lib/stories/spaceship_rail/stories.dart deleted file mode 100644 index e69ed1db..00000000 --- a/packages/pinball_components/sandbox/lib/stories/spaceship_rail/stories.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; -import 'package:sandbox/common/common.dart'; -import 'package:sandbox/stories/spaceship_rail/spaceship_rail_game.dart'; - -void addSpaceshipRailStories(Dashbook dashbook) { - dashbook.storiesOf('SpaceshipRail').add( - 'Basic', - (context) => GameWidget( - game: SpaceshipRailGame() - ..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('spaceship_rail/basic.dart'), - info: SpaceshipRailGame.info, - ); -} diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/stories.dart b/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/stories.dart deleted file mode 100644 index f0aeadff..00000000 --- a/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/stories.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; -import 'package:sandbox/common/common.dart'; -import 'package:sandbox/stories/spaceship_ramp/spaceship_ramp_game.dart'; - -void addSpaceshipRampStories(Dashbook dashbook) { - dashbook.storiesOf('SpaceshipRamp').add( - 'Basic', - (context) => GameWidget( - game: SpaceshipRampGame() - ..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('spaceship_ramp/basic.dart'), - info: SpaceshipRampGame.info, - ); -} diff --git a/packages/pinball_components/sandbox/lib/stories/sparky_bumper/sparky_bumper_game.dart b/packages/pinball_components/sandbox/lib/stories/sparky_bumper/sparky_bumper_game.dart index 265b6246..9bebde9e 100644 --- a/packages/pinball_components/sandbox/lib/stories/sparky_bumper/sparky_bumper_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/sparky_bumper/sparky_bumper_game.dart @@ -2,11 +2,10 @@ import 'dart:async'; import 'package:flame/extensions.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SparkyBumperGame extends BasicBallGame with Traceable { - static const info = ''' +class SparkyBumperGame extends BallGame { + static const description = ''' Shows how a SparkyBumper is rendered. - Activate the "trace" parameter to overlay the body. diff --git a/packages/pinball_components/sandbox/lib/stories/sparky_bumper/stories.dart b/packages/pinball_components/sandbox/lib/stories/sparky_bumper/stories.dart index 1a5f8801..418636db 100644 --- a/packages/pinball_components/sandbox/lib/stories/sparky_bumper/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/sparky_bumper/stories.dart @@ -1,15 +1,11 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/sparky_bumper/sparky_bumper_game.dart'; void addSparkyBumperStories(Dashbook dashbook) { - dashbook.storiesOf('Sparky Bumpers').add( - 'Basic', - (context) => GameWidget( - game: SparkyBumperGame()..trace = context.boolProperty('Trace', true), - ), - codeLink: buildSourceLink('sparky_bumper/basic.dart'), - info: SparkyBumperGame.info, + dashbook.storiesOf('Sparky Bumpers').addGame( + title: 'Traced', + description: SparkyBumperGame.description, + gameBuilder: (_) => SparkyBumperGame(), ); } diff --git a/packages/pinball_components/sandbox/lib/stories/stories.dart b/packages/pinball_components/sandbox/lib/stories/stories.dart index 338ca384..90c38150 100644 --- a/packages/pinball_components/sandbox/lib/stories/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/stories.dart @@ -13,8 +13,4 @@ export 'layer/stories.dart'; export 'plunger/stories.dart'; export 'score_text/stories.dart'; export 'slingshot/stories.dart'; -export 'spaceship/stories.dart'; -export 'spaceship_rail/stories.dart'; -export 'spaceship_ramp/stories.dart'; export 'sparky_bumper/stories.dart'; -export 'zoom/stories.dart'; diff --git a/packages/pinball_components/sandbox/lib/stories/zoom/stories.dart b/packages/pinball_components/sandbox/lib/stories/zoom/stories.dart deleted file mode 100644 index 653d5491..00000000 --- a/packages/pinball_components/sandbox/lib/stories/zoom/stories.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:dashbook/dashbook.dart'; -import 'package:flame/game.dart'; -import 'package:sandbox/common/common.dart'; -import 'package:sandbox/stories/zoom/basic_zoom_game.dart'; - -void addZoomStories(Dashbook dashbook) { - dashbook.storiesOf('CameraZoom').add( - 'Basic', - (context) => GameWidget( - game: BasicCameraZoomGame(), - ), - codeLink: buildSourceLink('zoom/basic_zoom_game.dart'), - info: BasicCameraZoomGame.info, - ); -} diff --git a/packages/pinball_components/test/src/components/boundaries_test.dart b/packages/pinball_components/test/src/components/boundaries_test.dart index 9affe0b7..4e2fb497 100644 --- a/packages/pinball_components/test/src/components/boundaries_test.dart +++ b/packages/pinball_components/test/src/components/boundaries_test.dart @@ -10,20 +10,24 @@ import '../../helpers/helpers.dart'; void main() { group('Boundaries', () { + TestWidgetsFlutterBinding.ensureInitialized(); + final assets = [ Assets.images.boundary.outer.keyName, + Assets.images.boundary.outerBottom.keyName, Assets.images.boundary.bottom.keyName, ]; - final tester = FlameTester(TestGame.new); + final flameTester = FlameTester(TestGame.new); - tester.testGameWidget( + flameTester.testGameWidget( 'render correctly', setUp: (game, tester) async { await game.images.loadAll(assets); await game.addFromBlueprint(Boundaries()); + await game.ready(); + game.camera.followVector2(Vector2.zero()); game.camera.zoom = 3.2; - await tester.pump(); }, verify: (game, tester) async { await expectLater( diff --git a/packages/pinball_components/test/src/components/dash_animatronic_test.dart b/packages/pinball_components/test/src/components/dash_animatronic_test.dart index 8b5d0e30..d0707223 100644 --- a/packages/pinball_components/test/src/components/dash_animatronic_test.dart +++ b/packages/pinball_components/test/src/components/dash_animatronic_test.dart @@ -22,7 +22,9 @@ void main() { await tester.pump(); }, verify: (game, tester) async { - const animationDuration = 3.25; + final animationDuration = + game.firstChild()!.animation!.totalDuration(); + await expectLater( find.byGame(), matchesGoldenFile('golden/dash_animatronic/start.png'), @@ -60,8 +62,7 @@ void main() { await game.ensureAdd(dashAnimatronic); dashAnimatronic.playing = true; - dashAnimatronic.animation?.setToLast(); - game.update(1); + game.update(4); expect(dashAnimatronic.playing, isFalse); }, diff --git a/packages/pinball_components/test/src/components/golden/boundaries.png b/packages/pinball_components/test/src/components/golden/boundaries.png index ecb396c4..6cb24bbd 100644 Binary files a/packages/pinball_components/test/src/components/golden/boundaries.png and b/packages/pinball_components/test/src/components/golden/boundaries.png differ diff --git a/packages/pinball_components/test/src/components/golden/dash_animatronic/end.png b/packages/pinball_components/test/src/components/golden/dash_animatronic/end.png index 3e5e91f5..c8218fe1 100644 Binary files a/packages/pinball_components/test/src/components/golden/dash_animatronic/end.png and b/packages/pinball_components/test/src/components/golden/dash_animatronic/end.png differ diff --git a/packages/pinball_components/test/src/components/golden/sparky-computer.png b/packages/pinball_components/test/src/components/golden/sparky-computer.png index 109f9903..165a79da 100644 Binary files a/packages/pinball_components/test/src/components/golden/sparky-computer.png and b/packages/pinball_components/test/src/components/golden/sparky-computer.png differ diff --git a/packages/pinball_components/test/src/components/golden/sparky_animatronic/end.png b/packages/pinball_components/test/src/components/golden/sparky_animatronic/end.png new file mode 100644 index 00000000..5e963f14 Binary files /dev/null and b/packages/pinball_components/test/src/components/golden/sparky_animatronic/end.png differ diff --git a/packages/pinball_components/test/src/components/golden/sparky_animatronic/middle.png b/packages/pinball_components/test/src/components/golden/sparky_animatronic/middle.png new file mode 100644 index 00000000..2665c5cb Binary files /dev/null and b/packages/pinball_components/test/src/components/golden/sparky_animatronic/middle.png differ diff --git a/packages/pinball_components/test/src/components/golden/sparky_animatronic/start.png b/packages/pinball_components/test/src/components/golden/sparky_animatronic/start.png new file mode 100644 index 00000000..ea3e6344 Binary files /dev/null and b/packages/pinball_components/test/src/components/golden/sparky_animatronic/start.png differ diff --git a/packages/pinball_components/test/src/components/sparky_animatronic_test.dart b/packages/pinball_components/test/src/components/sparky_animatronic_test.dart new file mode 100644 index 00000000..66c2e0a6 --- /dev/null +++ b/packages/pinball_components/test/src/components/sparky_animatronic_test.dart @@ -0,0 +1,76 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame/extensions.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball_components/pinball_components.dart'; + +import '../../helpers/helpers.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('SparkyAnimatronic', () { + final asset = Assets.images.sparky.animatronic.keyName; + final flameTester = FlameTester(() => TestGame([asset])); + + flameTester.testGameWidget( + 'renders correctly', + setUp: (game, tester) async { + await game.images.load(asset); + await game.ensureAdd(SparkyAnimatronic()..playing = true); + await tester.pump(); + + game.camera.followVector2(Vector2.zero()); + }, + verify: (game, tester) async { + final animationDuration = + game.firstChild()!.animation!.totalDuration(); + + await expectLater( + find.byGame(), + matchesGoldenFile('golden/sparky_animatronic/start.png'), + ); + + game.update(animationDuration * 0.25); + await tester.pump(); + await expectLater( + find.byGame(), + matchesGoldenFile('golden/sparky_animatronic/middle.png'), + ); + + game.update(animationDuration * 0.75); + await tester.pump(); + await expectLater( + find.byGame(), + matchesGoldenFile('golden/sparky_animatronic/end.png'), + ); + }, + ); + + flameTester.test( + 'loads correctly', + (game) async { + final sparkyAnimatronic = SparkyAnimatronic(); + await game.ensureAdd(sparkyAnimatronic); + + expect(game.contains(sparkyAnimatronic), isTrue); + }, + ); + + flameTester.test( + 'stops animating after animation completes', + (game) async { + final sparkyAnimatronic = SparkyAnimatronic(); + await game.ensureAdd(sparkyAnimatronic); + + sparkyAnimatronic.playing = true; + final animationDuration = + game.firstChild()!.animation!.totalDuration(); + game.update(animationDuration); + + expect(sparkyAnimatronic.playing, isFalse); + }, + ); + }); +} diff --git a/packages/pinball_theme/assets/images/android/animation.png b/packages/pinball_theme/assets/images/android/animation.png new file mode 100644 index 00000000..fc7465be Binary files /dev/null and b/packages/pinball_theme/assets/images/android/animation.png differ diff --git a/packages/pinball_theme/assets/images/android/character.png b/packages/pinball_theme/assets/images/android/character.png deleted file mode 100644 index 736f1e6f..00000000 Binary files a/packages/pinball_theme/assets/images/android/character.png and /dev/null differ diff --git a/packages/pinball_theme/assets/images/dash/animation.png b/packages/pinball_theme/assets/images/dash/animation.png new file mode 100644 index 00000000..e812415f Binary files /dev/null and b/packages/pinball_theme/assets/images/dash/animation.png differ diff --git a/packages/pinball_theme/assets/images/dash/character.png b/packages/pinball_theme/assets/images/dash/character.png deleted file mode 100644 index d76795aa..00000000 Binary files a/packages/pinball_theme/assets/images/dash/character.png and /dev/null differ diff --git a/packages/pinball_theme/assets/images/dino/animation.png b/packages/pinball_theme/assets/images/dino/animation.png new file mode 100644 index 00000000..c75b16f9 Binary files /dev/null and b/packages/pinball_theme/assets/images/dino/animation.png differ diff --git a/packages/pinball_theme/assets/images/dino/character.png b/packages/pinball_theme/assets/images/dino/character.png deleted file mode 100644 index c6f5a390..00000000 Binary files a/packages/pinball_theme/assets/images/dino/character.png and /dev/null differ diff --git a/packages/pinball_theme/assets/images/sparky/animation.png b/packages/pinball_theme/assets/images/sparky/animation.png new file mode 100644 index 00000000..1aff4772 Binary files /dev/null and b/packages/pinball_theme/assets/images/sparky/animation.png differ diff --git a/packages/pinball_theme/assets/images/sparky/character.png b/packages/pinball_theme/assets/images/sparky/character.png deleted file mode 100644 index c37403b3..00000000 Binary files a/packages/pinball_theme/assets/images/sparky/character.png and /dev/null differ diff --git a/packages/pinball_theme/lib/src/generated/assets.gen.dart b/packages/pinball_theme/lib/src/generated/assets.gen.dart index f050c621..3feeecce 100644 --- a/packages/pinball_theme/lib/src/generated/assets.gen.dart +++ b/packages/pinball_theme/lib/src/generated/assets.gen.dart @@ -28,6 +28,10 @@ class $AssetsImagesGen { class $AssetsImagesAndroidGen { const $AssetsImagesAndroidGen(); + /// File path: assets/images/android/animation.png + AssetGenImage get animation => + const AssetGenImage('assets/images/android/animation.png'); + /// File path: assets/images/android/background.png AssetGenImage get background => const AssetGenImage('assets/images/android/background.png'); @@ -48,6 +52,10 @@ class $AssetsImagesAndroidGen { class $AssetsImagesDashGen { const $AssetsImagesDashGen(); + /// File path: assets/images/dash/animation.png + AssetGenImage get animation => + const AssetGenImage('assets/images/dash/animation.png'); + /// File path: assets/images/dash/background.png AssetGenImage get background => const AssetGenImage('assets/images/dash/background.png'); @@ -67,6 +75,10 @@ class $AssetsImagesDashGen { class $AssetsImagesDinoGen { const $AssetsImagesDinoGen(); + /// File path: assets/images/dino/animation.png + AssetGenImage get animation => + const AssetGenImage('assets/images/dino/animation.png'); + /// File path: assets/images/dino/background.png AssetGenImage get background => const AssetGenImage('assets/images/dino/background.png'); @@ -86,6 +98,10 @@ class $AssetsImagesDinoGen { class $AssetsImagesSparkyGen { const $AssetsImagesSparkyGen(); + /// File path: assets/images/sparky/animation.png + AssetGenImage get animation => + const AssetGenImage('assets/images/sparky/animation.png'); + /// File path: assets/images/sparky/background.png AssetGenImage get background => const AssetGenImage('assets/images/sparky/background.png'); diff --git a/packages/pinball_theme/lib/src/themes/android_theme.dart b/packages/pinball_theme/lib/src/themes/android_theme.dart index 1001ca5f..8989c717 100644 --- a/packages/pinball_theme/lib/src/themes/android_theme.dart +++ b/packages/pinball_theme/lib/src/themes/android_theme.dart @@ -14,9 +14,6 @@ class AndroidTheme extends CharacterTheme { @override Color get ballColor => Colors.green; - @override - AssetGenImage get character => Assets.images.android.character; - @override AssetGenImage get background => Assets.images.android.background; @@ -25,4 +22,7 @@ class AndroidTheme extends CharacterTheme { @override AssetGenImage get leaderboardIcon => Assets.images.android.leaderboardIcon; + + @override + AssetGenImage get animation => Assets.images.android.animation; } diff --git a/packages/pinball_theme/lib/src/themes/character_theme.dart b/packages/pinball_theme/lib/src/themes/character_theme.dart index 9c5f6ba6..072c917f 100644 --- a/packages/pinball_theme/lib/src/themes/character_theme.dart +++ b/packages/pinball_theme/lib/src/themes/character_theme.dart @@ -18,9 +18,6 @@ abstract class CharacterTheme extends Equatable { /// Ball color for this theme. Color get ballColor; - /// Asset for the theme character. - AssetGenImage get character; - /// Asset for the background. AssetGenImage get background; @@ -30,13 +27,16 @@ abstract class CharacterTheme extends Equatable { /// Icon asset for the leaderboard. AssetGenImage get leaderboardIcon; + /// Asset for the the idle character animation. + AssetGenImage get animation; + @override List get props => [ name, ballColor, - character, background, icon, leaderboardIcon, + animation, ]; } diff --git a/packages/pinball_theme/lib/src/themes/dash_theme.dart b/packages/pinball_theme/lib/src/themes/dash_theme.dart index 9038f2fc..7584c8ed 100644 --- a/packages/pinball_theme/lib/src/themes/dash_theme.dart +++ b/packages/pinball_theme/lib/src/themes/dash_theme.dart @@ -14,9 +14,6 @@ class DashTheme extends CharacterTheme { @override Color get ballColor => Colors.blue; - @override - AssetGenImage get character => Assets.images.dash.character; - @override AssetGenImage get background => Assets.images.dash.background; @@ -25,4 +22,7 @@ class DashTheme extends CharacterTheme { @override AssetGenImage get leaderboardIcon => Assets.images.dash.leaderboardIcon; + + @override + AssetGenImage get animation => Assets.images.dash.animation; } diff --git a/packages/pinball_theme/lib/src/themes/dino_theme.dart b/packages/pinball_theme/lib/src/themes/dino_theme.dart index b434463e..3baf466c 100644 --- a/packages/pinball_theme/lib/src/themes/dino_theme.dart +++ b/packages/pinball_theme/lib/src/themes/dino_theme.dart @@ -14,9 +14,6 @@ class DinoTheme extends CharacterTheme { @override Color get ballColor => Colors.grey; - @override - AssetGenImage get character => Assets.images.dino.character; - @override AssetGenImage get background => Assets.images.dino.background; @@ -25,4 +22,7 @@ class DinoTheme extends CharacterTheme { @override AssetGenImage get leaderboardIcon => Assets.images.dino.leaderboardIcon; + + @override + AssetGenImage get animation => Assets.images.dino.animation; } diff --git a/packages/pinball_theme/lib/src/themes/sparky_theme.dart b/packages/pinball_theme/lib/src/themes/sparky_theme.dart index 9e71bef8..7884a22f 100644 --- a/packages/pinball_theme/lib/src/themes/sparky_theme.dart +++ b/packages/pinball_theme/lib/src/themes/sparky_theme.dart @@ -14,9 +14,6 @@ class SparkyTheme extends CharacterTheme { @override String get name => 'Sparky'; - @override - AssetGenImage get character => Assets.images.sparky.character; - @override AssetGenImage get background => Assets.images.sparky.background; @@ -25,4 +22,7 @@ class SparkyTheme extends CharacterTheme { @override AssetGenImage get leaderboardIcon => Assets.images.sparky.leaderboardIcon; + + @override + AssetGenImage get animation => Assets.images.sparky.animation; } diff --git a/packages/share_repository/.gitignore b/packages/share_repository/.gitignore new file mode 100644 index 00000000..526da158 --- /dev/null +++ b/packages/share_repository/.gitignore @@ -0,0 +1,7 @@ +# See https://www.dartlang.org/guides/libraries/private-files + +# Files and directories created by pub +.dart_tool/ +.packages +build/ +pubspec.lock \ No newline at end of file diff --git a/packages/share_repository/README.md b/packages/share_repository/README.md new file mode 100644 index 00000000..0473707b --- /dev/null +++ b/packages/share_repository/README.md @@ -0,0 +1,11 @@ +# share_repository + +[![style: very good analysis][very_good_analysis_badge]][very_good_analysis_link] +[![License: MIT][license_badge]][license_link] + +Repository to facilitate sharing scores. + +[license_badge]: https://img.shields.io/badge/license-MIT-blue.svg +[license_link]: https://opensource.org/licenses/MIT +[very_good_analysis_badge]: https://img.shields.io/badge/style-very_good_analysis-B22C89.svg +[very_good_analysis_link]: https://pub.dev/packages/very_good_analysis \ No newline at end of file diff --git a/packages/share_repository/analysis_options.yaml b/packages/share_repository/analysis_options.yaml new file mode 100644 index 00000000..3742fc3d --- /dev/null +++ b/packages/share_repository/analysis_options.yaml @@ -0,0 +1 @@ +include: package:very_good_analysis/analysis_options.2.4.0.yaml \ No newline at end of file diff --git a/packages/share_repository/lib/share_repository.dart b/packages/share_repository/lib/share_repository.dart new file mode 100644 index 00000000..0b6d064c --- /dev/null +++ b/packages/share_repository/lib/share_repository.dart @@ -0,0 +1,3 @@ +library share_repository; + +export 'src/share_repository.dart'; diff --git a/packages/share_repository/lib/src/share_repository.dart b/packages/share_repository/lib/src/share_repository.dart new file mode 100644 index 00000000..6c1f36d0 --- /dev/null +++ b/packages/share_repository/lib/src/share_repository.dart @@ -0,0 +1,7 @@ +/// {@template share_repository} +/// Repository to facilitate sharing scores. +/// {@endtemplate} +class ShareRepository { + /// {@macro share_repository} + const ShareRepository(); +} diff --git a/packages/share_repository/pubspec.yaml b/packages/share_repository/pubspec.yaml new file mode 100644 index 00000000..dc3d4e86 --- /dev/null +++ b/packages/share_repository/pubspec.yaml @@ -0,0 +1,13 @@ +name: share_repository +description: Repository to facilitate sharing scores. +version: 1.0.0+1 +publish_to: none + +environment: + sdk: ">=2.16.0 <3.0.0" + +dev_dependencies: + coverage: ^1.1.0 + mocktail: ^0.2.0 + test: ^1.19.2 + very_good_analysis: ^2.4.0 diff --git a/packages/share_repository/test/src/share_repository_test.dart b/packages/share_repository/test/src/share_repository_test.dart new file mode 100644 index 00000000..e6cc536b --- /dev/null +++ b/packages/share_repository/test/src/share_repository_test.dart @@ -0,0 +1,11 @@ +// ignore_for_file: prefer_const_constructors +import 'package:share_repository/share_repository.dart'; +import 'package:test/test.dart'; + +void main() { + group('ShareRepository', () { + test('can be instantiated', () { + expect(ShareRepository(), isNotNull); + }); + }); +} diff --git a/pubspec.lock b/pubspec.lock index 31aed6af..1a502f37 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "39.0.0" + version: "31.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "2.8.0" args: dependency: transitive description: @@ -71,6 +71,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" clock: dependency: transitive description: @@ -314,7 +321,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" json_annotation: dependency: transitive description: @@ -349,7 +356,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -412,7 +419,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" path_provider: dependency: transitive description: @@ -585,7 +592,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -627,21 +634,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.21.1" + version: "1.19.5" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.13" + version: "0.4.9" typed_data: dependency: transitive description: @@ -662,7 +669,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" very_good_analysis: dependency: "direct dev" description: diff --git a/test/game/components/controlled_sparky_computer_test.dart b/test/game/components/controlled_sparky_computer_test.dart deleted file mode 100644 index 6ba21a44..00000000 --- a/test/game/components/controlled_sparky_computer_test.dart +++ /dev/null @@ -1,38 +0,0 @@ -// ignore_for_file: cascade_invocations - -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() { - group('ControlledSparkyComputer', () { - TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballTestGame.new); - - flameTester.test('loads correctly', (game) async { - final sparkyComputer = ControlledSparkyComputer(); - await game.ensureAdd(sparkyComputer); - expect(game.children, contains(sparkyComputer)); - }); - - flameTester.testGameWidget( - 'SparkyTurboChargeSensorBallContactCallback turbo charges the ball', - setUp: (game, tester) async { - final contackCallback = SparkyComputerSensorBallContactCallback(); - final sparkyTurboChargeSensor = MockSparkyComputerSensor(); - final ball = MockControlledBall(); - final controller = MockBallController(); - - when(() => ball.controller).thenReturn(controller); - when(controller.turboCharge).thenAnswer((_) async {}); - - contackCallback.begin(sparkyTurboChargeSensor, ball, MockContact()); - - verify(() => ball.controller.turboCharge()).called(1); - }, - ); - }); -} diff --git a/test/game/components/sparky_fire_zone_test.dart b/test/game/components/sparky_fire_zone_test.dart index 4c3fcdb9..e2bc08b3 100644 --- a/test/game/components/sparky_fire_zone_test.dart +++ b/test/game/components/sparky_fire_zone_test.dart @@ -8,6 +8,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_flame/pinball_flame.dart'; import '../../helpers/helpers.dart'; @@ -20,29 +21,50 @@ void main() { Assets.images.sparky.bumper.b.inactive.keyName, Assets.images.sparky.bumper.c.active.keyName, Assets.images.sparky.bumper.c.inactive.keyName, + Assets.images.sparky.animatronic.keyName, ]; final flameTester = FlameTester(() => EmptyPinballTestGame(assets)); group('SparkyFireZone', () { - flameTester.test( - 'loads correctly', - (game) async { - final sparkyFireZone = SparkyFireZone(); - await game.ensureAdd(sparkyFireZone); - - expect(game.contains(sparkyFireZone), isTrue); - }, - ); + flameTester.test('loads correctly', (game) async { + final sparkyFireZone = SparkyFireZone(); + await game.ensureAdd(sparkyFireZone); + }); group('loads', () { + flameTester.test( + 'a SparkyComputer', + (game) async { + expect( + SparkyFireZone().blueprints.whereType().single, + isNotNull, + ); + }, + ); + + flameTester.test( + 'a SparkyAnimatronic', + (game) async { + final sparkyFireZone = SparkyFireZone(); + await game.addFromBlueprint(sparkyFireZone); + await game.ready(); + + expect( + game.descendants().whereType().single, + isNotNull, + ); + }, + ); + flameTester.test( 'three SparkyBumper', (game) async { final sparkyFireZone = SparkyFireZone(); - await game.ensureAdd(sparkyFireZone); + await game.addFromBlueprint(sparkyFireZone); + await game.ready(); expect( - sparkyFireZone.descendants().whereType().length, + game.descendants().whereType().length, equals(3), ); }, @@ -84,11 +106,11 @@ void main() { setUp: (game, tester) async { final ball = Ball(baseColor: const Color(0xFF00FFFF)); final sparkyFireZone = SparkyFireZone(); - await game.ensureAdd(sparkyFireZone); + await game.addFromBlueprint(sparkyFireZone); await game.ensureAdd(ball); game.addContactCallback(BallScorePointsCallback(game)); - final bumpers = sparkyFireZone.descendants().whereType(); + final bumpers = sparkyFireZone.components.whereType(); for (final bumper in bumpers) { beginContact(game, bumper, ball); @@ -102,4 +124,40 @@ void main() { ); }); }); + + group('SparkyTurboChargeSensorBallContactCallback', () { + flameTester.test('calls turboCharge', (game) async { + final callback = SparkyComputerSensorBallContactCallback(); + final ball = MockControlledBall(); + final controller = MockBallController(); + when(() => ball.controller).thenReturn(controller); + when(() => ball.gameRef).thenReturn(game); + when(controller.turboCharge).thenAnswer((_) async {}); + + callback.begin(MockSparkyComputerSensor(), ball, MockContact()); + + verify(() => ball.controller.turboCharge()).called(1); + }); + + flameTester.test('plays SparkyAnimatronic', (game) async { + final callback = SparkyComputerSensorBallContactCallback(); + final ball = MockControlledBall(); + final controller = MockBallController(); + when(() => ball.controller).thenReturn(controller); + when(() => ball.gameRef).thenReturn(game); + when(controller.turboCharge).thenAnswer((_) async {}); + + final sparkyFireZone = SparkyFireZone(); + await game.addFromBlueprint(sparkyFireZone); + await game.ready(); + + final sparkyAnimatronic = + sparkyFireZone.components.whereType().single; + + expect(sparkyAnimatronic.playing, isFalse); + callback.begin(MockSparkyComputerSensor(), ball, MockContact()); + + expect(sparkyAnimatronic.playing, isTrue); + }); + }); } diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 4c3dbbfb..aebb31f9 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -34,6 +34,7 @@ void main() { Assets.images.sparky.bumper.b.inactive.keyName, Assets.images.sparky.bumper.c.active.keyName, Assets.images.sparky.bumper.c.inactive.keyName, + Assets.images.sparky.animatronic.keyName, Assets.images.spaceship.ramp.boardOpening.keyName, Assets.images.spaceship.ramp.railingForeground.keyName, Assets.images.spaceship.ramp.railingBackground.keyName, @@ -49,6 +50,7 @@ void main() { Assets.images.flipper.left.keyName, Assets.images.flipper.right.keyName, Assets.images.boundary.outer.keyName, + Assets.images.boundary.outerBottom.keyName, Assets.images.boundary.bottom.keyName, Assets.images.slingshot.upper.keyName, Assets.images.slingshot.lower.keyName, @@ -92,14 +94,6 @@ void main() { ); }); - flameTester.test( - 'one SparkyFireZone', - (game) async { - await game.ready(); - expect(game.children.whereType().length, equals(1)); - }, - ); - flameTester.test( 'one AlienZone', (game) async { diff --git a/test/leaderboard/bloc/leaderboard_state_test.dart b/test/leaderboard/bloc/leaderboard_state_test.dart index ec455f1f..1b5d41d9 100644 --- a/test/leaderboard/bloc/leaderboard_state_test.dart +++ b/test/leaderboard/bloc/leaderboard_state_test.dart @@ -30,7 +30,7 @@ void main() { rank: '1', playerInitials: 'ABC', score: 1500, - character: DashTheme().character, + character: DashTheme().leaderboardIcon, ); test( diff --git a/test/leaderboard/view/leaderboard_page_test.dart b/test/leaderboard/view/leaderboard_page_test.dart index b17c27b8..daacb4a7 100644 --- a/test/leaderboard/view/leaderboard_page_test.dart +++ b/test/leaderboard/view/leaderboard_page_test.dart @@ -121,7 +121,7 @@ void main() { rank: '1', playerInitials: 'ABC', score: 10000, - character: DashTheme().character, + character: DashTheme().leaderboardIcon, ), ], ), diff --git a/web/index.html b/web/index.html index ff6e451b..3e4978d1 100644 --- a/web/index.html +++ b/web/index.html @@ -19,18 +19,18 @@ - + - + - Pinball + I/O Pinball Machine - Flutter @@ -107,4 +107,4 @@ - \ No newline at end of file +