refactor: moved dino walls to pinball_components

pull/115/head
RuiAlonso 4 years ago
parent aa4021ba82
commit ea662c5c9b

@ -2,7 +2,6 @@ export 'board.dart';
export 'bonus_word.dart'; export 'bonus_word.dart';
export 'chrome_dino.dart'; export 'chrome_dino.dart';
export 'controlled_ball.dart'; export 'controlled_ball.dart';
export 'dino_wall.dart';
export 'flipper_controller.dart'; export 'flipper_controller.dart';
export 'flutter_forest.dart'; export 'flutter_forest.dart';
export 'jetpack_ramp.dart'; export 'jetpack_ramp.dart';

@ -13,9 +13,9 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.flipper.right.keyName), images.load(components.Assets.images.flipper.right.keyName),
images.load(components.Assets.images.baseboard.left.keyName), images.load(components.Assets.images.baseboard.left.keyName),
images.load(components.Assets.images.baseboard.right.keyName), images.load(components.Assets.images.baseboard.right.keyName),
images.load(components.Assets.images.dino.dinoLandTop.keyName),
images.load(components.Assets.images.dino.dinoLandBottom.keyName),
images.load(Assets.images.components.background.path), images.load(Assets.images.components.background.path),
images.load(Assets.images.components.dinoLandTop.path),
images.load(Assets.images.components.dinoLandBottom.path),
]); ]);
} }
} }

@ -66,12 +66,9 @@ class PinballGame extends Forge2DGame
Future<void> _addGameBoundaries() async { Future<void> _addGameBoundaries() async {
await add(BottomWall()); await add(BottomWall());
createBoundaries(this).forEach(add); createBoundaries(this).forEach(add);
await add( unawaited(addFromBlueprint(DinoWalls(
DinoTopWall()..initialPosition = Vector2(-2.4, 0), position: Vector2(-2.4, 0),
); )));
await add(
DinoBottomWall()..initialPosition = Vector2(-2.4, 0),
);
} }
Future<void> _addPlunger() async { Future<void> _addPlunger() async {

@ -20,14 +20,6 @@ class $AssetsImagesComponentsGen {
/// File path: assets/images/components/background.png /// File path: assets/images/components/background.png
AssetGenImage get background => AssetGenImage get background =>
const AssetGenImage('assets/images/components/background.png'); const AssetGenImage('assets/images/components/background.png');
/// File path: assets/images/components/dino-land-bottom.png
AssetGenImage get dinoLandBottom =>
const AssetGenImage('assets/images/components/dino-land-bottom.png');
/// File path: assets/images/components/dino-land-top.png
AssetGenImage get dinoLandTop =>
const AssetGenImage('assets/images/components/dino-land-top.png');
} }
class Assets { class Assets {

@ -14,7 +14,7 @@ class $AssetsImagesGen {
AssetGenImage get ball => const AssetGenImage('assets/images/ball.png'); AssetGenImage get ball => const AssetGenImage('assets/images/ball.png');
$AssetsImagesBaseboardGen get baseboard => const $AssetsImagesBaseboardGen(); $AssetsImagesBaseboardGen get baseboard => const $AssetsImagesBaseboardGen();
$AssetsImagesDinoGen get dino => const $AssetsImagesDinoGen();
$AssetsImagesFlipperGen get flipper => const $AssetsImagesFlipperGen(); $AssetsImagesFlipperGen get flipper => const $AssetsImagesFlipperGen();
/// File path: assets/images/flutter_sign_post.png /// File path: assets/images/flutter_sign_post.png
@ -42,6 +42,18 @@ class $AssetsImagesBaseboardGen {
const AssetGenImage('assets/images/baseboard/right.png'); const AssetGenImage('assets/images/baseboard/right.png');
} }
class $AssetsImagesDinoGen {
const $AssetsImagesDinoGen();
/// File path: assets/images/dino/dino-land-bottom.png
AssetGenImage get dinoLandBottom =>
const AssetGenImage('assets/images/dino/dino-land-bottom.png');
/// File path: assets/images/dino/dino-land-top.png
AssetGenImage get dinoLandTop =>
const AssetGenImage('assets/images/dino/dino-land-top.png');
}
class $AssetsImagesFlipperGen { class $AssetsImagesFlipperGen {
const $AssetsImagesFlipperGen(); const $AssetsImagesFlipperGen();

@ -2,6 +2,7 @@ export 'ball.dart';
export 'baseboard.dart'; export 'baseboard.dart';
export 'board_dimensions.dart'; export 'board_dimensions.dart';
export 'board_side.dart'; export 'board_side.dart';
export 'dino_walls.dart';
export 'fire_effect.dart'; export 'fire_effect.dart';
export 'flipper.dart'; export 'flipper.dart';
export 'flutter_sign_post.dart'; export 'flutter_sign_post.dart';

@ -1,12 +1,35 @@
// ignore_for_file: avoid_renaming_method_parameters import 'dart:async';
import 'dart: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/gen/assets.gen.dart'; import 'package:pinball_components/gen/assets.gen.dart';
import 'package:pinball_components/pinball_components.dart' hide Assets; import 'package:pinball_components/pinball_components.dart' hide Assets;
/// {@template spaceship}
/// A [Blueprint] which creates the spaceship feature.
/// {@endtemplate}
class DinoWalls extends Forge2DBlueprint {
/// {@macro spaceship}
DinoWalls({required this.position});
/// Total size of the spaceship.
static final size = Vector2(25, 19);
/// The [position] where the elements will be created
final Vector2 position;
@override
void build(_) {
addAll([
DinoTopWall()..initialPosition = position,
DinoBottomWall()..initialPosition = position,
]);
}
}
/// {@template dino_top_wall} /// {@template dino_top_wall}
/// Wall located above dino, at the right of the board. /// Wall segment located above [ChromeDino].
/// {@endtemplate} /// {@endtemplate}
class DinoTopWall extends BodyComponent with InitialPosition { class DinoTopWall extends BodyComponent with InitialPosition {
///{@macro dino_top_wall} ///{@macro dino_top_wall}
@ -96,25 +119,26 @@ class DinoTopWall extends BodyComponent with InitialPosition {
@override @override
Future<void> onLoad() async { Future<void> onLoad() async {
await super.onLoad(); await super.onLoad();
await _loadBackground(); await _loadSprite();
} }
Future<void> _loadBackground() async { Future<void> _loadSprite() async {
final sprite = await gameRef.loadSprite( final sprite = await gameRef.loadSprite(
Assets.images.components.dinoLandTop.path, Assets.images.dino.dinoLandTop.keyName,
); );
final spriteComponent = SpriteComponent( final spriteComponent = SpriteComponent(
sprite: sprite, sprite: sprite,
size: Vector2(10.6, 27.7), size: Vector2(10.6, 27.7),
anchor: Anchor.center, anchor: Anchor.center,
)..position = Vector2(27, -28.2); position: Vector2(27, -28.2),
);
await add(spriteComponent); await add(spriteComponent);
} }
} }
/// {@template dino_bottom_wall} /// {@template dino_bottom_wall}
/// Wall located below dino, at the right of the board. /// Wall segment located below [ChromeDino].
/// {@endtemplate} /// {@endtemplate}
class DinoBottomWall extends BodyComponent with InitialPosition { class DinoBottomWall extends BodyComponent with InitialPosition {
///{@macro dino_top_wall} ///{@macro dino_top_wall}
@ -196,12 +220,12 @@ class DinoBottomWall extends BodyComponent with InitialPosition {
@override @override
Future<void> onLoad() async { Future<void> onLoad() async {
await super.onLoad(); await super.onLoad();
await _loadBackground(); await _loadSprite();
} }
Future<void> _loadBackground() async { Future<void> _loadSprite() async {
final sprite = await gameRef.loadSprite( final sprite = await gameRef.loadSprite(
Assets.images.components.dinoLandBottom.path, Assets.images.dino.dinoLandBottom.keyName,
); );
final spriteComponent = SpriteComponent( final spriteComponent = SpriteComponent(
sprite: sprite, sprite: sprite,

@ -27,6 +27,7 @@ flutter:
assets: assets:
- assets/images/ - assets/images/
- assets/images/baseboard/ - assets/images/baseboard/
- assets/images/dino/
- assets/images/flipper/ - assets/images/flipper/
flutter_gen: flutter_gen:

@ -1,7 +1,7 @@
import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flame_test/flame_test.dart'; import 'package:flame_test/flame_test.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:pinball/game/components/components.dart'; import 'package:pinball_components/pinball_components.dart';
import '../../helpers/helpers.dart'; import '../../helpers/helpers.dart';
Loading…
Cancel
Save