diff --git a/lib/game/components/ball.dart b/lib/game/components/ball.dart index f8b24526..b2cd76d8 100644 --- a/lib/game/components/ball.dart +++ b/lib/game/components/ball.dart @@ -9,6 +9,11 @@ import 'package:pinball/game/game.dart'; class Ball extends BodyComponent with InitialPosition, Layered { /// {@macro ball} Ball() { + // TODO(ruimiguel): while developing Ball can be launched by clicking mouse, + //and default layer is Layer.all. But on final game Ball will be always be + //be launched from Plunger and LauncherRamp will modify it to Layer.board. + //We need to see what happens if Ball appears from other place like nest + //bumper, it will need to explicit change layer to Layer.board then. layer = Layer.board; } diff --git a/lib/game/components/ramp_opening.dart b/lib/game/components/ramp_opening.dart index e0c95997..9d5286cd 100644 --- a/lib/game/components/ramp_opening.dart +++ b/lib/game/components/ramp_opening.dart @@ -1,4 +1,5 @@ // ignore_for_file: avoid_renaming_method_parameters + import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; import 'package:pinball/game/game.dart'; diff --git a/test/game/components/ball_test.dart b/test/game/components/ball_test.dart index 82e3672e..47e87e1f 100644 --- a/test/game/components/ball_test.dart +++ b/test/game/components/ball_test.dart @@ -72,13 +72,14 @@ void main() { ); flameTester.test( - 'has all as default filter maskBits', + 'has Layer.all as default filter maskBits', (game) async { final ball = Ball(); await game.ensureAdd(ball); + await ball.mounted; final fixture = ball.body.fixtures[0]; - expect(fixture.filterData.maskBits, equals(Layer.all.maskBits)); + expect(fixture.filterData.maskBits, equals(Layer.board.maskBits)); }, ); }); @@ -149,29 +150,5 @@ void main() { }, ); }); - - group('setLayer', () { - final flameTester = FlameTester(PinballGameTest.create); - - flameTester.test( - 'modifies layer correctly', - (game) async { - const newLayer = Layer.jetpack; - - final ball = Ball(); - await game.ensureAdd(ball); - - final fixture = ball.body.fixtures[0]; - - expect(fixture.filterData.categoryBits, equals(1)); - expect(fixture.filterData.maskBits, equals(Layer.all.maskBits)); - - ball.layer = newLayer; - - expect(fixture.filterData.categoryBits, equals(newLayer.maskBits)); - expect(fixture.filterData.maskBits, equals(newLayer.maskBits)); - }, - ); - }); }); } diff --git a/test/game/components/layer_test.dart b/test/game/components/layer_test.dart index eba04f6a..3aacdb49 100644 --- a/test/game/components/layer_test.dart +++ b/test/game/components/layer_test.dart @@ -16,6 +16,7 @@ class TestBodyComponent extends BodyComponent with Layered { void main() { final flameTester = FlameTester(Forge2DGame.new); + group('Layered', () { void _expectLayerOnFixtures({ required List fixtures, diff --git a/test/game/components/pathway_test.dart b/test/game/components/pathway_test.dart index 9be6935b..bf3102a7 100644 --- a/test/game/components/pathway_test.dart +++ b/test/game/components/pathway_test.dart @@ -10,7 +10,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.create); + final flameTester = FlameTester(Forge2DGame.new); group('Pathway', () { const width = 50.0; diff --git a/test/game/components/ramp_opening_test.dart b/test/game/components/ramp_opening_test.dart index a5bfbd9f..5163ebe0 100644 --- a/test/game/components/ramp_opening_test.dart +++ b/test/game/components/ramp_opening_test.dart @@ -67,7 +67,7 @@ void main() { }, ); - group('fixture', () { + group('first fixture', () { const pathwayLayer = Layer.jetpack; const openingLayer = Layer.opening;