From b640e9ddd22d9720e923960c2dad3f005d9d34d8 Mon Sep 17 00:00:00 2001 From: Allison Ryan Date: Mon, 4 Apr 2022 08:34:32 -0500 Subject: [PATCH] refactor: organize spaceship assets --- lib/game/game_assets.dart | 16 ++--- .../bridge.png} | Bin .../images/spaceship/rail/foreground.png | Bin .../rail/rail.png} | Bin .../ramp/railing-background.png} | Bin .../ramp/railing-foreground.png} | Bin .../ramp/ramp.png} | Bin .../saucer.png} | Bin .../lib/gen/assets.gen.dart | 67 +++++++++++------- .../lib/src/components/spaceship.dart | 4 +- .../lib/src/components/spaceship_rail.dart | 4 +- .../lib/src/components/spaceship_ramp.dart | 6 +- packages/pinball_components/pubspec.yaml | 4 +- 13 files changed, 58 insertions(+), 43 deletions(-) rename packages/pinball_components/assets/images/{spaceship_bridge.png => spaceship/bridge.png} (100%) rename assets/images/components/spaceship-drop-tube-front.png => packages/pinball_components/assets/images/spaceship/rail/foreground.png (100%) rename packages/pinball_components/assets/images/{spaceship_ramp/spaceship_drop_tube.png => spaceship/rail/rail.png} (100%) rename packages/pinball_components/assets/images/{spaceship_ramp/spaceship_railing_bg.png => spaceship/ramp/railing-background.png} (100%) rename packages/pinball_components/assets/images/{spaceship_ramp/spaceship_railing_fg.png => spaceship/ramp/railing-foreground.png} (100%) rename packages/pinball_components/assets/images/{spaceship_ramp/spaceship_ramp.png => spaceship/ramp/ramp.png} (100%) rename packages/pinball_components/assets/images/{spaceship_saucer.png => spaceship/saucer.png} (100%) diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index ec4d365a..a6aee630 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -13,8 +13,6 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.flipper.right.keyName), images.load(components.Assets.images.baseboard.left.keyName), images.load(components.Assets.images.baseboard.right.keyName), - images.load(components.Assets.images.spaceshipSaucer.keyName), - images.load(components.Assets.images.spaceshipBridge.keyName), images.load(components.Assets.images.launchRamp.ramp.keyName), images.load( components.Assets.images.launchRamp.foregroundRailing.keyName, @@ -27,20 +25,20 @@ 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.spaceship.saucer.keyName), + images.load(components.Assets.images.spaceship.bridge.keyName), + images.load(components.Assets.images.spaceship.ramp.ramp.keyName), images.load( - components.Assets.images.spaceshipRamp.spaceshipRailingBg.keyName, + components.Assets.images.spaceship.ramp.railingBackground.keyName, ), images.load( - components.Assets.images.spaceshipRamp.spaceshipRailingFg.keyName, - ), - images.load( - components.Assets.images.spaceshipRamp.spaceshipDropTube.keyName, + components.Assets.images.spaceship.ramp.railingForeground.keyName, ), + images.load(components.Assets.images.spaceship.rail.rail.keyName), + images.load(components.Assets.images.spaceship.rail.foreground.keyName), images.load(components.Assets.images.chromeDino.mouth.keyName), images.load(components.Assets.images.chromeDino.head.keyName), images.load(Assets.images.components.background.path), - images.load(Assets.images.components.spaceshipDropTubeFront.path), ]); } } diff --git a/packages/pinball_components/assets/images/spaceship_bridge.png b/packages/pinball_components/assets/images/spaceship/bridge.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship_bridge.png rename to packages/pinball_components/assets/images/spaceship/bridge.png diff --git a/assets/images/components/spaceship-drop-tube-front.png b/packages/pinball_components/assets/images/spaceship/rail/foreground.png similarity index 100% rename from assets/images/components/spaceship-drop-tube-front.png rename to packages/pinball_components/assets/images/spaceship/rail/foreground.png diff --git a/packages/pinball_components/assets/images/spaceship_ramp/spaceship_drop_tube.png b/packages/pinball_components/assets/images/spaceship/rail/rail.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship_ramp/spaceship_drop_tube.png rename to packages/pinball_components/assets/images/spaceship/rail/rail.png diff --git a/packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_bg.png b/packages/pinball_components/assets/images/spaceship/ramp/railing-background.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_bg.png rename to packages/pinball_components/assets/images/spaceship/ramp/railing-background.png diff --git a/packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_fg.png b/packages/pinball_components/assets/images/spaceship/ramp/railing-foreground.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_fg.png rename to packages/pinball_components/assets/images/spaceship/ramp/railing-foreground.png diff --git a/packages/pinball_components/assets/images/spaceship_ramp/spaceship_ramp.png b/packages/pinball_components/assets/images/spaceship/ramp/ramp.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship_ramp/spaceship_ramp.png rename to packages/pinball_components/assets/images/spaceship/ramp/ramp.png diff --git a/packages/pinball_components/assets/images/spaceship_saucer.png b/packages/pinball_components/assets/images/spaceship/saucer.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship_saucer.png rename to packages/pinball_components/assets/images/spaceship/saucer.png diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index 42b164cc..f5d215cc 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -27,17 +27,7 @@ class $AssetsImagesGen { $AssetsImagesLaunchRampGen get launchRamp => const $AssetsImagesLaunchRampGen(); - - /// File path: assets/images/spaceship_bridge.png - 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'); + $AssetsImagesSpaceshipGen get spaceship => const $AssetsImagesSpaceshipGen(); } class $AssetsImagesBaseboardGen { @@ -109,24 +99,21 @@ class $AssetsImagesLaunchRampGen { const AssetGenImage('assets/images/launch_ramp/ramp.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'); +class $AssetsImagesSpaceshipGen { + const $AssetsImagesSpaceshipGen(); - /// 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/bridge.png + AssetGenImage get bridge => + const AssetGenImage('assets/images/spaceship/bridge.png'); - /// File path: assets/images/spaceship_ramp/spaceship_railing_fg.png - AssetGenImage get spaceshipRailingFg => const AssetGenImage( - 'assets/images/spaceship_ramp/spaceship_railing_fg.png'); + $AssetsImagesSpaceshipRailGen get rail => + const $AssetsImagesSpaceshipRailGen(); + $AssetsImagesSpaceshipRampGen get ramp => + const $AssetsImagesSpaceshipRampGen(); - /// File path: assets/images/spaceship_ramp/spaceship_ramp.png - AssetGenImage get spaceshipRamp => - const AssetGenImage('assets/images/spaceship_ramp/spaceship_ramp.png'); + /// File path: assets/images/spaceship/saucer.png + AssetGenImage get saucer => + const AssetGenImage('assets/images/spaceship/saucer.png'); } class $AssetsImagesDashBumperAGen { @@ -165,6 +152,34 @@ class $AssetsImagesDashBumperMainGen { const AssetGenImage('assets/images/dash_bumper/main/inactive.png'); } +class $AssetsImagesSpaceshipRailGen { + const $AssetsImagesSpaceshipRailGen(); + + /// File path: assets/images/spaceship/rail/foreground.png + AssetGenImage get foreground => + const AssetGenImage('assets/images/spaceship/rail/foreground.png'); + + /// File path: assets/images/spaceship/rail/rail.png + AssetGenImage get rail => + const AssetGenImage('assets/images/spaceship/rail/rail.png'); +} + +class $AssetsImagesSpaceshipRampGen { + const $AssetsImagesSpaceshipRampGen(); + + /// File path: assets/images/spaceship/ramp/railing-background.png + AssetGenImage get railingBackground => const AssetGenImage( + 'assets/images/spaceship/ramp/railing-background.png'); + + /// File path: assets/images/spaceship/ramp/railing-foreground.png + AssetGenImage get railingForeground => const AssetGenImage( + 'assets/images/spaceship/ramp/railing-foreground.png'); + + /// File path: assets/images/spaceship/ramp/ramp.png + AssetGenImage get ramp => + const AssetGenImage('assets/images/spaceship/ramp/ramp.png'); +} + class Assets { Assets._(); diff --git a/packages/pinball_components/lib/src/components/spaceship.dart b/packages/pinball_components/lib/src/components/spaceship.dart index d9f50653..f1b58db0 100644 --- a/packages/pinball_components/lib/src/components/spaceship.dart +++ b/packages/pinball_components/lib/src/components/spaceship.dart @@ -59,7 +59,7 @@ class SpaceshipSaucer extends BodyComponent with InitialPosition, Layered { Future onLoad() async { await super.onLoad(); final sprite = await gameRef.loadSprite( - Assets.images.spaceshipSaucer.keyName, + Assets.images.spaceship.saucer.keyName, ); await add( @@ -106,7 +106,7 @@ class AndroidHead extends BodyComponent with InitialPosition, Layered { renderBody = false; final sprite = await gameRef.images.load( - Assets.images.spaceshipBridge.keyName, + Assets.images.spaceship.bridge.keyName, ); await add( diff --git a/packages/pinball_components/lib/src/components/spaceship_rail.dart b/packages/pinball_components/lib/src/components/spaceship_rail.dart index f4c979e7..2bbd6a47 100644 --- a/packages/pinball_components/lib/src/components/spaceship_rail.dart +++ b/packages/pinball_components/lib/src/components/spaceship_rail.dart @@ -144,7 +144,7 @@ class _SpaceshipRailRamp extends BodyComponent with InitialPosition, Layered { Future _loadSprite() async { final sprite = await gameRef.loadSprite( - Assets.images.spaceshipRamp.spaceshipDropTube.keyName, + Assets.images.spaceship.rail.rail.keyName, ); final spriteComponent = SpriteComponent( sprite: sprite, @@ -171,7 +171,7 @@ class _SpaceshipRailForeground extends SpriteComponent with HasGameRef { await super.onLoad(); sprite = await gameRef.loadSprite( - Assets.images.components.spaceshipDropTubeFront.path, + Assets.images.spaceship.rail.foreground.keyName, ); } } diff --git a/packages/pinball_components/lib/src/components/spaceship_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_ramp.dart index db9dbe85..ac573455 100644 --- a/packages/pinball_components/lib/src/components/spaceship_ramp.dart +++ b/packages/pinball_components/lib/src/components/spaceship_ramp.dart @@ -116,7 +116,7 @@ class _SpaceshipRampBackground extends BodyComponent Future _loadSprites() async { final spriteRamp = await gameRef.loadSprite( - Assets.images.spaceshipRamp.spaceshipRamp.keyName, + Assets.images.spaceship.ramp.ramp.keyName, ); final spriteRampComponent = SpriteComponent( @@ -127,7 +127,7 @@ class _SpaceshipRampBackground extends BodyComponent ); final spriteRailingBg = await gameRef.loadSprite( - Assets.images.spaceshipRamp.spaceshipRailingBg.keyName, + Assets.images.spaceship.ramp.railingBackground.keyName, ); final spriteRailingBgComponent = SpriteComponent( sprite: spriteRailingBg, @@ -201,7 +201,7 @@ class _SpaceshipRampForegroundRailing extends BodyComponent Future _loadSprites() async { final spriteRailingFg = await gameRef.loadSprite( - Assets.images.spaceshipRamp.spaceshipRailingFg.keyName, + Assets.images.spaceship.ramp.railingForeground.keyName, ); final spriteRailingFgComponent = SpriteComponent( sprite: spriteRailingFg, diff --git a/packages/pinball_components/pubspec.yaml b/packages/pinball_components/pubspec.yaml index 13e850cd..7fe471a0 100644 --- a/packages/pinball_components/pubspec.yaml +++ b/packages/pinball_components/pubspec.yaml @@ -33,7 +33,9 @@ flutter: - assets/images/dash_bumper/a/ - assets/images/dash_bumper/b/ - assets/images/dash_bumper/main/ - - assets/images/spaceship_ramp/ + - assets/images/spaceship/ + - assets/images/spaceship/rail/ + - assets/images/spaceship/ramp/ - assets/images/chrome_dino/ flutter_gen: