From 4463ec4ecce9bfbdbf1ba0358b7399c951ed26e8 Mon Sep 17 00:00:00 2001 From: RuiAlonso Date: Fri, 1 Apr 2022 18:32:49 +0200 Subject: [PATCH] refactor: moved spaceship entrance ramp and assets to pinball components --- lib/game/components/components.dart | 1 - lib/game/game_assets.dart | 10 ++++++--- lib/gen/assets.gen.dart | 12 ----------- .../spaceship_ramp}/spaceship_railing_bg.png | Bin .../spaceship_ramp}/spaceship_railing_fg.png | Bin .../images/spaceship_ramp}/spaceship_ramp.png | Bin .../lib/gen/assets.gen.dart | 19 ++++++++++++++++++ .../lib/src/components/components.dart | 1 + .../components/spaceship_entrance_ramp.dart | 14 ++++++------- packages/pinball_components/pubspec.yaml | 1 + 10 files changed, 35 insertions(+), 23 deletions(-) rename {assets/images/components => packages/pinball_components/assets/images/spaceship_ramp}/spaceship_railing_bg.png (100%) rename {assets/images/components => packages/pinball_components/assets/images/spaceship_ramp}/spaceship_railing_fg.png (100%) rename {assets/images/components => packages/pinball_components/assets/images/spaceship_ramp}/spaceship_ramp.png (100%) rename {lib/game => packages/pinball_components/lib/src}/components/spaceship_entrance_ramp.dart (94%) diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index 3c17ac16..9fefc5e2 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -4,7 +4,6 @@ export 'chrome_dino.dart'; export 'controlled_ball.dart'; export 'controlled_flipper.dart'; export 'flutter_forest.dart'; -export 'spaceship_entrance_ramp.dart'; export 'kicker.dart'; export 'launcher_ramp.dart'; export 'plunger.dart'; diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index dcb740a1..867d7b5d 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -21,10 +21,14 @@ 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.spaceshipRamp.spaceshipRailingBg.keyName, + ), + images.load( + components.Assets.images.spaceshipRamp.spaceshipRailingFg.keyName, + ), images.load(Assets.images.components.background.path), - images.load(Assets.images.components.spaceshipRamp.path), - images.load(Assets.images.components.spaceshipRailingBg.path), - images.load(Assets.images.components.spaceshipRailingFg.path), images.load(Assets.images.components.spaceshipDropTube.path), ]); } diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 7796df34..2fe23925 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -24,18 +24,6 @@ class $AssetsImagesComponentsGen { /// File path: assets/images/components/spaceship-drop-tube.png AssetGenImage get spaceshipDropTube => const AssetGenImage('assets/images/components/spaceship-drop-tube.png'); - - /// File path: assets/images/components/spaceship_railing_bg.png - AssetGenImage get spaceshipRailingBg => - const AssetGenImage('assets/images/components/spaceship_railing_bg.png'); - - /// File path: assets/images/components/spaceship_railing_fg.png - AssetGenImage get spaceshipRailingFg => - const AssetGenImage('assets/images/components/spaceship_railing_fg.png'); - - /// File path: assets/images/components/spaceship_ramp.png - AssetGenImage get spaceshipRamp => - const AssetGenImage('assets/images/components/spaceship_ramp.png'); } class Assets { diff --git a/assets/images/components/spaceship_railing_bg.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_bg.png similarity index 100% rename from assets/images/components/spaceship_railing_bg.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_bg.png diff --git a/assets/images/components/spaceship_railing_fg.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_fg.png similarity index 100% rename from assets/images/components/spaceship_railing_fg.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_railing_fg.png diff --git a/assets/images/components/spaceship_ramp.png b/packages/pinball_components/assets/images/spaceship_ramp/spaceship_ramp.png similarity index 100% rename from assets/images/components/spaceship_ramp.png rename to packages/pinball_components/assets/images/spaceship_ramp/spaceship_ramp.png diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index cf32e986..fe9fe6be 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -27,6 +27,9 @@ class $AssetsImagesGen { 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'); @@ -77,6 +80,22 @@ class $AssetsImagesFlipperGen { const AssetGenImage('assets/images/flipper/right.png'); } +class $AssetsImagesSpaceshipRampGen { + const $AssetsImagesSpaceshipRampGen(); + + /// 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_ramp/spaceship_railing_fg.png + AssetGenImage get spaceshipRailingFg => const AssetGenImage( + 'assets/images/spaceship_ramp/spaceship_railing_fg.png'); + + /// File path: assets/images/spaceship_ramp/spaceship_ramp.png + AssetGenImage get spaceshipRamp => + const AssetGenImage('assets/images/spaceship_ramp/spaceship_ramp.png'); +} + class $AssetsImagesDashBumperAGen { const $AssetsImagesDashBumperAGen(); diff --git a/packages/pinball_components/lib/src/components/components.dart b/packages/pinball_components/lib/src/components/components.dart index bbb2c29c..c7d1ae93 100644 --- a/packages/pinball_components/lib/src/components/components.dart +++ b/packages/pinball_components/lib/src/components/components.dart @@ -13,3 +13,4 @@ export 'layer.dart'; export 'ramp_opening.dart'; export 'shapes/shapes.dart'; export 'spaceship.dart'; +export 'spaceship_entrance_ramp.dart'; diff --git a/lib/game/components/spaceship_entrance_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_entrance_ramp.dart similarity index 94% rename from lib/game/components/spaceship_entrance_ramp.dart rename to packages/pinball_components/lib/src/components/spaceship_entrance_ramp.dart index 2f8e56ae..1133adbc 100644 --- a/lib/game/components/spaceship_entrance_ramp.dart +++ b/packages/pinball_components/lib/src/components/spaceship_entrance_ramp.dart @@ -1,20 +1,20 @@ -// ignore_for_file: public_member_api_docs, avoid_renaming_method_parameters +// ignore_for_file: avoid_renaming_method_parameters, comment_references import 'dart:math' as math; import 'package:flame/components.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:pinball/game/game.dart'; -import 'package:pinball/gen/assets.gen.dart'; +import 'package:pinball_components/gen/assets.gen.dart'; import 'package:pinball_components/pinball_components.dart' hide Assets; /// {@template spaceship_entrance_ramp} -/// A [Blueprint] which creates the [SpaceshipRamp]. +/// A [Blueprint] which creates the [_SpaceshipRamp]. /// {@endtemplate} class SpaceshipEntranceRamp extends Forge2DBlueprint { /// {@macro spaceship_entrance_ramp} SpaceshipEntranceRamp(); + /// Base priority for wall while be in the ramp. static const int ballPriorityInsideRamp = 4; @override @@ -116,7 +116,7 @@ class _SpaceshipRamp extends BodyComponent with InitialPosition, Layered { Future _loadSprites() async { final spriteRamp = await gameRef.loadSprite( - Assets.images.components.spaceshipRamp.path, + Assets.images.spaceshipRamp.spaceshipRamp.keyName, ); final spriteRampComponent = SpriteComponent( @@ -127,7 +127,7 @@ class _SpaceshipRamp extends BodyComponent with InitialPosition, Layered { ); final spriteRailingBg = await gameRef.loadSprite( - Assets.images.components.spaceshipRailingBg.path, + Assets.images.spaceshipRamp.spaceshipRailingBg.keyName, ); final spriteRailingBgComponent = SpriteComponent( sprite: spriteRailingBg, @@ -200,7 +200,7 @@ class _SpaceshipRampForegroundRailing extends BodyComponent Future _loadSprites() async { final spriteRailingFg = await gameRef.loadSprite( - Assets.images.components.spaceshipRailingFg.path, + Assets.images.spaceshipRamp.spaceshipRailingFg.keyName, ); final spriteRailingFgComponent = SpriteComponent( sprite: spriteRailingFg, diff --git a/packages/pinball_components/pubspec.yaml b/packages/pinball_components/pubspec.yaml index 8fc9c6f8..db3347cb 100644 --- a/packages/pinball_components/pubspec.yaml +++ b/packages/pinball_components/pubspec.yaml @@ -32,6 +32,7 @@ flutter: - assets/images/dash_bumper/a/ - assets/images/dash_bumper/b/ - assets/images/dash_bumper/main/ + - assets/images/spaceship_ramp/ flutter_gen: line_length: 80