From 17b5744cf1a6e0402206df51eadbbd5b265d15ff Mon Sep 17 00:00:00 2001 From: Allison Ryan Date: Mon, 4 Apr 2022 12:39:09 -0500 Subject: [PATCH] refactor: asset name change and size fix --- lib/game/game_assets.dart | 4 ++-- .../images/spaceship/rail/{rail.png => main.png} | Bin .../images/spaceship/ramp/{ramp.png => main.png} | Bin .../pinball_components/lib/gen/assets.gen.dart | 14 +++++++------- .../lib/src/components/spaceship_rail.dart | 7 ++++--- .../lib/src/components/spaceship_ramp.dart | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) rename packages/pinball_components/assets/images/spaceship/rail/{rail.png => main.png} (100%) rename packages/pinball_components/assets/images/spaceship/ramp/{ramp.png => main.png} (100%) diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 4dfb049a..6bafe37e 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -29,14 +29,14 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.boundary.outer.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.spaceship.ramp.main.keyName), images.load( components.Assets.images.spaceship.ramp.railingBackground.keyName, ), images.load( components.Assets.images.spaceship.ramp.railingForeground.keyName, ), - images.load(components.Assets.images.spaceship.rail.rail.keyName), + images.load(components.Assets.images.spaceship.rail.main.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), diff --git a/packages/pinball_components/assets/images/spaceship/rail/rail.png b/packages/pinball_components/assets/images/spaceship/rail/main.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship/rail/rail.png rename to packages/pinball_components/assets/images/spaceship/rail/main.png diff --git a/packages/pinball_components/assets/images/spaceship/ramp/ramp.png b/packages/pinball_components/assets/images/spaceship/ramp/main.png similarity index 100% rename from packages/pinball_components/assets/images/spaceship/ramp/ramp.png rename to packages/pinball_components/assets/images/spaceship/ramp/main.png diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index a9fb063a..c928df79 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -172,14 +172,18 @@ class $AssetsImagesSpaceshipRailGen { 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'); + /// File path: assets/images/spaceship/rail/main.png + AssetGenImage get main => + const AssetGenImage('assets/images/spaceship/rail/main.png'); } class $AssetsImagesSpaceshipRampGen { const $AssetsImagesSpaceshipRampGen(); + /// File path: assets/images/spaceship/ramp/main.png + AssetGenImage get main => + const AssetGenImage('assets/images/spaceship/ramp/main.png'); + /// File path: assets/images/spaceship/ramp/railing-background.png AssetGenImage get railingBackground => const AssetGenImage( 'assets/images/spaceship/ramp/railing-background.png'); @@ -187,10 +191,6 @@ class $AssetsImagesSpaceshipRampGen { /// 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 { diff --git a/packages/pinball_components/lib/src/components/spaceship_rail.dart b/packages/pinball_components/lib/src/components/spaceship_rail.dart index 2bbd6a47..ace12e61 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.spaceship.rail.rail.keyName, + Assets.images.spaceship.rail.main.keyName, ); final spriteComponent = SpriteComponent( sprite: sprite, @@ -160,7 +160,6 @@ class _SpaceshipRailRamp extends BodyComponent with InitialPosition, Layered { class _SpaceshipRailForeground extends SpriteComponent with HasGameRef { _SpaceshipRailForeground() : super( - size: Vector2(7.6, 5.7), anchor: Anchor.center, position: Vector2(-28.5, 19.7), priority: SpaceshipRail.ballPriorityWhenOnSpaceshipRail + 1, @@ -170,9 +169,11 @@ class _SpaceshipRailForeground extends SpriteComponent with HasGameRef { Future onLoad() async { await super.onLoad(); - sprite = await gameRef.loadSprite( + final sprite = await gameRef.loadSprite( Assets.images.spaceship.rail.foreground.keyName, ); + this.sprite = sprite; + size = sprite.originalSize / 10; } } diff --git a/packages/pinball_components/lib/src/components/spaceship_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_ramp.dart index ac573455..6fb6cda0 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.spaceship.ramp.ramp.keyName, + Assets.images.spaceship.ramp.main.keyName, ); final spriteRampComponent = SpriteComponent(