mirror of https://github.com/flutter/pinball.git
refactor: `Plunger` controls (#152)
* feat: added plunger asset and move * feat: fixed plunger assets and position * fix: set limits to plunger compression correctly * chore: unused import * fix: placed plunger correctly * test: refactor test game * refactor: changed spawnBall initialPosition * chore: plunger golden test * refactor: moved plunger to pinball_components * feat: plunger story * refactor: plunger assets preload * chore: assets for plunger * refactor: added key events to plunger game * refactor: make pull and release public to call from outside plunger * chore: update to retry tests * refactor: added Traceable to Plunger sandbox story * refactor: add Traceable * fix: removed body from PlungerAnchor * refactor: removed keyevents from plunger * test: plunger tests refactored without keyevents * refactor: removed unused keyevents * refactor: plunger spritecomponent * refactor: keyevents to gamecontroller * feat: added plunger controller * test: tests for plunger controller * test: tested plunger controller * fix: assets gen * chore: removed export from barrel * refactor: removed unnecessary keyhandler * refactor: sprite size * test: anchor at setup * refactor: plunger const keys * Update lib/game/components/controlled_plunger.dart Co-authored-by: Alejandro Santiago <dev@alestiago.com> Co-authored-by: Alejandro Santiago <dev@alestiago.com>pull/183/head
Rui Miguel Alonso
3 years ago
committed by
GitHub
parent
59c7c8b0ff
commit
bf0596846b
@ -0,0 +1,49 @@
|
||||
import 'package:flame/components.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:pinball/flame/flame.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
|
||||
/// {@template controlled_plunger}
|
||||
/// A [Plunger] with a [PlungerController] attached.
|
||||
/// {@endtemplate}
|
||||
class ControlledPlunger extends Plunger with Controls<PlungerController> {
|
||||
/// {@macro controlled_plunger}
|
||||
ControlledPlunger({required double compressionDistance})
|
||||
: super(compressionDistance: compressionDistance) {
|
||||
controller = PlungerController(this);
|
||||
}
|
||||
}
|
||||
|
||||
/// {@template plunger_controller}
|
||||
/// A [ComponentController] that controls a [Plunger]s movement.
|
||||
/// {@endtemplate}
|
||||
class PlungerController extends ComponentController<Plunger>
|
||||
with KeyboardHandler {
|
||||
/// {@macro plunger_controller}
|
||||
PlungerController(Plunger plunger) : super(plunger);
|
||||
|
||||
/// The [LogicalKeyboardKey]s that will control the [Flipper].
|
||||
///
|
||||
/// [onKeyEvent] method listens to when one of these keys is pressed.
|
||||
static const List<LogicalKeyboardKey> _keys = [
|
||||
LogicalKeyboardKey.arrowDown,
|
||||
LogicalKeyboardKey.space,
|
||||
LogicalKeyboardKey.keyS,
|
||||
];
|
||||
|
||||
@override
|
||||
bool onKeyEvent(
|
||||
RawKeyEvent event,
|
||||
Set<LogicalKeyboardKey> keysPressed,
|
||||
) {
|
||||
if (!_keys.contains(event.logicalKey)) return true;
|
||||
|
||||
if (event is RawKeyDownEvent) {
|
||||
component.pull();
|
||||
} else if (event is RawKeyUpEvent) {
|
||||
component.release();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 11 KiB |
@ -0,0 +1,54 @@
|
||||
import 'package:flame/input.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
import 'package:sandbox/common/common.dart';
|
||||
import 'package:sandbox/stories/ball/basic_ball_game.dart';
|
||||
|
||||
class PlungerGame extends BasicBallGame with KeyboardEvents, Traceable {
|
||||
PlungerGame() : super(color: const Color(0xFFFF0000));
|
||||
|
||||
static const info = '''
|
||||
Shows how Plunger is rendered.
|
||||
|
||||
- Activate the "trace" parameter to overlay the body.
|
||||
- Tap anywhere on the screen to spawn a ball into the game.
|
||||
''';
|
||||
|
||||
static const _downKeys = [
|
||||
LogicalKeyboardKey.arrowDown,
|
||||
LogicalKeyboardKey.space,
|
||||
];
|
||||
|
||||
late Plunger plunger;
|
||||
|
||||
@override
|
||||
Future<void> onLoad() async {
|
||||
await super.onLoad();
|
||||
|
||||
final center = screenToWorld(camera.viewport.canvasSize! / 2);
|
||||
|
||||
plunger = Plunger(compressionDistance: 29)
|
||||
..initialPosition = Vector2(center.x - (Kicker.size.x * 2), center.y);
|
||||
await add(plunger);
|
||||
|
||||
await traceAllBodies();
|
||||
}
|
||||
|
||||
@override
|
||||
KeyEventResult onKeyEvent(
|
||||
RawKeyEvent event,
|
||||
Set<LogicalKeyboardKey> keysPressed,
|
||||
) {
|
||||
final movedPlungerDown = _downKeys.contains(event.logicalKey);
|
||||
if (movedPlungerDown) {
|
||||
if (event is RawKeyDownEvent) {
|
||||
plunger.pull();
|
||||
} else if (event is RawKeyUpEvent) {
|
||||
plunger.release();
|
||||
}
|
||||
return KeyEventResult.handled;
|
||||
}
|
||||
return KeyEventResult.ignored;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
import 'package:dashbook/dashbook.dart';
|
||||
import 'package:flame/game.dart';
|
||||
import 'package:sandbox/common/common.dart';
|
||||
import 'package:sandbox/stories/plunger/plunger_game.dart';
|
||||
|
||||
void addPlungerStories(Dashbook dashbook) {
|
||||
dashbook.storiesOf('Plunger').add(
|
||||
'Basic',
|
||||
(context) => GameWidget(
|
||||
game: PlungerGame()..trace = context.boolProperty('Trace', true),
|
||||
),
|
||||
codeLink: buildSourceLink('plunger_game/basic.dart'),
|
||||
info: PlungerGame.info,
|
||||
);
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
import 'dart:collection';
|
||||
|
||||
import 'package:flame_forge2d/flame_forge2d.dart';
|
||||
import 'package:flame_test/flame_test.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:pinball/game/game.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
|
||||
import '../../helpers/helpers.dart';
|
||||
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
final flameTester = FlameTester(EmptyPinballGameTest.new);
|
||||
|
||||
group('PlungerController', () {
|
||||
group('onKeyEvent', () {
|
||||
final downKeys = UnmodifiableListView([
|
||||
LogicalKeyboardKey.arrowDown,
|
||||
LogicalKeyboardKey.space,
|
||||
LogicalKeyboardKey.keyS,
|
||||
]);
|
||||
|
||||
late Plunger plunger;
|
||||
late PlungerController controller;
|
||||
|
||||
setUp(() {
|
||||
plunger = Plunger(compressionDistance: 10);
|
||||
controller = PlungerController(plunger);
|
||||
plunger.add(controller);
|
||||
});
|
||||
|
||||
testRawKeyDownEvents(downKeys, (event) {
|
||||
flameTester.test(
|
||||
'moves down '
|
||||
'when ${event.logicalKey.keyLabel} is pressed',
|
||||
(game) async {
|
||||
await game.ensureAdd(plunger);
|
||||
controller.onKeyEvent(event, {});
|
||||
|
||||
expect(plunger.body.linearVelocity.y, isNegative);
|
||||
expect(plunger.body.linearVelocity.x, isZero);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
testRawKeyUpEvents(downKeys, (event) {
|
||||
flameTester.test(
|
||||
'moves up '
|
||||
'when ${event.logicalKey.keyLabel} is released '
|
||||
'and plunger is below its starting position',
|
||||
(game) async {
|
||||
await game.ensureAdd(plunger);
|
||||
plunger.body.setTransform(Vector2(0, -1), 0);
|
||||
controller.onKeyEvent(event, {});
|
||||
|
||||
expect(plunger.body.linearVelocity.y, isPositive);
|
||||
expect(plunger.body.linearVelocity.x, isZero);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
testRawKeyUpEvents(downKeys, (event) {
|
||||
flameTester.test(
|
||||
'does not move when ${event.logicalKey.keyLabel} is released '
|
||||
'and plunger is in its starting position',
|
||||
(game) async {
|
||||
await game.ensureAdd(plunger);
|
||||
controller.onKeyEvent(event, {});
|
||||
|
||||
expect(plunger.body.linearVelocity.y, isZero);
|
||||
expect(plunger.body.linearVelocity.x, isZero);
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
Loading…
Reference in new issue