From c04ed877019a319b6e4d2c70d0f7790911c0307d Mon Sep 17 00:00:00 2001 From: alestiago Date: Thu, 7 Apr 2022 14:08:24 +0100 Subject: [PATCH] refactor: suffixed Component --- .../pinball_components/lib/src/components/ball.dart | 4 ++-- .../lib/src/components/baseboard.dart | 6 +++--- .../lib/src/components/boundaries.dart | 8 ++++---- .../lib/src/components/dino_walls.dart | 8 ++++---- .../lib/src/components/flipper.dart | 9 +++------ .../lib/src/components/flutter_sign_post.dart | 4 ++-- .../lib/src/components/kicker.dart | 6 +++--- .../lib/src/components/launch_ramp.dart | 8 ++++---- .../lib/src/components/spaceship_rail.dart | 5 +++-- .../lib/src/components/spaceship_ramp.dart | 12 ++++++------ 10 files changed, 34 insertions(+), 36 deletions(-) diff --git a/packages/pinball_components/lib/src/components/ball.dart b/packages/pinball_components/lib/src/components/ball.dart index 8531425b..2b9f9596 100644 --- a/packages/pinball_components/lib/src/components/ball.dart +++ b/packages/pinball_components/lib/src/components/ball.dart @@ -31,7 +31,7 @@ class Ball extends BodyComponent double _boostTimer = 0; static const _boostDuration = 2.0; - final SpriteComponent _spriteComponent = _BallSprite(); + final _BallSpriteComponent _spriteComponent = _BallSpriteComponent(); @override Future onLoad() async { @@ -108,7 +108,7 @@ class Ball extends BodyComponent } } -class _BallSprite extends SpriteComponent with HasGameRef { +class _BallSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); diff --git a/packages/pinball_components/lib/src/components/baseboard.dart b/packages/pinball_components/lib/src/components/baseboard.dart index 74088edd..56b7c978 100644 --- a/packages/pinball_components/lib/src/components/baseboard.dart +++ b/packages/pinball_components/lib/src/components/baseboard.dart @@ -83,7 +83,7 @@ class Baseboard extends BodyComponent with InitialPosition { Future onLoad() async { await super.onLoad(); renderBody = false; - await add(_BaseboardSprite(side: _side)); + await add(_BaseboardSpriteComponent(side: _side)); } @override @@ -101,8 +101,8 @@ class Baseboard extends BodyComponent with InitialPosition { } } -class _BaseboardSprite extends SpriteComponent with HasGameRef { - _BaseboardSprite({required BoardSide side}) : _side = side; +class _BaseboardSpriteComponent extends SpriteComponent with HasGameRef { + _BaseboardSpriteComponent({required BoardSide side}) : _side = side; final BoardSide _side; diff --git a/packages/pinball_components/lib/src/components/boundaries.dart b/packages/pinball_components/lib/src/components/boundaries.dart index b313fd63..a542cd2a 100644 --- a/packages/pinball_components/lib/src/components/boundaries.dart +++ b/packages/pinball_components/lib/src/components/boundaries.dart @@ -64,11 +64,11 @@ class _BottomBoundary extends BodyComponent with InitialPosition { Future onLoad() async { await super.onLoad(); renderBody = false; - await add(_BottomBoundarySprite()); + await add(_BottomBoundarySpriteComponent()); } } -class _BottomBoundarySprite extends SpriteComponent with HasGameRef { +class _BottomBoundarySpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); @@ -135,11 +135,11 @@ class _OuterBoundary extends BodyComponent with InitialPosition { Future onLoad() async { await super.onLoad(); renderBody = false; - await add(_OuterBoundarySprite()); + await add(_OuterBoundarySpriteComponent()); } } -class _OuterBoundarySprite extends SpriteComponent with HasGameRef { +class _OuterBoundarySpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); diff --git a/packages/pinball_components/lib/src/components/dino_walls.dart b/packages/pinball_components/lib/src/components/dino_walls.dart index 1b2b42b1..3c5d7f37 100644 --- a/packages/pinball_components/lib/src/components/dino_walls.dart +++ b/packages/pinball_components/lib/src/components/dino_walls.dart @@ -102,11 +102,11 @@ class _DinoTopWall extends BodyComponent with InitialPosition { await super.onLoad(); renderBody = false; - await add(_DinoTopWallSprite()); + await add(_DinoTopWallSpriteComponent()); } } -class _DinoTopWallSprite extends SpriteComponent with HasGameRef { +class _DinoTopWallSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); @@ -202,11 +202,11 @@ class _DinoBottomWall extends BodyComponent with InitialPosition { await super.onLoad(); renderBody = false; - await add(_DinoBottomWallSprite()); + await add(_DinoBottomWallSpriteComponent()); } } -class _DinoBottomWallSprite extends SpriteComponent with HasGameRef { +class _DinoBottomWallSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); diff --git a/packages/pinball_components/lib/src/components/flipper.dart b/packages/pinball_components/lib/src/components/flipper.dart index 4921d9e4..b9d229c4 100644 --- a/packages/pinball_components/lib/src/components/flipper.dart +++ b/packages/pinball_components/lib/src/components/flipper.dart @@ -42,9 +42,6 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { body.linearVelocity = Vector2(0, _speed); } - /// Loads the sprite that renders with the [Flipper]. - Future _loadSprite() async {} - /// Anchors the [Flipper] to the [RevoluteJoint] that controls its arc motion. Future _anchorToJoint() async { final anchor = _FlipperAnchor(flipper: this); @@ -117,7 +114,7 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { renderBody = false; await _anchorToJoint(); - await add(_FlipperSprite(side: side)); + await add(_FlipperSpriteComponent(side: side)); } @override @@ -133,8 +130,8 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { } } -class _FlipperSprite extends SpriteComponent with HasGameRef { - _FlipperSprite({required BoardSide side}) : _side = side; +class _FlipperSpriteComponent extends SpriteComponent with HasGameRef { + _FlipperSpriteComponent({required BoardSide side}) : _side = side; final BoardSide _side; 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 8717fd31..070fa316 100644 --- a/packages/pinball_components/lib/src/components/flutter_sign_post.dart +++ b/packages/pinball_components/lib/src/components/flutter_sign_post.dart @@ -11,7 +11,7 @@ class FlutterSignPost extends BodyComponent with InitialPosition { await super.onLoad(); renderBody = false; - await add(_FlutterSignPostSprite()); + await add(_FlutterSignPostSpriteComponent()); } @override @@ -24,7 +24,7 @@ class FlutterSignPost extends BodyComponent with InitialPosition { } } -class _FlutterSignPostSprite extends SpriteComponent with HasGameRef { +class _FlutterSignPostSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); diff --git a/packages/pinball_components/lib/src/components/kicker.dart b/packages/pinball_components/lib/src/components/kicker.dart index b7d1cbf8..de009595 100644 --- a/packages/pinball_components/lib/src/components/kicker.dart +++ b/packages/pinball_components/lib/src/components/kicker.dart @@ -122,12 +122,12 @@ class Kicker extends BodyComponent with InitialPosition { Future onLoad() async { await super.onLoad(); renderBody = false; - await add(_KickerSprite(side: _side)); + await add(_KickerSpriteComponent(side: _side)); } } -class _KickerSprite extends SpriteComponent with HasGameRef { - _KickerSprite({required BoardSide side}) : _side = side; +class _KickerSpriteComponent extends SpriteComponent with HasGameRef { + _KickerSpriteComponent({required BoardSide side}) : _side = side; final BoardSide _side; diff --git a/packages/pinball_components/lib/src/components/launch_ramp.dart b/packages/pinball_components/lib/src/components/launch_ramp.dart index fdae5c8b..2eea7a91 100644 --- a/packages/pinball_components/lib/src/components/launch_ramp.dart +++ b/packages/pinball_components/lib/src/components/launch_ramp.dart @@ -117,11 +117,11 @@ class _LaunchRampBase extends BodyComponent with InitialPosition, Layered { await super.onLoad(); renderBody = false; - await add(_LaunchRampBaseSprite()); + await add(_LaunchRampBaseSpriteComponent()); } } -class _LaunchRampBaseSprite extends SpriteComponent with HasGameRef { +class _LaunchRampBaseSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { await super.onLoad(); @@ -195,11 +195,11 @@ class _LaunchRampForegroundRailing extends BodyComponent await super.onLoad(); renderBody = false; - await add(_LaunchRampForegroundRailingSprite()); + await add(_LaunchRampForegroundRailingSpriteComponent()); } } -class _LaunchRampForegroundRailingSprite extends SpriteComponent +class _LaunchRampForegroundRailingSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { diff --git a/packages/pinball_components/lib/src/components/spaceship_rail.dart b/packages/pinball_components/lib/src/components/spaceship_rail.dart index 83412b4b..2cc8bccc 100644 --- a/packages/pinball_components/lib/src/components/spaceship_rail.dart +++ b/packages/pinball_components/lib/src/components/spaceship_rail.dart @@ -139,11 +139,12 @@ class _SpaceshipRailRamp extends BodyComponent with InitialPosition, Layered { @override Future onLoad() async { await super.onLoad(); - await add(_SpaceshipRailRampSprite()); + await add(_SpaceshipRailRampSpriteComponent()); } } -class _SpaceshipRailRampSprite extends SpriteComponent with HasGameRef { +class _SpaceshipRailRampSpriteComponent extends SpriteComponent + with HasGameRef { @override Future onLoad() async { await super.onLoad(); diff --git a/packages/pinball_components/lib/src/components/spaceship_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_ramp.dart index 8ff2a3e3..38c5c7df 100644 --- a/packages/pinball_components/lib/src/components/spaceship_ramp.dart +++ b/packages/pinball_components/lib/src/components/spaceship_ramp.dart @@ -111,12 +111,12 @@ class _SpaceshipRampBackground extends BodyComponent await super.onLoad(); renderBody = false; - await add(_SpaceshipRampBackgroundRailingSprite()); - await add(_SpaceshipRampBackgroundRampSprite()); + await add(_SpaceshipRampBackgroundRailingSpriteComponent()); + await add(_SpaceshipRampBackgroundRampSpriteComponent()); } } -class _SpaceshipRampBackgroundRailingSprite extends SpriteComponent +class _SpaceshipRampBackgroundRailingSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { @@ -131,7 +131,7 @@ class _SpaceshipRampBackgroundRailingSprite extends SpriteComponent } } -class _SpaceshipRampBackgroundRampSprite extends SpriteComponent +class _SpaceshipRampBackgroundRampSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async { @@ -199,11 +199,11 @@ class _SpaceshipRampForegroundRailing extends BodyComponent @override Future onLoad() async { await super.onLoad(); - await add(_SpaceshipRampForegroundRalingSprite()); + await add(_SpaceshipRampForegroundRalingSpriteComponent()); } } -class _SpaceshipRampForegroundRalingSprite extends SpriteComponent +class _SpaceshipRampForegroundRalingSpriteComponent extends SpriteComponent with HasGameRef { @override Future onLoad() async {