refactor: placed curve for spaceship exit rail

lib/game/components/jetpack_ramp.dart

@@ -115,7 +115,7 @@ class _JetpackRampOpening extends RampOpening {
 
   final double _rotation;
 
-  static final Vector2 _size = Vector2(JetpackRamp.width / 3, .1);
+  static final Vector2 _size = Vector2(JetpackRamp.width / 4, .1);
 
   @override
   Shape get shape => PolygonShape()

lib/game/components/spaceship.dart

@@ -48,7 +48,7 @@ class Spaceship extends Forge2DBlueprint {
 class SpaceshipSaucer extends BodyComponent with InitialPosition, Layered {
   /// {@macro spaceship_saucer}
   // TODO(ruimiguel): apply Elevated when PR merged.
-  SpaceshipSaucer() : super(priority: 2) {
+  SpaceshipSaucer() : super(priority: 3) {
     layer = Layer.spaceship;
   }
 
@@ -139,7 +139,7 @@ class SpaceshipBridgeTop extends BodyComponent with InitialPosition {
 class SpaceshipBridge extends BodyComponent with InitialPosition, Layered {
   /// {@macro spaceship_bridge}
   // TODO(ruimiguel): apply Elevated when PR merged.
-  SpaceshipBridge() : super(priority: 3) {
+  SpaceshipBridge() : super(priority: 4) {
     layer = Layer.spaceship;
   }
 
@@ -199,7 +199,7 @@ class SpaceshipEntrance extends RampOpening {
 
   /// Priority order for [SpaceshipHole] on enter.
   // TODO(ruimiguel): apply Elevated when PR merged.
-  final int onEnterElevation = 3;
+  final int onEnterElevation = 4;
 
   @override
   Shape get shape {

lib/game/components/spaceship_exit_rail.dart

@@ -6,68 +6,170 @@ import 'dart:ui';
 import 'package:flame_forge2d/flame_forge2d.dart';
 import 'package:pinball/flame/blueprint.dart';
 import 'package:pinball/game/game.dart';
+import 'package:pinball_components/pinball_components.dart';
 
 /// A [Blueprint] for the spaceship exit rail.
 class SpaceshipExitRail extends Forge2DBlueprint {
   @override
-  void build() {
+  void build(_) {
     final position = Vector2(
-      PinballGame.boardBounds.left + 22,
+      PinballGame.boardBounds.left + 17.5,
-      PinballGame.boardBounds.center.dy + 27,
+      PinballGame.boardBounds.center.dy + 26,
     );
 
     addAllContactCallback([
-      SpaceshipExitHoleBallContactCallback(),
+      SpaceshipExitRailEndBallContactCallback(),
     ]);
 
-    final pathway = Pathway.bezierCurve(
+    final spaceshipExitRailTopRamp = _SpaceshipExitRailTopRamp()
-      color: const Color.fromARGB(255, 226, 226, 218),
+      ..initialPosition = position;
-      width: 4,
+    final spaceshipExitRailBottomRamp = _SpaceshipExitRailBottomRamp()
-      rotation: 230 * math.pi / 180,
+      ..initialPosition = position + Vector2(2.5, -29.5);
+    final exitRail = SpaceshipExitRailEnd()
+      ..initialPosition = position + Vector2(7.5, -60);
+
+    addAll([
+      spaceshipExitRailTopRamp,
+      spaceshipExitRailBottomRamp,
+      exitRail,
+    ]);
+  }
+}
+
+/// {@template jetpack_ramp}
+/// Represents the upper left blue ramp of the [Board].
+/// {@endtemplate}
+class _SpaceshipExitRailTopRamp extends BodyComponent
+    with InitialPosition, Layered {
+  _SpaceshipExitRailTopRamp() : super(priority: 2) {
+    layer = Layer.spaceshipExitRail;
+    paint = Paint()
+      ..color = const Color.fromARGB(255, 185, 188, 189)
+      ..style = PaintingStyle.stroke;
+  }
+
+  /// Width between walls of the ramp.
+  static const width = 5.0;
+
+  List<FixtureDef> _createFixtureDefs() {
+    final fixturesDef = <FixtureDef>[];
+
+    final leftCurveShape = BezierCurveShape(
       controlPoints: [
         Vector2(0, 0),
-        Vector2(0, 30),
+        Vector2(15, 0),
+        Vector2(20, 10),
+        Vector2(30, 10),
+      ],
+    )..rotate(275 * math.pi / 180);
+    final leftFixtureDef = FixtureDef(leftCurveShape);
+    fixturesDef.add(leftFixtureDef);
+
+    final rightCurveShape = BezierCurveShape(
+      controlPoints: [
+        Vector2(0, 0 + width),
+        Vector2(15, 0 + width),
+        Vector2(20, 10 + width),
+        Vector2(30, 10 + width),
+      ],
+    )..rotate(275 * math.pi / 180);
+    final rightFixtureDef = FixtureDef(rightCurveShape);
+    fixturesDef.add(rightFixtureDef);
+
+    final entranceWall = ArcShape(
+      center: initialPosition + Vector2(35.7, -25.5),
+      arcRadius: width / 2,
+      angle: math.pi,
+      rotation: 170 * math.pi / 180,
+    );
+    final entranceFixtureDef = FixtureDef(entranceWall);
+    fixturesDef.add(entranceFixtureDef);
+
+    return fixturesDef;
+  }
+
+  @override
+  Body createBody() {
+    final bodyDef = BodyDef()
+      ..userData = this
+      ..position = initialPosition;
+
+    final body = world.createBody(bodyDef);
+    _createFixtureDefs().forEach(body.createFixture);
+
+    return body;
+  }
+}
+
+class _SpaceshipExitRailBottomRamp extends BodyComponent
+    with InitialPosition, Layered {
+  _SpaceshipExitRailBottomRamp() : super(priority: 2) {
+    layer = Layer.spaceshipExitRail;
+    paint = Paint()
+      ..color = const Color.fromARGB(255, 185, 188, 189)
+      ..style = PaintingStyle.stroke;
+  }
+
+  /// Width between walls of the ramp.
+  static const width = 5.0;
+
+  List<FixtureDef> _createFixtureDefs() {
+    final fixturesDef = <FixtureDef>[];
+
+    final leftCurveShape = BezierCurveShape(
+      controlPoints: [
+        Vector2(0, 10),
+        Vector2(15, 10),
+        Vector2(20, 0),
         Vector2(30, 0),
-        Vector2(30, 30),
       ],
-    )..layer = Layer.spaceshipExitRail;
+    )..rotate(275 * math.pi / 180);
-
+    final leftFixtureDef = FixtureDef(leftCurveShape);
-    final entrance = Pathway.arc(
+    fixturesDef.add(leftFixtureDef);
-      color: const Color.fromARGB(255, 226, 226, 218),
-      center: position,
-      radius: 4,
-      angle: math.pi / 2,
-      width: 5,
-      rotation: 218 * math.pi / 180,
-      singleWall: true,
-    )..layer = Layer.spaceshipExitRail;
-
-    final exit = Pathway.arc(
-      color: const Color.fromARGB(255, 226, 226, 218),
-      center: position,
-      radius: 4,
-      angle: math.pi / 2,
-      width: 5,
-      rotation: 36 * math.pi / 180,
-      singleWall: true,
-    )..layer = Layer.spaceshipExitRail;
 
-    addAll([
+    final rightCurveShape = BezierCurveShape(
-      pathway..initialPosition = position,
+      controlPoints: [
-      entrance..initialPosition = position + Vector2(26.5, -30),
+        Vector2(0, 10 + width),
-      exit..initialPosition = position + Vector2(29, -66.5),
+        Vector2(15, 10 + width),
-      SpaceshipExitHole()..initialPosition = position + Vector2(0, -42),
+        Vector2(20, 0 + width),
-    ]);
+        Vector2(30, 0 + width),
+      ],
+    )..rotate(275 * math.pi / 180);
+    final rightFixtureDef = FixtureDef(rightCurveShape);
+    fixturesDef.add(rightFixtureDef);
+
+    final exitWall = ArcShape(
+      center: initialPosition + Vector2(36, -26),
+      arcRadius: width / 2,
+      angle: math.pi,
+      rotation: 350 * math.pi / 180,
+    );
+    final exitFixtureDef = FixtureDef(exitWall);
+    fixturesDef.add(exitFixtureDef);
+
+    return fixturesDef;
+  }
+
+  @override
+  Body createBody() {
+    final bodyDef = BodyDef()
+      ..userData = this
+      ..position = initialPosition;
+
+    final body = world.createBody(bodyDef);
+    _createFixtureDefs().forEach(body.createFixture);
+
+    return body;
   }
 }
 
-/// {@template spaceship_exit_hole}
+/// {@template spaceship_exit_rail_end}
 /// A sensor [BodyComponent] responsible for sending the [Ball]
 /// back to the board.
 /// {@endtemplate}
-class SpaceshipExitHole extends RampOpening {
+class SpaceshipExitRailEnd extends RampOpening {
-  /// {@macro spaceship_exit_hole}
+  /// {@macro spaceship_exit_rail_end}
-  SpaceshipExitHole()
+  SpaceshipExitRailEnd()
       : super(
           pathwayLayer: Layer.spaceshipExitRail,
           orientation: RampOrientation.down,
@@ -82,17 +184,17 @@ class SpaceshipExitHole extends RampOpening {
 }
 
 /// [ContactCallback] that handles the contact between the [Ball]
-/// and a [SpaceshipExitHole].
+/// and a [SpaceshipExitRailEnd].
 ///
 /// It resets the [Ball] priority and filter data so it will "be back" on the
 /// board.
-class SpaceshipExitHoleBallContactCallback
+class SpaceshipExitRailEndBallContactCallback
-    extends ContactCallback<SpaceshipExitHole, Ball> {
+    extends ContactCallback<SpaceshipExitRailEnd, Ball> {
   @override
-  void begin(SpaceshipExitHole hole, Ball ball, _) {
+  void begin(SpaceshipExitRailEnd exitRail, Ball ball, _) {
     ball
       ..priority = 1
       ..gameRef.reorderChildren()
-      ..layer = hole.outsideLayer;
+      ..layer = exitRail.outsideLayer;
   }
 }

test/game/components/spaceship_exit_rail_test.dart

@@ -2,6 +2,7 @@ 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';
 
@@ -12,7 +13,7 @@ void main() {
     late Body body;
     late PinballGame game;
     late Ball ball;
-    late SpaceshipExitHole hole;
+    late SpaceshipExitRailEnd exitRailEnd;
 
     setUp(() {
       filterData = MockFilter();
@@ -29,15 +30,15 @@ void main() {
       when(() => ball.gameRef).thenReturn(game);
       when(() => ball.body).thenReturn(body);
 
-      hole = MockSpaceshipExitHole();
+      exitRailEnd = MockSpaceshipExitRailEnd();
     });
 
     group('SpaceshipExitHoleBallContactCallback', () {
       test('changes the ball priority on contact', () {
-        when(() => hole.outsideLayer).thenReturn(Layer.board);
+        when(() => exitRailEnd.outsideLayer).thenReturn(Layer.board);
 
-        SpaceshipExitHoleBallContactCallback().begin(
+        SpaceshipExitRailEndBallContactCallback().begin(
-          hole,
+          exitRailEnd,
           ball,
           MockContact(),
         );
@@ -46,10 +47,10 @@ void main() {
       });
 
       test('reorders the game children', () {
-        when(() => hole.outsideLayer).thenReturn(Layer.board);
+        when(() => exitRailEnd.outsideLayer).thenReturn(Layer.board);
 
-        SpaceshipExitHoleBallContactCallback().begin(
+        SpaceshipExitRailEndBallContactCallback().begin(
-          hole,
+          exitRailEnd,
           ball,
           MockContact(),
         );

test/helpers/mocks.dart

@@ -72,7 +72,7 @@ class MockSpaceshipEntrance extends Mock implements SpaceshipEntrance {}
 
 class MockSpaceshipHole extends Mock implements SpaceshipHole {}
 
-class MockSpaceshipExitHole extends Mock implements SpaceshipExitHole {}
+class MockSpaceshipExitRailEnd extends Mock implements SpaceshipExitRailEnd {}
 
 class MockComponentSet extends Mock implements ComponentSet {}