diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index b5aadc97..03912fe6 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -3,9 +3,7 @@ export 'bonus_word.dart'; export 'controlled_ball.dart'; export 'controlled_flipper.dart'; export 'flutter_forest.dart'; -export 'jetpack_ramp.dart'; export 'launcher_ramp.dart'; export 'plunger.dart'; export 'score_points.dart'; -export 'spaceship_exit_rail.dart'; export 'wall.dart'; diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index dcb740a1..5d813ac4 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -21,11 +21,17 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.dashBumper.b.inactive.keyName), images.load(components.Assets.images.dashBumper.main.active.keyName), images.load(components.Assets.images.dashBumper.main.inactive.keyName), + images.load(components.Assets.images.spaceshipRamp.spaceshipRamp.keyName), + images.load( + components.Assets.images.spaceshipRamp.spaceshipRailingBg.keyName, + ), + images.load( + components.Assets.images.spaceshipRamp.spaceshipRailingFg.keyName, + ), + images.load( + components.Assets.images.spaceshipRamp.spaceshipDropTube.keyName, + ), images.load(Assets.images.components.background.path), - images.load(Assets.images.components.spaceshipRamp.path), - images.load(Assets.images.components.spaceshipRailingBg.path), - images.load(Assets.images.components.spaceshipRailingFg.path), - images.load(Assets.images.components.spaceshipDropTube.path), ]); } } diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index 095a5f53..741aa799 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -45,7 +45,7 @@ class PinballGame extends Forge2DGame ); unawaited( addFromBlueprint( - SpaceshipExitRail(), + SpaceshipRail(), ), ); @@ -92,9 +92,7 @@ class PinballGame extends Forge2DGame } Future _addPaths() async { - unawaited( - addFromBlueprint(Jetpack()), - ); + unawaited(addFromBlueprint(SpaceshipRamp())); unawaited(addFromBlueprint(Launcher())); } diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 7796df34..97be7f3e 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -20,22 +20,6 @@ class $AssetsImagesComponentsGen { /// File path: assets/images/components/background.png AssetGenImage get background => const AssetGenImage('assets/images/components/background.png'); - - /// File path: assets/images/components/spaceship-drop-tube.png - AssetGenImage get spaceshipDropTube => - const AssetGenImage('assets/images/components/spaceship-drop-tube.png'); - - /// File path: assets/images/components/spaceship_railing_bg.png - AssetGenImage get spaceshipRailingBg => - const AssetGenImage('assets/images/components/spaceship_railing_bg.png'); - - /// File path: assets/images/components/spaceship_railing_fg.png - AssetGenImage get spaceshipRailingFg => - const AssetGenImage('assets/images/components/spaceship_railing_fg.png'); - - /// File path: assets/images/components/spaceship_ramp.png - AssetGenImage get spaceshipRamp => - const AssetGenImage('assets/images/components/spaceship_ramp.png'); } class Assets { diff --git a/assets/images/components/spaceship-drop-tube.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_drop_tube.png similarity index 100% rename from assets/images/components/spaceship-drop-tube.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_drop_tube.png diff --git a/assets/images/components/spaceship_railing_bg.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_bg.png similarity index 100% rename from assets/images/components/spaceship_railing_bg.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_bg.png diff --git a/assets/images/components/spaceship_railing_fg.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_fg.png similarity index 100% rename from assets/images/components/spaceship_railing_fg.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_fg.png diff --git a/assets/images/components/spaceship_ramp.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_ramp.png similarity index 100% rename from assets/images/components/spaceship_ramp.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_ramp.png diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index cf32e986..2c935aaa 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -27,6 +27,9 @@ class $AssetsImagesGen { AssetGenImage get spaceshipBridge => const AssetGenImage('assets/images/spaceship_bridge.png'); + $AssetsImagesSpaceshipRampGen get spaceshipRamp => + const $AssetsImagesSpaceshipRampGen(); + /// File path: assets/images/spaceship_saucer.png AssetGenImage get spaceshipSaucer => const AssetGenImage('assets/images/spaceship_saucer.png'); @@ -77,6 +80,26 @@ class $AssetsImagesFlipperGen { const AssetGenImage('assets/images/flipper/right.png'); } +class $AssetsImagesSpaceshipRampGen { + const $AssetsImagesSpaceshipRampGen(); + + /// File path: assets/images/spaceship_ramp/spaceship_drop_tube.png + AssetGenImage get spaceshipDropTube => const AssetGenImage( + 'assets/images/spaceship_ramp/spaceship_drop_tube.png'); + + /// File path: assets/images/spaceship_ramp/spaceship_railing_bg.png + AssetGenImage get spaceshipRailingBg => const AssetGenImage( + 'assets/images/spaceship_ramp/spaceship_railing_bg.png'); + + /// File path: assets/images/spaceship_ramp/spaceship_railing_fg.png + AssetGenImage get spaceshipRailingFg => const AssetGenImage( + 'assets/images/spaceship_ramp/spaceship_railing_fg.png'); + + /// File path: assets/images/spaceship_ramp/spaceship_ramp.png + AssetGenImage get spaceshipRamp => + const AssetGenImage('assets/images/spaceship_ramp/spaceship_ramp.png'); +} + class $AssetsImagesDashBumperAGen { const $AssetsImagesDashBumperAGen(); diff --git a/packages/pinball_components/lib/src/components/components.dart b/packages/pinball_components/lib/src/components/components.dart index 87e8c054..2c868279 100644 --- a/packages/pinball_components/lib/src/components/components.dart +++ b/packages/pinball_components/lib/src/components/components.dart @@ -15,3 +15,5 @@ export 'layer.dart'; export 'ramp_opening.dart'; export 'shapes/shapes.dart'; export 'spaceship.dart'; +export 'spaceship_rail.dart'; +export 'spaceship_ramp.dart'; diff --git a/packages/pinball_components/lib/src/components/layer.dart b/packages/pinball_components/lib/src/components/layer.dart index e0e64ddc..10477eff 100644 --- a/packages/pinball_components/lib/src/components/layer.dart +++ b/packages/pinball_components/lib/src/components/layer.dart @@ -53,8 +53,8 @@ enum Layer { /// Collide only with ramps opening elements. opening, - /// Collide only with Jetpack group elements. - jetpack, + /// Collide only with Spaceship entrance ramp group elements. + spaceshipEntranceRamp, /// Collide only with Launcher group elements. launcher, @@ -86,7 +86,7 @@ extension LayerMaskBits on Layer { return 0x0001; case Layer.opening: return 0x0007; - case Layer.jetpack: + case Layer.spaceshipEntranceRamp: return 0x0002; case Layer.launcher: return 0x0005; diff --git a/packages/pinball_components/lib/src/components/spaceship.dart b/packages/pinball_components/lib/src/components/spaceship.dart index 588c0e33..d9f50653 100644 --- a/packages/pinball_components/lib/src/components/spaceship.dart +++ b/packages/pinball_components/lib/src/components/spaceship.dart @@ -37,7 +37,7 @@ class Spaceship extends Forge2DBlueprint { AndroidHead()..initialPosition = position, SpaceshipHole( outsideLayer: Layer.spaceshipExitRail, - outsidePriority: 2, + outsidePriority: SpaceshipRail.ballPriorityWhenOnSpaceshipRail, )..initialPosition = position - Vector2(5.2, 4.8), SpaceshipHole()..initialPosition = position - Vector2(-7.2, 0.8), SpaceshipWall()..initialPosition = position, diff --git a/lib/game/components/spaceship_exit_rail.dart b/packages/pinball_components/lib/src/components/spaceship_rail.dart similarity index 73% rename from lib/game/components/spaceship_exit_rail.dart rename to packages/pinball_components/lib/src/components/spaceship_rail.dart index e4be9b31..c881e8b3 100644 --- a/lib/game/components/spaceship_exit_rail.dart +++ b/packages/pinball_components/lib/src/components/spaceship_rail.dart @@ -4,30 +4,30 @@ import 'dart:math' as math; import 'package:flame/components.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:pinball/gen/assets.gen.dart'; +import 'package:pinball_components/gen/assets.gen.dart'; import 'package:pinball_components/pinball_components.dart' hide Assets; -/// {@template spaceship_exit_rail} +/// {@template spaceship_rail} /// A [Blueprint] for the spaceship drop tube. /// {@endtemplate} -class SpaceshipExitRail extends Forge2DBlueprint { - /// {@macro spaceship_exit_rail} - SpaceshipExitRail(); +class SpaceshipRail extends Forge2DBlueprint { + /// {@macro spaceship_rail} + SpaceshipRail(); - /// Base priority for wall while be on jetpack ramp. - static const ballPriorityWhenOnSpaceshipExitRail = 2; + /// Base priority for ball while be in [_SpaceshipRailRamp]. + static const ballPriorityWhenOnSpaceshipRail = 2; @override void build(_) { addAllContactCallback([ - SpaceshipExitRailEndBallContactCallback(), + SpaceshipRailExitBallContactCallback(), ]); - final exitRailRamp = _SpaceshipExitRailRamp(); - final exitRailEnd = SpaceshipExitRailEnd(); - final topBase = _SpaceshipExitRailBase(radius: 0.55) + final exitRailRamp = _SpaceshipRailRamp(); + final exitRailEnd = SpaceshipRailExit(); + final topBase = _SpaceshipRailBase(radius: 0.55) ..initialPosition = Vector2(-26.15, 18.65); - final bottomBase = _SpaceshipExitRailBase(radius: 0.8) + final bottomBase = _SpaceshipRailBase(radius: 0.8) ..initialPosition = Vector2(-25.5, -12.9); addAll([ @@ -39,11 +39,11 @@ class SpaceshipExitRail extends Forge2DBlueprint { } } -class _SpaceshipExitRailRamp extends BodyComponent - with InitialPosition, Layered { - _SpaceshipExitRailRamp() +/// Represents the spaceship drop rail from the [Spaceship]. +class _SpaceshipRailRamp extends BodyComponent with InitialPosition, Layered { + _SpaceshipRailRamp() : super( - priority: SpaceshipExitRail.ballPriorityWhenOnSpaceshipExitRail - 1, + priority: SpaceshipRail.ballPriorityWhenOnSpaceshipRail - 1, ) { renderBody = false; layer = Layer.spaceshipExitRail; @@ -73,7 +73,7 @@ class _SpaceshipExitRailRamp extends BodyComponent final middleLeftCurveShape = BezierCurveShape( controlPoints: [ - Vector2(-30.93, 18.2), + topLeftCurveShape.vertices.last, Vector2(-22.6, 10.3), Vector2(-30, 0.2), ], @@ -83,7 +83,7 @@ class _SpaceshipExitRailRamp extends BodyComponent final bottomLeftCurveShape = BezierCurveShape( controlPoints: [ - Vector2(-30, 0.2), + middleLeftCurveShape.vertices.last, Vector2(-36, -8.6), Vector2(-32.04, -18.3), ], @@ -101,7 +101,7 @@ class _SpaceshipExitRailRamp extends BodyComponent final middleRightCurveShape = BezierCurveShape( controlPoints: [ - Vector2(-27.2, 21.3), + topRightStraightShape.vertex1, Vector2(-16.5, 11.4), Vector2(-25.29, -1.7), ], @@ -111,7 +111,7 @@ class _SpaceshipExitRailRamp extends BodyComponent final bottomRightCurveShape = BezierCurveShape( controlPoints: [ - Vector2(-25.29, -1.7), + middleRightCurveShape.vertices.last, Vector2(-29.91, -8.5), Vector2(-26.8, -15.7), ], @@ -142,7 +142,7 @@ class _SpaceshipExitRailRamp extends BodyComponent Future _loadSprite() async { final sprite = await gameRef.loadSprite( - Assets.images.components.spaceshipDropTube.path, + Assets.images.spaceshipRamp.spaceshipDropTube.keyName, ); final spriteComponent = SpriteComponent( sprite: sprite, @@ -155,11 +155,11 @@ class _SpaceshipExitRailRamp extends BodyComponent } } -class _SpaceshipExitRailBase extends BodyComponent - with InitialPosition, Layered { - _SpaceshipExitRailBase({required this.radius}) +/// Represents the ground bases of the [_SpaceshipRailRamp]. +class _SpaceshipRailBase extends BodyComponent with InitialPosition, Layered { + _SpaceshipRailBase({required this.radius}) : super( - priority: SpaceshipExitRail.ballPriorityWhenOnSpaceshipExitRail + 1, + priority: SpaceshipRail.ballPriorityWhenOnSpaceshipRail + 1, ) { renderBody = false; layer = Layer.board; @@ -181,13 +181,13 @@ class _SpaceshipExitRailBase extends BodyComponent } } -/// {@template spaceship_exit_rail_end} +/// {@template spaceship_rail_exit} /// A sensor [BodyComponent] responsible for sending the [Ball] /// back to the board. /// {@endtemplate} -class SpaceshipExitRailEnd extends RampOpening { - /// {@macro spaceship_exit_rail_end} - SpaceshipExitRailEnd() +class SpaceshipRailExit extends RampOpening { + /// {@macro spaceship_rail_exit} + SpaceshipRailExit() : super( insideLayer: Layer.spaceshipExitRail, orientation: RampOrientation.down, @@ -209,14 +209,14 @@ class SpaceshipExitRailEnd extends RampOpening { } /// [ContactCallback] that handles the contact between the [Ball] -/// and a [SpaceshipExitRailEnd]. +/// and a [SpaceshipRailExit]. /// /// It resets the [Ball] priority and filter data so it will "be back" on the /// board. -class SpaceshipExitRailEndBallContactCallback - extends ContactCallback { +class SpaceshipRailExitBallContactCallback + extends ContactCallback { @override - void begin(SpaceshipExitRailEnd exitRail, Ball ball, _) { + void begin(SpaceshipRailExit exitRail, Ball ball, _) { ball ..sendTo(exitRail.outsidePriority) ..layer = exitRail.outsideLayer; diff --git a/lib/game/components/jetpack_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_ramp.dart similarity index 70% rename from lib/game/components/jetpack_ramp.dart rename to packages/pinball_components/lib/src/components/spaceship_ramp.dart index 34b00dd4..db9dbe85 100644 --- a/lib/game/components/jetpack_ramp.dart +++ b/packages/pinball_components/lib/src/components/spaceship_ramp.dart @@ -1,63 +1,66 @@ -// ignore_for_file: public_member_api_docs, avoid_renaming_method_parameters +// ignore_for_file: avoid_renaming_method_parameters, comment_references import 'dart:math' as math; import 'package:flame/components.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:pinball/game/game.dart'; -import 'package:pinball/gen/assets.gen.dart'; +import 'package:pinball_components/gen/assets.gen.dart'; import 'package:pinball_components/pinball_components.dart' hide Assets; -/// A [Blueprint] which creates the [JetpackRamp]. -class Jetpack extends Forge2DBlueprint { - /// {@macro spaceship} - Jetpack(); +/// {@template spaceship_ramp} +/// A [Blueprint] which creates the [_SpaceshipRampBackground]. +/// {@endtemplate} +class SpaceshipRamp extends Forge2DBlueprint { + /// {@macro spaceship_ramp} + SpaceshipRamp(); + /// Base priority for wall while be in the ramp. static const int ballPriorityInsideRamp = 4; @override void build(_) { addAllContactCallback([ - RampOpeningBallContactCallback<_JetpackRampOpening>(), + RampOpeningBallContactCallback<_SpaceshipRampOpening>(), ]); - final rightOpening = _JetpackRampOpening( + final rightOpening = _SpaceshipRampOpening( // TODO(ruimiguel): set Board priority when defined. outsidePriority: 1, rotation: math.pi, ) ..initialPosition = Vector2(1.7, 19) ..layer = Layer.opening; - final leftOpening = _JetpackRampOpening( + final leftOpening = _SpaceshipRampOpening( outsideLayer: Layer.spaceship, outsidePriority: Spaceship.ballPriorityWhenOnSpaceship, rotation: math.pi, ) ..initialPosition = Vector2(-13.7, 19) - ..layer = Layer.jetpack; + ..layer = Layer.spaceshipEntranceRamp; - final jetpackRamp = JetpackRamp(); + final spaceshipRamp = _SpaceshipRampBackground(); - final jetpackRampWallFg = _JetpackRampForegroundRailing(); + final spaceshipRampForegroundRailing = _SpaceshipRampForegroundRailing(); - final baseRight = _JetpackBase()..initialPosition = Vector2(1.7, 20); + final baseRight = _SpaceshipRampBase()..initialPosition = Vector2(1.7, 20); addAll([ rightOpening, leftOpening, baseRight, - jetpackRamp, - jetpackRampWallFg, + spaceshipRamp, + spaceshipRampForegroundRailing, ]); } } -/// {@template jetpack_ramp} -/// Represents the upper left blue ramp of the [Board]. -/// {@endtemplate} -class JetpackRamp extends BodyComponent with InitialPosition, Layered { - JetpackRamp() : super(priority: Jetpack.ballPriorityInsideRamp - 1) { - layer = Layer.jetpack; +/// Represents the upper left blue ramp of the [Board] with its background +/// railing. +class _SpaceshipRampBackground extends BodyComponent + with InitialPosition, Layered { + _SpaceshipRampBackground() + : super(priority: SpaceshipRamp.ballPriorityInsideRamp - 1) { + layer = Layer.spaceshipEntranceRamp; } /// Width between walls of the ramp. @@ -113,7 +116,7 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered { Future _loadSprites() async { final spriteRamp = await gameRef.loadSprite( - Assets.images.components.spaceshipRamp.path, + Assets.images.spaceshipRamp.spaceshipRamp.keyName, ); final spriteRampComponent = SpriteComponent( @@ -124,7 +127,7 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered { ); final spriteRailingBg = await gameRef.loadSprite( - Assets.images.components.spaceshipRailingBg.path, + Assets.images.spaceshipRamp.spaceshipRailingBg.keyName, ); final spriteRailingBgComponent = SpriteComponent( sprite: spriteRailingBg, @@ -140,11 +143,12 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered { } } -class _JetpackRampForegroundRailing extends BodyComponent +/// Represents the foreground of the railing upper left blue ramp. +class _SpaceshipRampForegroundRailing extends BodyComponent with InitialPosition, Layered { - _JetpackRampForegroundRailing() - : super(priority: Jetpack.ballPriorityInsideRamp + 1) { - layer = Layer.jetpack; + _SpaceshipRampForegroundRailing() + : super(priority: SpaceshipRamp.ballPriorityInsideRamp + 1) { + layer = Layer.spaceshipEntranceRamp; } List _createFixtureDefs() { @@ -197,7 +201,7 @@ class _JetpackRampForegroundRailing extends BodyComponent Future _loadSprites() async { final spriteRailingFg = await gameRef.loadSprite( - Assets.images.components.spaceshipRailingFg.path, + Assets.images.spaceshipRamp.spaceshipRailingFg.keyName, ); final spriteRailingFgComponent = SpriteComponent( sprite: spriteRailingFg, @@ -210,8 +214,9 @@ class _JetpackRampForegroundRailing extends BodyComponent } } -class _JetpackBase extends BodyComponent with InitialPosition, Layered { - _JetpackBase() { +/// Represents the ground right base of the [SpaceshipRamp]. +class _SpaceshipRampBase extends BodyComponent with InitialPosition, Layered { + _SpaceshipRampBase() { layer = Layer.board; } @@ -240,28 +245,28 @@ class _JetpackBase extends BodyComponent with InitialPosition, Layered { } } -/// {@template jetpack_ramp_opening} -/// [RampOpening] with [Layer.jetpack] to filter [Ball] collisions -/// inside [JetpackRamp]. +/// {@template spaceship_ramp_opening} +/// [RampOpening] with [Layer.spaceshipEntranceRamp] to filter [Ball] collisions +/// inside [_SpaceshipRampBackground]. /// {@endtemplate} -class _JetpackRampOpening extends RampOpening { - /// {@macro jetpack_ramp_opening} - _JetpackRampOpening({ +class _SpaceshipRampOpening extends RampOpening { + /// {@macro spaceship_ramp_opening} + _SpaceshipRampOpening({ Layer? outsideLayer, int? outsidePriority, required double rotation, }) : _rotation = rotation, super( - insideLayer: Layer.jetpack, + insideLayer: Layer.spaceshipEntranceRamp, outsideLayer: outsideLayer, orientation: RampOrientation.down, - insidePriority: Jetpack.ballPriorityInsideRamp, + insidePriority: SpaceshipRamp.ballPriorityInsideRamp, outsidePriority: outsidePriority, ); final double _rotation; - static final Vector2 _size = Vector2(JetpackRamp.width / 4, .1); + static final Vector2 _size = Vector2(_SpaceshipRampBackground.width / 4, .1); @override Shape get shape { diff --git a/packages/pinball_components/pubspec.yaml b/packages/pinball_components/pubspec.yaml index 8fc9c6f8..db3347cb 100644 --- a/packages/pinball_components/pubspec.yaml +++ b/packages/pinball_components/pubspec.yaml @@ -32,6 +32,7 @@ flutter: - assets/images/dash_bumper/a/ - assets/images/dash_bumper/b/ - assets/images/dash_bumper/main/ + - assets/images/spaceship_ramp/ flutter_gen: line_length: 80 diff --git a/packages/pinball_components/sandbox/lib/stories/layer/basic.dart b/packages/pinball_components/sandbox/lib/stories/layer/basic.dart index ccbd67d9..f6993471 100644 --- a/packages/pinball_components/sandbox/lib/stories/layer/basic.dart +++ b/packages/pinball_components/sandbox/lib/stories/layer/basic.dart @@ -35,7 +35,7 @@ class BigSquare extends BodyComponent with InitialPosition, Layered { paint = Paint() ..color = const Color.fromARGB(255, 8, 218, 241) ..style = PaintingStyle.stroke; - layer = Layer.jetpack; + layer = Layer.spaceshipEntranceRamp; } @override diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship/basic.dart b/packages/pinball_components/sandbox/lib/stories/spaceship/basic.dart index 6f33f444..0cfb4b5f 100644 --- a/packages/pinball_components/sandbox/lib/stories/spaceship/basic.dart +++ b/packages/pinball_components/sandbox/lib/stories/spaceship/basic.dart @@ -25,7 +25,7 @@ class BasicSpaceship extends BasicGame with TapDetector { add( Ball(baseColor: Colors.blue) ..initialPosition = info.eventPosition.game - ..layer = Layer.jetpack, + ..layer = Layer.spaceshipEntranceRamp, ); } } diff --git a/packages/pinball_components/test/helpers/mocks.dart b/packages/pinball_components/test/helpers/mocks.dart index 7771d1e1..21d5d01a 100644 --- a/packages/pinball_components/test/helpers/mocks.dart +++ b/packages/pinball_components/test/helpers/mocks.dart @@ -17,6 +17,8 @@ class MockSpaceshipEntrance extends Mock implements SpaceshipEntrance {} class MockSpaceshipHole extends Mock implements SpaceshipHole {} +class MockSpaceshipRailExit extends Mock implements SpaceshipRailExit {} + class MockContact extends Mock implements Contact {} class MockContactCallback extends Mock diff --git a/packages/pinball_components/test/src/components/layer_test.dart b/packages/pinball_components/test/src/components/layer_test.dart index 537e01b6..f2372c45 100644 --- a/packages/pinball_components/test/src/components/layer_test.dart +++ b/packages/pinball_components/test/src/components/layer_test.dart @@ -46,14 +46,15 @@ void main() { }); test('correctly sets and gets', () { - final component = TestLayeredBodyComponent()..layer = Layer.jetpack; - expect(component.layer, Layer.jetpack); + final component = TestLayeredBodyComponent() + ..layer = Layer.spaceshipEntranceRamp; + expect(component.layer, Layer.spaceshipEntranceRamp); }); flameTester.test( 'layers correctly before being loaded', (game) async { - const expectedLayer = Layer.jetpack; + const expectedLayer = Layer.spaceshipEntranceRamp; final component = TestLayeredBodyComponent()..layer = expectedLayer; await game.ensureAdd(component); // TODO(alestiago): modify once component.loaded is available. @@ -71,7 +72,8 @@ void main() { 'when multiple different sets', (game) async { const expectedLayer = Layer.launcher; - final component = TestLayeredBodyComponent()..layer = Layer.jetpack; + final component = TestLayeredBodyComponent() + ..layer = Layer.spaceshipEntranceRamp; expect(component.layer, isNot(equals(expectedLayer))); component.layer = expectedLayer; @@ -90,7 +92,7 @@ void main() { flameTester.test( 'layers correctly after being loaded', (game) async { - const expectedLayer = Layer.jetpack; + const expectedLayer = Layer.spaceshipEntranceRamp; final component = TestLayeredBodyComponent(); await game.ensureAdd(component); component.layer = expectedLayer; @@ -109,7 +111,7 @@ void main() { final component = TestLayeredBodyComponent(); await game.ensureAdd(component); - component.layer = Layer.jetpack; + component.layer = Layer.spaceshipEntranceRamp; expect(component.layer, isNot(equals(expectedLayer))); component.layer = expectedLayer; @@ -133,7 +135,7 @@ void main() { flameTester.test( 'nested Layered children will keep their layer', (game) async { - const parentLayer = Layer.jetpack; + const parentLayer = Layer.spaceshipEntranceRamp; const childLayer = Layer.board; final component = TestLayeredBodyComponent()..layer = parentLayer; @@ -152,7 +154,7 @@ void main() { flameTester.test( 'nested children will keep their layer', (game) async { - const parentLayer = Layer.jetpack; + const parentLayer = Layer.spaceshipEntranceRamp; final component = TestLayeredBodyComponent()..layer = parentLayer; final childComponent = TestBodyComponent(); diff --git a/packages/pinball_components/test/src/components/ramp_opening_test.dart b/packages/pinball_components/test/src/components/ramp_opening_test.dart index cb42203a..46e56e3d 100644 --- a/packages/pinball_components/test/src/components/ramp_opening_test.dart +++ b/packages/pinball_components/test/src/components/ramp_opening_test.dart @@ -44,7 +44,7 @@ void main() { (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, ); await game.ready(); await game.ensureAdd(ramp); @@ -59,7 +59,7 @@ void main() { (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, ); await game.ensureAdd(ramp); @@ -68,7 +68,7 @@ void main() { ); group('first fixture', () { - const pathwayLayer = Layer.jetpack; + const pathwayLayer = Layer.spaceshipEntranceRamp; const openingLayer = Layer.opening; flameTester.test( @@ -124,7 +124,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.down, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, ); final callback = TestRampOpeningBallContactCallback(); @@ -145,7 +145,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.up, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, ); final callback = TestRampOpeningBallContactCallback(); @@ -165,7 +165,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.down, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, )..initialPosition = Vector2(0, 10); final callback = TestRampOpeningBallContactCallback(); @@ -189,7 +189,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.up, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, )..initialPosition = Vector2(0, 10); final callback = TestRampOpeningBallContactCallback(); @@ -213,7 +213,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.down, - pathwayLayer: Layer.jetpack, + pathwayLayer: Layer.spaceshipEntranceRamp, )..initialPosition = Vector2(0, 10); final callback = TestRampOpeningBallContactCallback(); diff --git a/packages/pinball_components/test/src/components/spaceship_rail_test.dart b/packages/pinball_components/test/src/components/spaceship_rail_test.dart new file mode 100644 index 00000000..6c5410b1 --- /dev/null +++ b/packages/pinball_components/test/src/components/spaceship_rail_test.dart @@ -0,0 +1,82 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball_components/pinball_components.dart'; + +import '../../helpers/helpers.dart'; + +void main() { + group('SpaceshipRail', () { + TestWidgetsFlutterBinding.ensureInitialized(); + final flameTester = FlameTester(TestGame.new); + + flameTester.test( + 'loads correctly', + (game) async { + final spaceshipRail = SpaceshipRail(); + await game.addFromBlueprint(spaceshipRail); + await game.ready(); + + for (final element in spaceshipRail.components) { + expect(game.contains(element), isTrue); + } + }, + ); + }); + + // TODO(alestiago): Make ContactCallback private and use `beginContact` + // instead. + group('SpaceshipRailExitBallContactCallback', () { + late Forge2DGame game; + late SpaceshipRailExit railExit; + late Ball ball; + late Body body; + late Fixture fixture; + late Filter filterData; + + setUp(() { + game = MockGame(); + + railExit = MockSpaceshipRailExit(); + + ball = MockBall(); + body = MockBody(); + when(() => ball.gameRef).thenReturn(game); + when(() => ball.body).thenReturn(body); + + fixture = MockFixture(); + filterData = MockFilter(); + when(() => body.fixtures).thenReturn([fixture]); + when(() => fixture.filterData).thenReturn(filterData); + }); + + setUp(() { + when(() => ball.priority).thenReturn(1); + when(() => railExit.outsideLayer).thenReturn(Layer.board); + when(() => railExit.outsidePriority).thenReturn(0); + }); + + test('changes the ball priority on contact', () { + SpaceshipRailExitBallContactCallback().begin( + railExit, + ball, + MockContact(), + ); + + verify(() => ball.sendTo(railExit.outsidePriority)).called(1); + }); + + test('changes the ball layer on contact', () { + SpaceshipRailExitBallContactCallback().begin( + railExit, + ball, + MockContact(), + ); + + verify(() => ball.layer = railExit.outsideLayer).called(1); + }); + }); +} diff --git a/packages/pinball_components/test/src/components/spaceship_ramp_test.dart b/packages/pinball_components/test/src/components/spaceship_ramp_test.dart new file mode 100644 index 00000000..4d124596 --- /dev/null +++ b/packages/pinball_components/test/src/components/spaceship_ramp_test.dart @@ -0,0 +1,27 @@ +// ignore_for_file: cascade_invocations + +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() { + group('SpaceshipRamp', () { + TestWidgetsFlutterBinding.ensureInitialized(); + final flameTester = FlameTester(TestGame.new); + + flameTester.test( + 'loads correctly', + (game) async { + final spaceshipEntranceRamp = SpaceshipRamp(); + await game.addFromBlueprint(spaceshipEntranceRamp); + await game.ready(); + + for (final element in spaceshipEntranceRamp.components) { + expect(game.contains(element), isTrue); + } + }, + ); + }); +} diff --git a/test/game/components/spaceship_exit_rail_test.dart b/test/game/components/spaceship_exit_rail_test.dart deleted file mode 100644 index edd81aab..00000000 --- a/test/game/components/spaceship_exit_rail_test.dart +++ /dev/null @@ -1,64 +0,0 @@ -import 'package:flame_forge2d/flame_forge2d.dart'; -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 '../../helpers/helpers.dart'; - -void main() { - group('SpaceshipExitRail', () { - late PinballGame game; - late SpaceshipExitRailEnd exitRailEnd; - late Ball ball; - late Body body; - late Fixture fixture; - late Filter filterData; - - setUp(() { - game = MockPinballGame(); - - exitRailEnd = MockSpaceshipExitRailEnd(); - - ball = MockBall(); - body = MockBody(); - when(() => ball.gameRef).thenReturn(game); - when(() => ball.body).thenReturn(body); - - fixture = MockFixture(); - filterData = MockFilter(); - when(() => body.fixtures).thenReturn([fixture]); - when(() => fixture.filterData).thenReturn(filterData); - }); - - // TODO(alestiago): Make ContactCallback private and use `beginContact` - // instead. - group('SpaceshipExitHoleBallContactCallback', () { - setUp(() { - when(() => ball.priority).thenReturn(1); - when(() => exitRailEnd.outsideLayer).thenReturn(Layer.board); - when(() => exitRailEnd.outsidePriority).thenReturn(0); - }); - - test('changes the ball priority on contact', () { - SpaceshipExitRailEndBallContactCallback().begin( - exitRailEnd, - ball, - MockContact(), - ); - - verify(() => ball.sendTo(exitRailEnd.outsidePriority)).called(1); - }); - - test('changes the ball layer on contact', () { - SpaceshipExitRailEndBallContactCallback().begin( - exitRailEnd, - ball, - MockContact(), - ); - - verify(() => ball.layer = exitRailEnd.outsideLayer).called(1); - }); - }); - }); -} diff --git a/test/helpers/mocks.dart b/test/helpers/mocks.dart index fbe8edfb..f139bc7b 100644 --- a/test/helpers/mocks.dart +++ b/test/helpers/mocks.dart @@ -66,8 +66,6 @@ class MockFilter extends Mock implements Filter {} class MockFixture extends Mock implements Fixture {} -class MockSpaceshipExitRailEnd extends Mock implements SpaceshipExitRailEnd {} - class MockComponentSet extends Mock implements ComponentSet {} class MockDashNestBumper extends Mock implements DashNestBumper {}