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

refactor: renamed behaviours

Browse Source
pull/234/head
alestiago 3 years ago
parent cf8727e8d8
commit 99689ea4da
15 changed files with 82 additions and 133 deletions
Show Stats Download Patch File Download Diff File

2
lib/game/components/google_word/behaviors/behaviors.dart
Unescape View File

@ -1 +1 @@
export 'bonus_behaviour.dart';
export 'google_word_bonus_behaviour.dart';

17
lib/game/components/google_word/behaviors/bonus_behaviour.dart → lib/game/components/google_word/behaviors/google_word_bonus_behaviour.dart
Unescape View File

@ -3,21 +3,18 @@ import 'dart:async';
import 'package:flame/components.dart';
import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class BonusBehaviour extends Component with HasGameRef<PinballGame> {
BonusBehaviour(
Iterable<GoogleLetter> googleLetters,
) : _googleLetters = googleLetters;
Iterable<GoogleLetter> _googleLetters;
class GoogleWordBonusBehaviour extends Component
with HasGameRef<PinballGame>, ParentIsA<GoogleWord> {
@override
Future<void> onLoad() async {
await super.onLoad();
final googleLetters = parent.children.whereType<GoogleLetter>();
for (final letter in _googleLetters) {
for (final letter in googleLetters) {
letter.bloc.stream.listen((_) {
final achievedBonus = _googleLetters
final achievedBonus = googleLetters
.every((letter) => letter.bloc.state == GoogleLetterState.active);
if (achievedBonus) {
@ -25,7 +22,7 @@ class BonusBehaviour extends Component with HasGameRef<PinballGame> {
gameRef
.read<GameBloc>()
.add(const BonusActivated(GameBonus.googleWord));
for (final letter in _googleLetters) {
for (final letter in googleLetters) {
letter.bloc.onReset();
}
}

30
lib/game/components/google_word/google_word.dart
Unescape View File

@ -4,35 +4,29 @@ import 'dart:async';
import 'package:flame/components.dart';
import 'package:pinball/game/components/google_word/behaviors/behaviors.dart';
import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart';
/// {@template google_word}
/// Loads all [GoogleLetter]s to compose a [GoogleWord].
/// {@endtemplate}
class GoogleWord extends Component with HasGameRef<PinballGame> {
class GoogleWord extends Component {
/// {@macro google_word}
GoogleWord({
required Vector2 position,
}) : _position = position;
final Vector2 _position;
}) : super(
children: [
GoogleLetter(0)..initialPosition = position + Vector2(-12.92, 1.82),
GoogleLetter(1)..initialPosition = position + Vector2(-8.33, -0.65),
GoogleLetter(2)..initialPosition = position + Vector2(-2.88, -1.75),
GoogleLetter(3)..initialPosition = position + Vector2(2.88, -1.75),
GoogleLetter(4)..initialPosition = position + Vector2(8.33, -0.65),
GoogleLetter(5)..initialPosition = position + Vector2(12.92, 1.82),
],
);
@override
Future<void> onLoad() async {
await super.onLoad();
final letters = [
GoogleLetter(0)..initialPosition = _position + Vector2(-12.92, 1.82),
GoogleLetter(1)..initialPosition = _position + Vector2(-8.33, -0.65),
GoogleLetter(2)..initialPosition = _position + Vector2(-2.88, -1.75),
GoogleLetter(3)..initialPosition = _position + Vector2(2.88, -1.75),
GoogleLetter(4)..initialPosition = _position + Vector2(8.33, -0.65),
GoogleLetter(5)..initialPosition = _position + Vector2(12.92, 1.82)
];
await addAll([
...letters,
BonusBehaviour(letters),
]);
await add(GoogleWordBonusBehaviour());
}
}

13
packages/pinball_components/lib/src/components/alien_bumper/behaviors/alien_bumper_ball_contact_behaviour.dart
Unescape View File

@ -0,0 +1,13 @@
import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class AlienBumperBallContactBehavior extends ContactBehavior<AlienBumper> {
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
if (other is! Ball) return;
parent.bloc.onBallContacted();
}
}

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

@ -1,2 +1,2 @@
export 'contact_behavior.dart';
export 'alien_bumper_ball_contact_behaviour.dart';
export 'sprite_behavior.dart';

33
packages/pinball_components/lib/src/components/alien_bumper/behaviors/contact_behavior.dart
Unescape View File

@ -1,33 +0,0 @@
import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class ContactBehavior extends Component
with ContactCallbacks, ParentIsA<AlienBumper> {
@override
Future<void> onLoad() async {
await super.onLoad();
// TODO(alestiago): Consider defining a generic ContactBehaviour to get
// rid of this repeated logic.
final userData = parent.body.userData;
if (userData is ContactCallbacksGroup) {
userData.addContactCallbacks(this);
} else if (userData is ContactCallbacks) {
final notifier = ContactCallbacksGroup()
..addContactCallbacks(userData)
..addContactCallbacks(this);
parent.body.userData = notifier;
} else {
parent.body.userData = this;
}
}
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
if (other is! Ball) return;
parent.bloc.onBallContacted();
}
}

3
packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_cubit.dart
Unescape View File

@ -7,9 +7,6 @@ class AlienBumperCubit extends Cubit<AlienBumperState> {
void onBallContacted() {
emit(AlienBumperState.inactive);
// Future<void>.delayed(const Duration(milliseconds: 500)).whenComplete(
// () => emit(AlienBumperState.active),
// );
}
void onAnimated() {

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

@ -1 +1 @@
export 'contact_behavior.dart';
export 'google_letter_ball_contact_behavior.dart';

33
packages/pinball_components/lib/src/components/google_letter/behaviors/contact_behavior.dart
Unescape View File

@ -1,33 +0,0 @@
import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class ContactBehavior extends Component
with ContactCallbacks, ParentIsA<GoogleLetter> {
@override
Future<void> onLoad() async {
await super.onLoad();
// TODO(alestiago): Consider defining a generic ContactBehaviour to get
// rid of this repeated logic.
final userData = parent.body.userData;
if (userData is ContactCallbacksGroup) {
userData.addContactCallbacks(this);
} else if (userData is ContactCallbacks) {
final notifier = ContactCallbacksGroup()
..addContactCallbacks(userData)
..addContactCallbacks(this);
parent.body.userData = notifier;
} else {
parent.body.userData = this;
}
}
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
if (other is! Ball) return;
parent.bloc.onBallContacted();
}
}

12
packages/pinball_components/lib/src/components/google_letter/behaviors/google_letter_ball_contact_behavior.dart
Unescape View File

@ -0,0 +1,12 @@
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class GoogleLetterBallContactBehavior extends ContactBehavior<GoogleLetter> {
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
if (other is! Ball) return;
parent.bloc.onBallContacted();
}
}

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

@ -1,2 +1,2 @@
export 'contact_behavior.dart';
export 'sparky_bumper_ball_contact_behaviour.dart';
export 'sprite_behavior.dart';

31
packages/pinball_components/lib/src/components/sparky_bumper/behaviors/contact_behavior.dart
Unescape View File

@ -1,31 +0,0 @@
import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class ContactBehavior extends Component
with ContactCallbacks, ParentIsA<SparkyBumper> {
@override
Future<void> onLoad() async {
await super.onLoad();
final userData = parent.body.userData;
if (userData is ContactCallbacksGroup) {
userData.addContactCallbacks(this);
} else if (userData is ContactCallbacks) {
final notifier = ContactCallbacksGroup()
..addContactCallbacks(userData)
..addContactCallbacks(this);
parent.body.userData = notifier;
} else {
parent.body.userData = this;
}
}
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
if (other is! Ball) return;
parent.bloc.onBallContacted();
}
}

12
packages/pinball_components/lib/src/components/sparky_bumper/behaviors/sparky_bumper_ball_contact_behaviour.dart
Unescape View File

@ -0,0 +1,12 @@
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
class SparkyBumperBallContactBehavior extends ContactBehavior<SparkyBumper> {
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
if (other is! Ball) return;
parent.bloc.onBallContacted();
}
}

2
packages/pinball_flame/lib/pinball_flame.dart
Unescape View File

@ -2,7 +2,7 @@ library pinball_flame;
export 'src/blueprint.dart';
export 'src/component_controller.dart';
export 'src/contacts_callbacks_adder.dart';
export 'src/contact_behavior.dart';
export 'src/keyboard_input_controller.dart';
export 'src/parent_is_a.dart';
export 'src/sprite_animation.dart';

21
packages/pinball_flame/lib/src/contacts_callbacks_adder.dart → packages/pinball_flame/lib/src/contact_behavior.dart
Unescape View File

@ -1,5 +1,26 @@
import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart';
import 'package:pinball_flame/pinball_flame.dart';
class ContactBehavior<T extends BodyComponent> extends Component
with ContactCallbacks, ParentIsA<T> {
@override
@mustCallSuper
Future<void> onLoad() async {
final userData = parent.body.userData;
if (userData is ContactCallbacksGroup) {
userData.addContactCallbacks(this);
} else if (userData is ContactCallbacks) {
final notifier = ContactCallbacksGroup()
..addContactCallbacks(userData)
..addContactCallbacks(this);
parent.body.userData = notifier;
} else {
parent.body.userData = this;
}
}
}
class ContactCallbacksGroup implements ContactCallbacks {
final List<ContactCallbacks> _contactCallbacks = [];
Write Preview
Loading…
Cancel
Save