msb-public
/
pinball
mirror of https://github.com/flutter/pinball.git
1
0
Code Issues Projects Releases Wiki Activity

feat: applied Plunger behaviours depending on platfotm

Browse Source
pull/434/head
alestiago 3 years ago
parent 0d2acbf987
commit 4ef2140e09
5 changed files with 236 additions and 42 deletions
Show Stats Download Patch File Download Diff File

34
lib/game/components/game_bloc_status_listener.dart
Unescape View File

@ -5,6 +5,7 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
import 'package:platform_helper/platform_helper.dart';
/// Listens to the [GameBloc] and updates the game accordingly.
class GameBlocStatusListener extends Component
@ -53,11 +54,36 @@ class GameBlocStatusListener extends Component
}
}
void _addPlungerKeyControls(Plunger plunger) =>
plunger.add(PlungerKeyControllingBehavior());
void _addPlungerKeyControls(Plunger plunger) {
final platformHelper = readProvider<PlatformHelper>();
const pullingStrength = 7.0;
final provider =
plunger.firstChild<FlameBlocProvider<PlungerCubit, PlungerState>>()!;
void _removePlungerKeyControls(Plunger plunger) =>
plunger.remove(PlungerKeyControllingBehavior());
if (platformHelper.isMobile) {
provider.add(
PlungerAutoPullingBehavior(strength: pullingStrength),
);
} else {
provider.addAll(
[
PlungerKeyControllingBehavior(),
PlungerPullingBehavior(strength: 7),
],
);
}
}
void _removePlungerKeyControls(Plunger plunger) {
plunger
.descendants()
.whereType<PlungerPullingBehavior>()
.forEach(plunger.remove);
plunger
.descendants()
.whereType<PlungerKeyControllingBehavior>()
.forEach(plunger.remove);
}
void _addFlipperKeyControls(Flipper flipper) => flipper
..add(FlipperKeyControllingBehavior())

2
packages/pinball_components/lib/src/components/plunger/behaviors/plunger_key_controlling_behavior.dart
Unescape View File

@ -6,7 +6,7 @@ import 'package:pinball_components/pinball_components.dart';
/// Allows controlling the [Plunger]'s movement with keyboard input.
class PlungerKeyControllingBehavior extends Component
with KeyboardHandler, FlameBlocReader<PlungerCubit, PlungerState> {
/// The [LogicalKeyboardKey]s that will control the [Flipper].
/// The [LogicalKeyboardKey]s that will control the [Plunger].
///
/// [onKeyEvent] method listens to when one of these keys is pressed.
static const List<LogicalKeyboardKey> _keys = [

2
packages/pinball_components/lib/src/components/plunger/plunger.dart
Unescape View File

@ -24,8 +24,8 @@ class Plunger extends BodyComponent with InitialPosition, Layered, ZIndex {
create: PlungerCubit.new,
children: [
_PlungerSpriteAnimationGroupComponent(),
PlungerPullingBehavior(strength: 7),
PlungerReleasingBehavior(strength: 11),
PlungerNoiseBehavior(),
],
),
PlungerJointingBehavior(compressionDistance: 9.2),

63
packages/pinball_components/test/src/components/plunger/plunger_test.dart
Unescape View File

@ -26,6 +26,44 @@ void main() {
},
);
group('adds', () {
flameTester.test(
'a PlungerReleasingBehavior',
(game) async {
final plunger = Plunger();
await game.ensureAdd(plunger);
expect(
game.descendants().whereType<PlungerReleasingBehavior>().length,
equals(1),
);
},
);
flameTester.test(
'a PlungerJointingBehavior',
(game) async {
final plunger = Plunger();
await game.ensureAdd(plunger);
expect(
game.descendants().whereType<PlungerJointingBehavior>().length,
equals(1),
);
},
);
flameTester.test(
'a PlungerNoiseBehavior',
(game) async {
final plunger = Plunger();
await game.ensureAdd(plunger);
expect(
game.descendants().whereType<PlungerNoiseBehavior>().length,
equals(1),
);
},
);
});
group('renders correctly', () {
const goldenPath = '../golden/plunger/';
flameTester.testGameWidget(
@ -74,30 +112,5 @@ void main() {
},
);
});
// group('body', () {
// test('is dynamic', () {
// final body = Plunger.test().createBody();
// expect(body.bodyType, equals(BodyType.dynamic));
// });
// test('ignores gravity', () {
// final body = Plunger().createBody();
// expect(body.gravityScale, equals(Vector2.zero()));
// });
// });
// group('fixture', () {
// test('exists', () async {
// final body = Plunger().createBody();
// expect(body.fixtures[0], isA<Fixture>());
// });
// test('has density', () {
// final body = Plunger().createBody();
// final fixture = body.fixtures[0];
// expect(fixture.density, greaterThan(0));
// });
// });
});
}

177
test/game/components/game_bloc_status_listener_test.dart
Unescape View File

@ -36,6 +36,7 @@ class _TestGame extends Forge2DGame with HasTappables {
Future<void> pump(
Iterable<Component> children, {
PinballAudioPlayer? pinballAudioPlayer,
PlatformHelper? platformHelper,
}) async {
return ensureAdd(
FlameMultiBlocProvider(
@ -57,7 +58,7 @@ class _TestGame extends Forge2DGame with HasTappables {
_MockAppLocalizations(),
),
FlameProvider<PlatformHelper>.value(
_MockPlatformHelper(),
platformHelper ?? PlatformHelper(),
),
],
children: children,
@ -75,10 +76,9 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
class _MockShareRepository extends Mock implements ShareRepository {}
class _MockPlatformHelper extends Mock implements PlatformHelper {
@override
bool get isMobile => false;
}
class _MockPlatformHelper extends Mock implements PlatformHelper {}
class _MockPlungerCubit extends Mock implements PlungerCubit {}
class _MockAppLocalizations extends Mock implements AppLocalizations {
@override
@ -196,7 +196,6 @@ void main() {
await flipper.ensureAdd(behavior);
expect(state.status, GameStatus.gameOver);
component.onNewState(state);
await game.ready();
@ -219,13 +218,18 @@ void main() {
entries: const [],
);
final plunger = Plunger.test();
final behavior = PlungerKeyControllingBehavior();
await game.pump(
[component, backbox, plunger],
);
await game.pump([component, backbox, plunger]);
await plunger.ensureAdd(behavior);
await plunger.ensureAdd(
FlameBlocProvider<PlungerCubit, PlungerState>(
create: PlungerCubit.new,
children: [PlungerKeyControllingBehavior()],
),
);
expect(state.status, GameStatus.gameOver);
component.onNewState(state);
await game.ready();
@ -236,6 +240,43 @@ void main() {
},
);
flameTester.test(
'removes PlungerPullingBehavior from Plunger',
(game) async {
final component = GameBlocStatusListener();
final leaderboardRepository = _MockLeaderboardRepository();
final shareRepository = _MockShareRepository();
final backbox = Backbox(
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
entries: const [],
);
final plunger = Plunger.test();
await game.pump(
[component, backbox, plunger],
);
await plunger.ensureAdd(
FlameBlocProvider<PlungerCubit, PlungerState>(
create: PlungerCubit.new,
children: [
PlungerPullingBehavior(strength: 0),
PlungerAutoPullingBehavior(strength: 0)
],
),
);
expect(state.status, GameStatus.gameOver);
component.onNewState(state);
await game.ready();
expect(
plunger.children.whereType<PlungerPullingBehavior>(),
isEmpty,
);
},
);
flameTester.test(
'plays the game over voice over',
(game) async {
@ -292,7 +333,7 @@ void main() {
);
flameTester.test(
'adds key controlling behavior to Flippers when the game is started',
'adds FlipperKeyControllingBehavior to Flippers',
(game) async {
final component = GameBlocStatusListener();
final leaderboardRepository = _MockLeaderboardRepository();
@ -317,6 +358,120 @@ void main() {
);
},
);
flameTester.test(
'adds PlungerKeyControllingBehavior to Plunger when on desktop',
(game) async {
final platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenReturn(false);
final component = GameBlocStatusListener();
final leaderboardRepository = _MockLeaderboardRepository();
final shareRepository = _MockShareRepository();
final backbox = Backbox(
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
entries: const [],
);
final plunger = Plunger.test();
await game.pump(
[component, backbox, plunger],
platformHelper: platformHelper,
);
await plunger.ensureAdd(
FlameBlocProvider<PlungerCubit, PlungerState>(
create: _MockPlungerCubit.new,
),
);
expect(state.status, GameStatus.playing);
component.onNewState(state);
await game.ready();
expect(
plunger
.descendants()
.whereType<PlungerKeyControllingBehavior>()
.length,
equals(1),
);
},
);
flameTester.test(
'adds PlungerPullingBehavior to Plunger when on desktop',
(game) async {
final platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenReturn(false);
final component = GameBlocStatusListener();
final leaderboardRepository = _MockLeaderboardRepository();
final shareRepository = _MockShareRepository();
final backbox = Backbox(
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
entries: const [],
);
final plunger = Plunger.test();
await game.pump(
[component, backbox, plunger],
platformHelper: platformHelper,
);
await plunger.ensureAdd(
FlameBlocProvider<PlungerCubit, PlungerState>(
create: _MockPlungerCubit.new,
),
);
expect(state.status, GameStatus.playing);
component.onNewState(state);
await game.ready();
expect(
plunger.descendants().whereType<PlungerPullingBehavior>().length,
equals(1),
);
},
);
flameTester.test(
'adds PlungerAutoPullingBehavior to Plunger when on mobile',
(game) async {
final platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenReturn(true);
final component = GameBlocStatusListener();
final leaderboardRepository = _MockLeaderboardRepository();
final shareRepository = _MockShareRepository();
final backbox = Backbox(
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
entries: const [],
);
final plunger = Plunger.test();
await game.pump(
[component, backbox, plunger],
platformHelper: platformHelper,
);
await plunger.ensureAdd(
FlameBlocProvider<PlungerCubit, PlungerState>(
create: _MockPlungerCubit.new,
),
);
expect(state.status, GameStatus.playing);
component.onNewState(state);
await game.ready();
expect(
plunger
.descendants()
.whereType<PlungerAutoPullingBehavior>()
.length,
equals(1),
);
},
);
});
});
});

Write Preview
Loading…
Cancel
Save