From cb5659fc3423d447dd2b0854cb810745f9a75c23 Mon Sep 17 00:00:00 2001 From: alestiago Date: Tue, 29 Mar 2022 09:26:46 +0100 Subject: [PATCH] refactor: moved Background to DebugGame --- lib/game/components/background.dart | 27 --------------------------- lib/game/pinball_game.dart | 27 +++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 lib/game/components/background.dart diff --git a/lib/game/components/background.dart b/lib/game/components/background.dart deleted file mode 100644 index 8333fa4d..00000000 --- a/lib/game/components/background.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'package:flame/components.dart'; -import 'package:pinball/game/pinball_game.dart'; -import 'package:pinball/gen/assets.gen.dart'; - -class Background extends Component with HasGameRef { - static final Vector2 size = Vector2(120, 160); - - Future _loadSprite() async { - final sprite = await gameRef.loadSprite( - Assets.images.components.background.path, - ); - final spriteComponent = SpriteComponent( - sprite: sprite, - size: size, - anchor: Anchor.center, - )..position = Vector2(0, -7.8); - - await add(spriteComponent); - } - - @override - Future onLoad() async { - await super.onLoad(); - await _loadSprite(); - priority = -1; - } -} diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index 0733e226..dee41edb 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -2,14 +2,15 @@ import 'dart:async'; import 'dart:math' as math; +import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/input.dart'; import 'package:flame_bloc/flame_bloc.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball/flame/blueprint.dart'; -import 'package:pinball/game/components/background.dart'; import 'package:pinball/game/game.dart'; -import 'package:pinball_theme/pinball_theme.dart'; +import 'package:pinball/gen/assets.gen.dart'; +import 'package:pinball_theme/pinball_theme.dart' hide Assets; class PinballGame extends Forge2DGame with FlameBloc, HasKeyboardHandlerComponents { @@ -51,8 +52,6 @@ class PinballGame extends Forge2DGame camera ..followVector2(Vector2(0, -7.8)) ..zoom = size.y / 16; - - unawaited(add(Background())); } void _addContactCallbacks() { @@ -96,6 +95,26 @@ class PinballGame extends Forge2DGame class DebugPinballGame extends PinballGame with TapDetector { DebugPinballGame({required PinballTheme theme}) : super(theme: theme); + @override + Future onLoad() async { + await super.onLoad(); + await _loadBackground(); + } + + // TODO(alestiago): Remove once it is no longer needed. + Future _loadBackground() async { + final sprite = await loadSprite( + Assets.images.components.background.path, + ); + final spriteComponent = SpriteComponent( + sprite: sprite, + size: Vector2(120, 160), + anchor: Anchor.center, + )..position = Vector2(0, -7.8); + + await add(spriteComponent); + } + @override void onTapUp(TapUpInfo info) { addFromBlueprint(BallBlueprint(position: info.eventPosition.game));