diff --git a/lib/game/components/board.dart b/lib/game/components/board.dart index 679a44c5..8ee4128f 100644 --- a/lib/game/components/board.dart +++ b/lib/game/components/board.dart @@ -42,7 +42,7 @@ class Board extends Component { // TODO(alestiago): Consider renaming once entire Board is defined. class _BottomGroup extends Component { /// {@macro bottom_group} - _BottomGroup() : super(priority: PinballPriority.bottomGroup); + _BottomGroup() : super(priority: RenderPriority.bottomGroup); @override Future onLoad() async { diff --git a/lib/game/components/controlled_ball.dart b/lib/game/components/controlled_ball.dart index 8c6e77fa..eeef58fa 100644 --- a/lib/game/components/controlled_ball.dart +++ b/lib/game/components/controlled_ball.dart @@ -18,7 +18,7 @@ class ControlledBall extends Ball with Controls { required PinballTheme theme, }) : super(baseColor: theme.characterTheme.ballColor) { controller = BallController(this); - priority = PinballPriority.ballOnLaunchRamp; + priority = RenderPriority.ballOnLaunchRamp; layer = Layer.launcher; } @@ -31,13 +31,13 @@ class ControlledBall extends Ball with Controls { required PinballTheme theme, }) : super(baseColor: theme.characterTheme.ballColor) { controller = BallController(this); - priority = PinballPriority.ballOnBoard; + priority = RenderPriority.ballOnBoard; } /// [Ball] used in [DebugPinballGame]. ControlledBall.debug() : super(baseColor: const Color(0xFFFF0000)) { controller = DebugBallController(this); - priority = PinballPriority.ballOnBoard; + priority = RenderPriority.ballOnBoard; } } diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index a42051b4..9c59f2f4 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -165,7 +165,7 @@ class DebugPinballGame extends PinballGame with TapDetector { anchor: Anchor.center, ) ..position = Vector2(0, -7.8) - ..priority = PinballPriority.background; + ..priority = RenderPriority.background; await add(spriteComponent); } diff --git a/packages/pinball_components/lib/src/components/alien_bumper.dart b/packages/pinball_components/lib/src/components/alien_bumper.dart index 4a9494fa..74c2f3bd 100644 --- a/packages/pinball_components/lib/src/components/alien_bumper.dart +++ b/packages/pinball_components/lib/src/components/alien_bumper.dart @@ -19,7 +19,7 @@ class AlienBumper extends BodyComponent with InitialPosition { _activeAssetPath = activeAssetPath, _inactiveAssetPath = inactiveAssetPath, _spriteComponent = spriteComponent, - super(priority: PinballPriority.alienBumper); + super(priority: RenderPriority.alienBumper); /// {@macro alien_bumper} AlienBumper.a() diff --git a/packages/pinball_components/lib/src/components/boundaries.dart b/packages/pinball_components/lib/src/components/boundaries.dart index a5a61f34..b7f2595f 100644 --- a/packages/pinball_components/lib/src/components/boundaries.dart +++ b/packages/pinball_components/lib/src/components/boundaries.dart @@ -23,7 +23,7 @@ class Boundaries extends Forge2DBlueprint { /// {@endtemplate bottom_boundary} class _BottomBoundary extends BodyComponent with InitialPosition { /// {@macro bottom_boundary} - _BottomBoundary() : super(priority: PinballPriority.bottomBoundary); + _BottomBoundary() : super(priority: RenderPriority.bottomBoundary); List _createFixtureDefs() { final fixturesDefs = []; @@ -88,7 +88,7 @@ class _BottomBoundarySpriteComponent extends SpriteComponent with HasGameRef { /// {@endtemplate outer_boundary} class _OuterBoundary extends BodyComponent with InitialPosition { /// {@macro outer_boundary} - _OuterBoundary() : super(priority: PinballPriority.outerBoudary); + _OuterBoundary() : super(priority: RenderPriority.outerBoudary); List _createFixtureDefs() { final fixturesDefs = []; diff --git a/packages/pinball_components/lib/src/components/chrome_dino.dart b/packages/pinball_components/lib/src/components/chrome_dino.dart index 1735c9bf..bea6d6da 100644 --- a/packages/pinball_components/lib/src/components/chrome_dino.dart +++ b/packages/pinball_components/lib/src/components/chrome_dino.dart @@ -16,7 +16,7 @@ class ChromeDino extends BodyComponent with InitialPosition { : super( // TODO(alestiago): Remove once sprites are defined. paint: Paint()..color = Colors.blue, - priority: PinballPriority.dino, + priority: RenderPriority.dino, ); /// The size of the dinosaur mouth. diff --git a/packages/pinball_components/lib/src/components/dash_animatronic.dart b/packages/pinball_components/lib/src/components/dash_animatronic.dart index 4e61c20f..bc66b184 100644 --- a/packages/pinball_components/lib/src/components/dash_animatronic.dart +++ b/packages/pinball_components/lib/src/components/dash_animatronic.dart @@ -10,7 +10,7 @@ class DashAnimatronic extends SpriteAnimationComponent with HasGameRef { : super( anchor: Anchor.center, playing: false, - priority: PinballPriority.dashAnimatronic, + priority: RenderPriority.dashAnimatronic, ); @override diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper.dart b/packages/pinball_components/lib/src/components/dash_nest_bumper.dart index 2114e52c..f14fff89 100644 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper.dart +++ b/packages/pinball_components/lib/src/components/dash_nest_bumper.dart @@ -16,7 +16,7 @@ abstract class DashNestBumper extends BodyComponent with InitialPosition { }) : _activeAssetPath = activeAssetPath, _inactiveAssetPath = inactiveAssetPath, _spriteComponent = spriteComponent, - super(priority: PinballPriority.dashBumper); + super(priority: RenderPriority.dashBumper); final String _activeAssetPath; late final Sprite _activeSprite; diff --git a/packages/pinball_components/lib/src/components/dino_walls.dart b/packages/pinball_components/lib/src/components/dino_walls.dart index 5f8758d9..287c429b 100644 --- a/packages/pinball_components/lib/src/components/dino_walls.dart +++ b/packages/pinball_components/lib/src/components/dino_walls.dart @@ -28,7 +28,7 @@ class DinoWalls extends Forge2DBlueprint { /// {@endtemplate} class _DinoTopWall extends BodyComponent with InitialPosition { ///{@macro dino_top_wall} - _DinoTopWall() : super(priority: PinballPriority.dinoTopWall); + _DinoTopWall() : super(priority: RenderPriority.dinoTopWall); List _createFixtureDefs() { final fixturesDef = []; @@ -124,7 +124,7 @@ class _DinoTopWallSpriteComponent extends SpriteComponent with HasGameRef { /// {@endtemplate} class _DinoBottomWall extends BodyComponent with InitialPosition { ///{@macro dino_top_wall} - _DinoBottomWall() : super(priority: PinballPriority.dinoBottomWall); + _DinoBottomWall() : super(priority: RenderPriority.dinoBottomWall); List _createFixtureDefs() { final fixturesDef = []; diff --git a/packages/pinball_components/lib/src/components/flutter_sign_post.dart b/packages/pinball_components/lib/src/components/flutter_sign_post.dart index 717eeec4..47e721a5 100644 --- a/packages/pinball_components/lib/src/components/flutter_sign_post.dart +++ b/packages/pinball_components/lib/src/components/flutter_sign_post.dart @@ -7,7 +7,7 @@ import 'package:pinball_components/pinball_components.dart'; /// {@endtemplate} class FlutterSignPost extends BodyComponent with InitialPosition { /// {@macro flutter_sign_post} - FlutterSignPost() : super(priority: PinballPriority.flutterSignPost); + FlutterSignPost() : super(priority: RenderPriority.flutterSignPost); @override Future onLoad() async { diff --git a/packages/pinball_components/lib/src/components/launch_ramp.dart b/packages/pinball_components/lib/src/components/launch_ramp.dart index bd7e9e50..12ba9edf 100644 --- a/packages/pinball_components/lib/src/components/launch_ramp.dart +++ b/packages/pinball_components/lib/src/components/launch_ramp.dart @@ -41,7 +41,7 @@ class LaunchRamp extends Forge2DBlueprint { /// {@endtemplate} class _LaunchRampBase extends BodyComponent with InitialPosition, Layered { /// {@macro launch_ramp_base} - _LaunchRampBase() : super(priority: PinballPriority.launchRamp) { + _LaunchRampBase() : super(priority: RenderPriority.launchRamp) { layer = Layer.launcher; } @@ -144,7 +144,7 @@ class _LaunchRampBaseSpriteComponent extends SpriteComponent with HasGameRef { class _LaunchRampForegroundRailing extends BodyComponent with InitialPosition { /// {@macro launch_ramp_foreground_railing} _LaunchRampForegroundRailing() - : super(priority: PinballPriority.launchRampForegroundRailing); + : super(priority: RenderPriority.launchRampForegroundRailing); List _createFixtureDefs() { final fixturesDef = []; @@ -247,8 +247,8 @@ class _LaunchRampExit extends RampOpening { insideLayer: Layer.launcher, outsideLayer: Layer.board, orientation: RampOrientation.down, - insidePriority: PinballPriority.ballOnLaunchRamp, - outsidePriority: PinballPriority.ballOnBoard, + insidePriority: RenderPriority.ballOnLaunchRamp, + outsidePriority: RenderPriority.ballOnBoard, ) { layer = Layer.launcher; renderBody = false; diff --git a/packages/pinball_components/lib/src/components/plunger.dart b/packages/pinball_components/lib/src/components/plunger.dart index 38b9984e..363e703e 100644 --- a/packages/pinball_components/lib/src/components/plunger.dart +++ b/packages/pinball_components/lib/src/components/plunger.dart @@ -14,7 +14,7 @@ class Plunger extends BodyComponent with InitialPosition, Layered { required this.compressionDistance, // TODO(ruimiguel): set to priority +1 over LaunchRamp once all priorities // are fixed. - }) : super(priority: PinballPriority.plunger) { + }) : super(priority: RenderPriority.plunger) { layer = Layer.launcher; } diff --git a/packages/pinball_components/lib/src/components/ramp_opening.dart b/packages/pinball_components/lib/src/components/ramp_opening.dart index c6878c0f..829ad362 100644 --- a/packages/pinball_components/lib/src/components/ramp_opening.dart +++ b/packages/pinball_components/lib/src/components/ramp_opening.dart @@ -35,7 +35,7 @@ abstract class RampOpening extends BodyComponent with InitialPosition, Layered { }) : _insideLayer = insideLayer, _outsideLayer = outsideLayer ?? Layer.board, _insidePriority = insidePriority, - _outsidePriority = outsidePriority ?? PinballPriority.ballOnBoard { + _outsidePriority = outsidePriority ?? RenderPriority.ballOnBoard { layer = Layer.opening; } final Layer _insideLayer; diff --git a/packages/pinball_components/lib/src/components/rocket.dart b/packages/pinball_components/lib/src/components/rocket.dart index d5027813..3f9161ca 100644 --- a/packages/pinball_components/lib/src/components/rocket.dart +++ b/packages/pinball_components/lib/src/components/rocket.dart @@ -9,7 +9,7 @@ class RocketSpriteComponent extends SpriteComponent with HasGameRef { // TODO(ruimiguel): change this priority to be over launcher ramp and bottom // wall. /// {@macro rocket_sprite_component} - RocketSpriteComponent() : super(priority: PinballPriority.rocket); + RocketSpriteComponent() : super(priority: RenderPriority.rocket); @override Future onLoad() async { diff --git a/packages/pinball_components/lib/src/components/score_text.dart b/packages/pinball_components/lib/src/components/score_text.dart index 2d0e02af..a81b4a6f 100644 --- a/packages/pinball_components/lib/src/components/score_text.dart +++ b/packages/pinball_components/lib/src/components/score_text.dart @@ -18,7 +18,7 @@ class ScoreText extends TextComponent { text: text, position: position, anchor: Anchor.center, - priority: PinballPriority.scoreText, + priority: RenderPriority.scoreText, ); late final Effect _effect; diff --git a/packages/pinball_components/lib/src/components/slingshot.dart b/packages/pinball_components/lib/src/components/slingshot.dart index ef0f5d67..8e76bd71 100644 --- a/packages/pinball_components/lib/src/components/slingshot.dart +++ b/packages/pinball_components/lib/src/components/slingshot.dart @@ -42,7 +42,7 @@ class Slingshot extends BodyComponent with InitialPosition { }) : _length = length, _angle = angle, _spritePath = spritePath, - super(priority: PinballPriority.slingshot); + super(priority: RenderPriority.slingshot); final double _length; diff --git a/packages/pinball_components/lib/src/components/spaceship.dart b/packages/pinball_components/lib/src/components/spaceship.dart index 7a7e0592..46b2c506 100644 --- a/packages/pinball_components/lib/src/components/spaceship.dart +++ b/packages/pinball_components/lib/src/components/spaceship.dart @@ -34,7 +34,7 @@ class Spaceship extends Forge2DBlueprint { AndroidHead()..initialPosition = position, SpaceshipHole( outsideLayer: Layer.spaceshipExitRail, - outsidePriority: PinballPriority.ballOnSpaceshipRail, + outsidePriority: RenderPriority.ballOnSpaceshipRail, )..initialPosition = position - Vector2(5.2, -4.8), SpaceshipHole()..initialPosition = position - Vector2(-7.2, -0.8), SpaceshipWall()..initialPosition = position, @@ -47,7 +47,7 @@ class Spaceship extends Forge2DBlueprint { /// {@endtemplate} class SpaceshipSaucer extends BodyComponent with InitialPosition, Layered { /// {@macro spaceship_saucer} - SpaceshipSaucer() : super(priority: PinballPriority.spaceshipSaucer) { + SpaceshipSaucer() : super(priority: RenderPriority.spaceshipSaucer) { layer = Layer.spaceship; } @@ -91,7 +91,7 @@ class SpaceshipSaucer extends BodyComponent with InitialPosition, Layered { /// {@endtemplate} class AndroidHead extends BodyComponent with InitialPosition, Layered { /// {@macro spaceship_bridge} - AndroidHead() : super(priority: PinballPriority.androidHead) { + AndroidHead() : super(priority: RenderPriority.androidHead) { layer = Layer.spaceship; } @@ -153,7 +153,7 @@ class SpaceshipEntrance extends RampOpening { : super( insideLayer: Layer.spaceship, orientation: RampOrientation.up, - insidePriority: PinballPriority.ballOnSpaceship, + insidePriority: RenderPriority.ballOnSpaceship, ) { layer = Layer.spaceship; } @@ -187,7 +187,7 @@ class SpaceshipHole extends RampOpening { insideLayer: Layer.spaceship, outsideLayer: outsideLayer, orientation: RampOrientation.up, - insidePriority: PinballPriority.ballOnSpaceship, + insidePriority: RenderPriority.ballOnSpaceship, outsidePriority: outsidePriority, ) { renderBody = false; @@ -238,7 +238,7 @@ class _SpaceshipWallShape extends ChainShape { /// {@endtemplate} class SpaceshipWall extends BodyComponent with InitialPosition, Layered { /// {@macro spaceship_wall} - SpaceshipWall() : super(priority: PinballPriority.spaceshipSaucerWall) { + SpaceshipWall() : super(priority: RenderPriority.spaceshipSaucerWall) { layer = Layer.spaceship; } diff --git a/packages/pinball_components/lib/src/components/spaceship_rail.dart b/packages/pinball_components/lib/src/components/spaceship_rail.dart index 33bd6c34..60a96d80 100644 --- a/packages/pinball_components/lib/src/components/spaceship_rail.dart +++ b/packages/pinball_components/lib/src/components/spaceship_rail.dart @@ -40,7 +40,7 @@ class SpaceshipRail extends Forge2DBlueprint { /// Represents the spaceship drop rail from the [Spaceship]. class _SpaceshipRailRamp extends BodyComponent with InitialPosition, Layered { - _SpaceshipRailRamp() : super(priority: PinballPriority.spaceshipRail) { + _SpaceshipRailRamp() : super(priority: RenderPriority.spaceshipRail) { layer = Layer.spaceshipExitRail; } @@ -156,7 +156,7 @@ class _SpaceshipRailRampSpriteComponent extends SpriteComponent class _SpaceshipRailForeground extends SpriteComponent with HasGameRef { _SpaceshipRailForeground() - : super(priority: PinballPriority.spaceshipRailForeground); + : super(priority: RenderPriority.spaceshipRailForeground); @override Future onLoad() async { @@ -204,7 +204,7 @@ class SpaceshipRailExit extends RampOpening { : super( orientation: RampOrientation.down, insideLayer: Layer.spaceshipExitRail, - insidePriority: PinballPriority.ballOnSpaceshipRail, + insidePriority: RenderPriority.ballOnSpaceshipRail, ) { renderBody = false; layer = Layer.spaceshipExitRail; diff --git a/packages/pinball_components/lib/src/components/spaceship_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_ramp.dart index 252cc61d..99f985f7 100644 --- a/packages/pinball_components/lib/src/components/spaceship_ramp.dart +++ b/packages/pinball_components/lib/src/components/spaceship_ramp.dart @@ -21,14 +21,14 @@ class SpaceshipRamp extends Forge2DBlueprint { ]); final rightOpening = _SpaceshipRampOpening( - outsidePriority: PinballPriority.ballOnBoard, + outsidePriority: RenderPriority.ballOnBoard, rotation: math.pi, ) ..initialPosition = Vector2(1.7, -19.8) ..layer = Layer.opening; final leftOpening = _SpaceshipRampOpening( outsideLayer: Layer.spaceship, - outsidePriority: PinballPriority.ballOnSpaceship, + outsidePriority: RenderPriority.ballOnSpaceship, rotation: math.pi, ) ..initialPosition = Vector2(-13.7, -18.6) @@ -58,7 +58,7 @@ class SpaceshipRamp extends Forge2DBlueprint { class _SpaceshipRampBackground extends BodyComponent with InitialPosition, Layered { - _SpaceshipRampBackground() : super(priority: PinballPriority.spaceshipRamp) { + _SpaceshipRampBackground() : super(priority: RenderPriority.spaceshipRamp) { layer = Layer.spaceshipEntranceRamp; } @@ -125,7 +125,7 @@ class _SpaceshipRampBackground extends BodyComponent class _SpaceshipRampBackgroundRailingSpriteComponent extends SpriteComponent with HasGameRef { _SpaceshipRampBackgroundRailingSpriteComponent() - : super(priority: PinballPriority.spaceshipRampBackgroundRailing); + : super(priority: RenderPriority.spaceshipRampBackgroundRailing); @override Future onLoad() async { await super.onLoad(); @@ -171,7 +171,7 @@ class _SpaceshipRampBoardOpeningSpriteComponent extends SpriteComponent class _SpaceshipRampForegroundRailing extends BodyComponent with InitialPosition, Layered { _SpaceshipRampForegroundRailing() - : super(priority: PinballPriority.spaceshipRampForegroundRailing) { + : super(priority: RenderPriority.spaceshipRampForegroundRailing) { layer = Layer.spaceshipEntranceRamp; } @@ -291,7 +291,7 @@ class _SpaceshipRampOpening extends RampOpening { insideLayer: Layer.spaceshipEntranceRamp, outsideLayer: outsideLayer, orientation: RampOrientation.down, - insidePriority: PinballPriority.ballOnSpaceshipRamp, + insidePriority: RenderPriority.ballOnSpaceshipRamp, outsidePriority: outsidePriority, ) { renderBody = false; diff --git a/packages/pinball_components/lib/src/components/sparky_bumper.dart b/packages/pinball_components/lib/src/components/sparky_bumper.dart index 7a45da2b..31a5dac0 100644 --- a/packages/pinball_components/lib/src/components/sparky_bumper.dart +++ b/packages/pinball_components/lib/src/components/sparky_bumper.dart @@ -21,7 +21,7 @@ class SparkyBumper extends BodyComponent with InitialPosition { _activeAssetPath = activeAssetPath, _inactiveAssetPath = inactiveAssetPath, _spriteComponent = spriteComponent, - super(priority: PinballPriority.sparkyBumper); + super(priority: RenderPriority.sparkyBumper); /// {@macro sparky_bumper} SparkyBumper.a() diff --git a/packages/pinball_components/lib/src/components/sparky_computer.dart b/packages/pinball_components/lib/src/components/sparky_computer.dart index 60d6c038..d3aa2b05 100644 --- a/packages/pinball_components/lib/src/components/sparky_computer.dart +++ b/packages/pinball_components/lib/src/components/sparky_computer.dart @@ -22,7 +22,7 @@ class SparkyComputer extends Forge2DBlueprint { } class _ComputerBase extends BodyComponent with InitialPosition { - _ComputerBase() : super(priority: PinballPriority.computerBase); + _ComputerBase() : super(priority: RenderPriority.computerBase); List _createFixtureDefs() { final fixturesDef = []; @@ -99,7 +99,7 @@ class _ComputerTopSpriteComponent extends SpriteComponent with HasGameRef { : super( anchor: Anchor.center, position: Vector2(-12.45, -49.75), - priority: PinballPriority.computerTop, + priority: RenderPriority.computerTop, ); @override diff --git a/packages/pinball_components/lib/src/flame/priority.dart b/packages/pinball_components/lib/src/flame/priority.dart index 26d9f767..25d2855a 100644 --- a/packages/pinball_components/lib/src/flame/priority.dart +++ b/packages/pinball_components/lib/src/flame/priority.dart @@ -1,110 +1,114 @@ +// ignore_for_file: public_member_api_docs + import 'dart:math' as math; import 'package:flame/components.dart'; import 'package:pinball_components/pinball_components.dart'; -/// {@template pinball_priority} +/// {@template render_priority} /// Priorities for the component rendering order in the pinball game. /// {@endtemplate} -abstract class PinballPriority { - static const base = 0; - static const above = 1; - static const below = -1; +abstract class RenderPriority { + static const _base = 0; + static const _above = 1; + static const _below = -1; // BALL /// Render priority for the [Ball] while it's on the board. - static const int ballOnBoard = base; + static const int ballOnBoard = _base; /// Render priority for the [Ball] while it's on the [SpaceshipRamp]. - static const int ballOnSpaceshipRamp = above + spaceshipRampBackgroundRailing; + static const int ballOnSpaceshipRamp = + _above + spaceshipRampBackgroundRailing; /// Render priority for the [Ball] while it's on the [Spaceship]. - static const int ballOnSpaceship = above + spaceshipSaucer; + static const int ballOnSpaceship = _above + spaceshipSaucer; /// Render priority for the [Ball] while it's on the [SpaceshipRail]. static const int ballOnSpaceshipRail = spaceshipRail; /// Render priority for the [Ball] while it's on the [LaunchRamp]. - static const int ballOnLaunchRamp = above + launchRamp; + static const int ballOnLaunchRamp = _above + launchRamp; // BACKGROUND - static const int background = 3 * below + base; + static const int background = 3 * _below + _base; // BOUNDARIES - static const int bottomBoundary = above + dinoBottomWall; + static const int bottomBoundary = _above + dinoBottomWall; - static const int outerBoudary = above + background; + static const int outerBoudary = _above + background; // BOTTOM GROUP - static const int bottomGroup = above + ballOnBoard; + static const int bottomGroup = _above + ballOnBoard; // LAUNCHER - static const int launchRamp = above + outerBoudary; + static const int launchRamp = _above + outerBoudary; - static const int launchRampForegroundRailing = above + ballOnLaunchRamp; + static const int launchRampForegroundRailing = _above + ballOnLaunchRamp; - static const int plunger = above + launchRamp; + static const int plunger = _above + launchRamp; - static const int rocket = above + bottomBoundary; + static const int rocket = _above + bottomBoundary; // DINO LAND - static const int dinoTopWall = above + ballOnBoard; + static const int dinoTopWall = _above + ballOnBoard; - static const int dino = above + dinoTopWall; + static const int dino = _above + dinoTopWall; - static const int dinoBottomWall = above + dino; + static const int dinoBottomWall = _above + dino; - static const int slingshot = above + ballOnBoard; + static const int slingshot = _above + ballOnBoard; // FLUTTER FOREST - static const int flutterSignPost = above + launchRampForegroundRailing; + static const int flutterSignPost = _above + launchRampForegroundRailing; - static const int dashBumper = above + ballOnBoard; + static const int dashBumper = _above + ballOnBoard; - static const int dashAnimatronic = above + launchRampForegroundRailing; + static const int dashAnimatronic = _above + launchRampForegroundRailing; // SPARKY FIRE ZONE - static const int computerBase = below + ballOnBoard; + static const int computerBase = _below + ballOnBoard; - static const int computerTop = above + ballOnBoard; + static const int computerTop = _above + ballOnBoard; - static const int sparkyAnimatronic = above + spaceshipRampForegroundRailing; + static const int sparkyAnimatronic = _above + spaceshipRampForegroundRailing; - static const int sparkyBumper = above + ballOnBoard; + static const int sparkyBumper = _above + ballOnBoard; // ANDROID SPACESHIP - static const int spaceshipRail = above + bottomGroup; + static const int spaceshipRail = _above + bottomGroup; - static const int spaceshipRailForeground = above + spaceshipRail; + static const int spaceshipRailForeground = _above + spaceshipRail; - static const int spaceshipSaucer = above + spaceshipRail; + static const int spaceshipSaucer = _above + spaceshipRail; - static const int spaceshipSaucerWall = above + spaceshipSaucer; + static const int spaceshipSaucerWall = _above + spaceshipSaucer; - static const int androidHead = above + spaceshipSaucer; + static const int androidHead = _above + spaceshipSaucer; - static const int spaceshipRamp = above + ballOnBoard; + static const int spaceshipRamp = _above + ballOnBoard; - static const int spaceshipRampBackgroundRailing = above + spaceshipRamp; + static const int spaceshipRampBackgroundRailing = _above + spaceshipRamp; - static const int spaceshipRampForegroundRailing = above + ballOnSpaceshipRamp; + static const int spaceshipRampForegroundRailing = + _above + ballOnSpaceshipRamp; - static const int spaceshipRampBoardOpening = below + ballOnBoard; + static const int spaceshipRampBoardOpening = _below + ballOnBoard; - static const int alienBumper = above + ballOnBoard; + static const int alienBumper = _above + ballOnBoard; // SCORE TEXT - static const int scoreText = above + spaceshipRampForegroundRailing; + static const int scoreText = _above + spaceshipRampForegroundRailing; } /// Helper methods to change the [priority] of a [Component]. 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 6b3da24e..9c14e77a 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 @@ -9,7 +9,7 @@ class LaunchRampGame extends BasicBallGame { LaunchRampGame() : super( color: Colors.blue, - ballPriority: PinballPriority.ballOnLaunchRamp, + ballPriority: RenderPriority.ballOnLaunchRamp, ballLayer: Layer.launcher, ); diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart b/packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart index 078ab599..38458649 100644 --- a/packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/spaceship_rail/spaceship_rail_game.dart @@ -9,7 +9,7 @@ class SpaceshipRailGame extends BasicBallGame { SpaceshipRailGame() : super( color: Colors.blue, - ballPriority: PinballPriority.ballOnSpaceshipRail, + ballPriority: RenderPriority.ballOnSpaceshipRail, ballLayer: Layer.spaceshipExitRail, ); diff --git a/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart b/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart index 61f93166..c71d18c2 100644 --- a/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/spaceship_ramp/spaceship_ramp_game.dart @@ -9,7 +9,7 @@ class SpaceshipRampGame extends BasicBallGame { SpaceshipRampGame() : super( color: Colors.blue, - ballPriority: PinballPriority.ballOnSpaceshipRamp, + ballPriority: RenderPriority.ballOnSpaceshipRamp, ballLayer: Layer.spaceshipEntranceRamp, );