refactor: renamed JetpackRamp to SpaceshipEntranceRamp

pull/129/head
RuiAlonso 4 years ago
parent 21cc04facc
commit d446be4566

@ -4,7 +4,7 @@ export 'chrome_dino.dart';
export 'controlled_ball.dart'; export 'controlled_ball.dart';
export 'controlled_flipper.dart'; export 'controlled_flipper.dart';
export 'flutter_forest.dart'; export 'flutter_forest.dart';
export 'jetpack_ramp.dart'; export 'spaceship_entrance_ramp.dart';
export 'kicker.dart'; export 'kicker.dart';
export 'launcher_ramp.dart'; export 'launcher_ramp.dart';
export 'plunger.dart'; export 'plunger.dart';

@ -8,56 +8,59 @@ import 'package:pinball/game/game.dart';
import 'package:pinball/gen/assets.gen.dart'; import 'package:pinball/gen/assets.gen.dart';
import 'package:pinball_components/pinball_components.dart' hide Assets; import 'package:pinball_components/pinball_components.dart' hide Assets;
/// A [Blueprint] which creates the [JetpackRamp]. /// {@template spaceship_entrance_ramp}
class Jetpack extends Forge2DBlueprint { /// A [Blueprint] which creates the [SpaceshipRamp].
/// {@macro spaceship} /// {@endtemplate}
Jetpack(); class SpaceshipEntranceRamp extends Forge2DBlueprint {
/// {@macro spaceship_entrance_ramp}
SpaceshipEntranceRamp();
static const int ballPriorityInsideRamp = 4; static const int ballPriorityInsideRamp = 4;
@override @override
void build(_) { void build(_) {
addAllContactCallback([ addAllContactCallback([
RampOpeningBallContactCallback<_JetpackRampOpening>(), RampOpeningBallContactCallback<_SpaceshipRampOpening>(),
]); ]);
final rightOpening = _JetpackRampOpening( final rightOpening = _SpaceshipRampOpening(
// TODO(ruimiguel): set Board priority when defined. // TODO(ruimiguel): set Board priority when defined.
outsidePriority: 1, outsidePriority: 1,
rotation: math.pi, rotation: math.pi,
) )
..initialPosition = Vector2(1.7, 19) ..initialPosition = Vector2(1.7, 19)
..layer = Layer.opening; ..layer = Layer.opening;
final leftOpening = _JetpackRampOpening( final leftOpening = _SpaceshipRampOpening(
outsideLayer: Layer.spaceship, outsideLayer: Layer.spaceship,
outsidePriority: Spaceship.ballPriorityWhenOnSpaceship, outsidePriority: Spaceship.ballPriorityWhenOnSpaceship,
rotation: math.pi, rotation: math.pi,
) )
..initialPosition = Vector2(-13.7, 19) ..initialPosition = Vector2(-13.7, 19)
..layer = Layer.jetpack; ..layer = Layer.spaceshipEntranceRamp;
final jetpackRamp = JetpackRamp(); final spaceshipRamp = _SpaceshipRamp();
final jetpackRampWallFg = _JetpackRampForegroundRailing(); final spaceshipRampForegroundRailing = _SpaceshipRampForegroundRailing();
final baseRight = _JetpackBase()..initialPosition = Vector2(1.7, 20); final baseRight = _SpaceshipRampBase()..initialPosition = Vector2(1.7, 20);
addAll([ addAll([
rightOpening, rightOpening,
leftOpening, leftOpening,
baseRight, baseRight,
jetpackRamp, spaceshipRamp,
jetpackRampWallFg, spaceshipRampForegroundRailing,
]); ]);
} }
} }
/// {@template jetpack_ramp} /// {@template spaceship_ramp}
/// Represents the upper left blue ramp of the [Board]. /// Represents the upper left blue ramp of the [Board].
/// {@endtemplate} /// {@endtemplate}
class JetpackRamp extends BodyComponent with InitialPosition, Layered { class _SpaceshipRamp extends BodyComponent with InitialPosition, Layered {
JetpackRamp() : super(priority: Jetpack.ballPriorityInsideRamp - 1) { _SpaceshipRamp()
layer = Layer.jetpack; : super(priority: SpaceshipEntranceRamp.ballPriorityInsideRamp - 1) {
layer = Layer.spaceshipEntranceRamp;
} }
/// Width between walls of the ramp. /// Width between walls of the ramp.
@ -140,11 +143,11 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered {
} }
} }
class _JetpackRampForegroundRailing extends BodyComponent class _SpaceshipRampForegroundRailing extends BodyComponent
with InitialPosition, Layered { with InitialPosition, Layered {
_JetpackRampForegroundRailing() _SpaceshipRampForegroundRailing()
: super(priority: Jetpack.ballPriorityInsideRamp + 1) { : super(priority: SpaceshipEntranceRamp.ballPriorityInsideRamp + 1) {
layer = Layer.jetpack; layer = Layer.spaceshipEntranceRamp;
} }
List<FixtureDef> _createFixtureDefs() { List<FixtureDef> _createFixtureDefs() {
@ -210,8 +213,8 @@ class _JetpackRampForegroundRailing extends BodyComponent
} }
} }
class _JetpackBase extends BodyComponent with InitialPosition, Layered { class _SpaceshipRampBase extends BodyComponent with InitialPosition, Layered {
_JetpackBase() { _SpaceshipRampBase() {
layer = Layer.board; layer = Layer.board;
} }
@ -240,28 +243,28 @@ class _JetpackBase extends BodyComponent with InitialPosition, Layered {
} }
} }
/// {@template jetpack_ramp_opening} /// {@template spaceship_ramp_opening}
/// [RampOpening] with [Layer.jetpack] to filter [Ball] collisions /// [RampOpening] with [Layer.spaceshipEntranceRamp] to filter [Ball] collisions
/// inside [JetpackRamp]. /// inside [_SpaceshipRamp].
/// {@endtemplate} /// {@endtemplate}
class _JetpackRampOpening extends RampOpening { class _SpaceshipRampOpening extends RampOpening {
/// {@macro jetpack_ramp_opening} /// {@macro spaceship_ramp_opening}
_JetpackRampOpening({ _SpaceshipRampOpening({
Layer? outsideLayer, Layer? outsideLayer,
int? outsidePriority, int? outsidePriority,
required double rotation, required double rotation,
}) : _rotation = rotation, }) : _rotation = rotation,
super( super(
insideLayer: Layer.jetpack, insideLayer: Layer.spaceshipEntranceRamp,
outsideLayer: outsideLayer, outsideLayer: outsideLayer,
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: Jetpack.ballPriorityInsideRamp, insidePriority: SpaceshipEntranceRamp.ballPriorityInsideRamp,
outsidePriority: outsidePriority, outsidePriority: outsidePriority,
); );
final double _rotation; final double _rotation;
static final Vector2 _size = Vector2(JetpackRamp.width / 4, .1); static final Vector2 _size = Vector2(_SpaceshipRamp.width / 4, .1);
@override @override
Shape get shape { Shape get shape {

@ -14,7 +14,7 @@ class SpaceshipExitRail extends Forge2DBlueprint {
/// {@macro spaceship_exit_rail} /// {@macro spaceship_exit_rail}
SpaceshipExitRail(); SpaceshipExitRail();
/// Base priority for wall while be on jetpack ramp. /// Base priority for wall while be on [_SpaceshipExitRailRamp].
static const ballPriorityWhenOnSpaceshipExitRail = 2; static const ballPriorityWhenOnSpaceshipExitRail = 2;
@override @override

@ -93,7 +93,7 @@ class PinballGame extends Forge2DGame
Future<void> _addPaths() async { Future<void> _addPaths() async {
unawaited( unawaited(
addFromBlueprint(Jetpack()), addFromBlueprint(SpaceshipEntranceRamp()),
); );
unawaited(addFromBlueprint(Launcher())); unawaited(addFromBlueprint(Launcher()));
} }

Loading…
Cancel
Save