diff --git a/assets/images/components/spaceship/android-bottom.png b/assets/images/components/spaceship/android-bottom.png deleted file mode 100644 index 90dfdc01..00000000 Binary files a/assets/images/components/spaceship/android-bottom.png and /dev/null differ diff --git a/assets/images/components/spaceship/android-top.png b/assets/images/components/spaceship/android-top.png deleted file mode 100644 index 92c99db7..00000000 Binary files a/assets/images/components/spaceship/android-top.png and /dev/null differ diff --git a/assets/images/components/spaceship/lower.png b/assets/images/components/spaceship/lower.png deleted file mode 100644 index 1f0d9b10..00000000 Binary files a/assets/images/components/spaceship/lower.png and /dev/null differ diff --git a/assets/images/components/spaceship/saucer.png b/assets/images/components/spaceship/saucer.png deleted file mode 100644 index 93af98b5..00000000 Binary files a/assets/images/components/spaceship/saucer.png and /dev/null differ diff --git a/assets/images/components/spaceship/upper.png b/assets/images/components/spaceship/upper.png deleted file mode 100644 index 0e03cec8..00000000 Binary files a/assets/images/components/spaceship/upper.png and /dev/null differ diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 47e41393..f597a066 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -11,10 +11,6 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.flipper.left.keyName), images.load(components.Assets.images.flipper.right.keyName), images.load(Assets.images.components.background.path), - images.load(Assets.images.components.spaceship.androidTop.path), - images.load(Assets.images.components.spaceship.androidBottom.path), - images.load(Assets.images.components.spaceship.lower.path), - images.load(Assets.images.components.spaceship.upper.path), ]); } } diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index 2f946602..4a93da99 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -9,9 +9,8 @@ import 'package:flame_bloc/flame_bloc.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/pinball_components.dart' hide Assets; import 'package:pinball_theme/pinball_theme.dart' hide Assets; -import 'package:pinball_components/pinball_components.dart'; -import 'package:pinball_theme/pinball_theme.dart'; class PinballGame extends Forge2DGame with FlameBloc, HasKeyboardHandlerComponents { diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index c7b9a5c6..370d8fcf 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -17,23 +17,6 @@ class $AssetsImagesComponentsGen { AssetGenImage get background => const AssetGenImage('assets/images/components/background.png'); - $AssetsImagesComponentsSpaceshipGen get spaceship => - const $AssetsImagesComponentsSpaceshipGen(); -} - -class $AssetsImagesComponentsSpaceshipGen { - const $AssetsImagesComponentsSpaceshipGen(); - - AssetGenImage get androidBottom => const AssetGenImage( - 'assets/images/components/spaceship/android-bottom.png'); - AssetGenImage get androidTop => - const AssetGenImage('assets/images/components/spaceship/android-top.png'); - AssetGenImage get lower => - const AssetGenImage('assets/images/components/spaceship/lower.png'); - AssetGenImage get saucer => - const AssetGenImage('assets/images/components/spaceship/saucer.png'); - AssetGenImage get upper => - const AssetGenImage('assets/images/components/spaceship/upper.png'); } class Assets { diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index e8bd6105..bbf6a227 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -3,36 +3,26 @@ /// FlutterGen /// ***************************************************** -// ignore_for_file: directives_ordering,unnecessary_import - import 'package:flutter/widgets.dart'; class $AssetsImagesGen { const $AssetsImagesGen(); - /// File path: assets/images/ball.png AssetGenImage get ball => const AssetGenImage('assets/images/ball.png'); -<<<<<<< HEAD - $AssetsImagesFlipperGen get flipper => const $AssetsImagesFlipperGen(); + AssetGenImage get spaceshipBridge => + const AssetGenImage('assets/images/spaceship_bridge.png'); + AssetGenImage get spaceshipSaucer => + const AssetGenImage('assets/images/spaceship_saucer.png'); } class $AssetsImagesFlipperGen { const $AssetsImagesFlipperGen(); - /// File path: assets/images/flipper/left.png AssetGenImage get left => const AssetGenImage('assets/images/flipper/left.png'); - - /// File path: assets/images/flipper/right.png AssetGenImage get right => const AssetGenImage('assets/images/flipper/right.png'); -======= - AssetGenImage get spaceshipBridge => - const AssetGenImage('assets/images/spaceship_bridge.png'); - AssetGenImage get spaceshipSaucer => - const AssetGenImage('assets/images/spaceship_saucer.png'); ->>>>>>> 990de50 (feat: applying assets to the spaceship) } class Assets { diff --git a/pubspec.yaml b/pubspec.yaml index 1efe9281..d2b520a9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,7 +43,6 @@ flutter: assets: - assets/images/components/ - - assets/images/components/spaceship/ flutter_gen: line_length: 80