refactor: moved spaceship entrance ramp and assets to pinball components

pull/129/head
RuiAlonso 4 years ago
parent 9e4946f430
commit 4463ec4ecc

@ -4,7 +4,6 @@ export 'chrome_dino.dart';
export 'controlled_ball.dart'; export 'controlled_ball.dart';
export 'controlled_flipper.dart'; export 'controlled_flipper.dart';
export 'flutter_forest.dart'; export 'flutter_forest.dart';
export 'spaceship_entrance_ramp.dart';
export 'kicker.dart'; export 'kicker.dart';
export 'launcher_ramp.dart'; export 'launcher_ramp.dart';
export 'plunger.dart'; export 'plunger.dart';

@ -21,10 +21,14 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.dashBumper.b.inactive.keyName), 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.active.keyName),
images.load(components.Assets.images.dashBumper.main.inactive.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.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), images.load(Assets.images.components.spaceshipDropTube.path),
]); ]);
} }

@ -24,18 +24,6 @@ class $AssetsImagesComponentsGen {
/// File path: assets/images/components/spaceship-drop-tube.png /// File path: assets/images/components/spaceship-drop-tube.png
AssetGenImage get spaceshipDropTube => AssetGenImage get spaceshipDropTube =>
const AssetGenImage('assets/images/components/spaceship-drop-tube.png'); 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 { class Assets {

@ -27,6 +27,9 @@ class $AssetsImagesGen {
AssetGenImage get spaceshipBridge => AssetGenImage get spaceshipBridge =>
const AssetGenImage('assets/images/spaceship_bridge.png'); const AssetGenImage('assets/images/spaceship_bridge.png');
$AssetsImagesSpaceshipRampGen get spaceshipRamp =>
const $AssetsImagesSpaceshipRampGen();
/// File path: assets/images/spaceship_saucer.png /// File path: assets/images/spaceship_saucer.png
AssetGenImage get spaceshipSaucer => AssetGenImage get spaceshipSaucer =>
const AssetGenImage('assets/images/spaceship_saucer.png'); const AssetGenImage('assets/images/spaceship_saucer.png');
@ -77,6 +80,22 @@ class $AssetsImagesFlipperGen {
const AssetGenImage('assets/images/flipper/right.png'); 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 { class $AssetsImagesDashBumperAGen {
const $AssetsImagesDashBumperAGen(); const $AssetsImagesDashBumperAGen();

@ -13,3 +13,4 @@ export 'layer.dart';
export 'ramp_opening.dart'; export 'ramp_opening.dart';
export 'shapes/shapes.dart'; export 'shapes/shapes.dart';
export 'spaceship.dart'; export 'spaceship.dart';
export '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 'dart:math' as math;
import 'package:flame/components.dart'; import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball_components/gen/assets.gen.dart';
import 'package:pinball/gen/assets.gen.dart';
import 'package:pinball_components/pinball_components.dart' hide Assets; import 'package:pinball_components/pinball_components.dart' hide Assets;
/// {@template spaceship_entrance_ramp} /// {@template spaceship_entrance_ramp}
/// A [Blueprint] which creates the [SpaceshipRamp]. /// A [Blueprint] which creates the [_SpaceshipRamp].
/// {@endtemplate} /// {@endtemplate}
class SpaceshipEntranceRamp extends Forge2DBlueprint { class SpaceshipEntranceRamp extends Forge2DBlueprint {
/// {@macro spaceship_entrance_ramp} /// {@macro spaceship_entrance_ramp}
SpaceshipEntranceRamp(); SpaceshipEntranceRamp();
/// Base priority for wall while be in the ramp.
static const int ballPriorityInsideRamp = 4; static const int ballPriorityInsideRamp = 4;
@override @override
@ -116,7 +116,7 @@ class _SpaceshipRamp extends BodyComponent with InitialPosition, Layered {
Future<void> _loadSprites() async { Future<void> _loadSprites() async {
final spriteRamp = await gameRef.loadSprite( final spriteRamp = await gameRef.loadSprite(
Assets.images.components.spaceshipRamp.path, Assets.images.spaceshipRamp.spaceshipRamp.keyName,
); );
final spriteRampComponent = SpriteComponent( final spriteRampComponent = SpriteComponent(
@ -127,7 +127,7 @@ class _SpaceshipRamp extends BodyComponent with InitialPosition, Layered {
); );
final spriteRailingBg = await gameRef.loadSprite( final spriteRailingBg = await gameRef.loadSprite(
Assets.images.components.spaceshipRailingBg.path, Assets.images.spaceshipRamp.spaceshipRailingBg.keyName,
); );
final spriteRailingBgComponent = SpriteComponent( final spriteRailingBgComponent = SpriteComponent(
sprite: spriteRailingBg, sprite: spriteRailingBg,
@ -200,7 +200,7 @@ class _SpaceshipRampForegroundRailing extends BodyComponent
Future<void> _loadSprites() async { Future<void> _loadSprites() async {
final spriteRailingFg = await gameRef.loadSprite( final spriteRailingFg = await gameRef.loadSprite(
Assets.images.components.spaceshipRailingFg.path, Assets.images.spaceshipRamp.spaceshipRailingFg.keyName,
); );
final spriteRailingFgComponent = SpriteComponent( final spriteRailingFgComponent = SpriteComponent(
sprite: spriteRailingFg, sprite: spriteRailingFg,

@ -32,6 +32,7 @@ flutter:
- assets/images/dash_bumper/a/ - assets/images/dash_bumper/a/
- assets/images/dash_bumper/b/ - assets/images/dash_bumper/b/
- assets/images/dash_bumper/main/ - assets/images/dash_bumper/main/
- assets/images/spaceship_ramp/
flutter_gen: flutter_gen:
line_length: 80 line_length: 80

Loading…
Cancel
Save