Rui Miguel Alonso
3 years ago
committed by
GitHub
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 825 KiB |
|
Before Width: | Height: | Size: 886 KiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 6.2 KiB |
@ -0,0 +1,38 @@
|
||||
import 'package:flame_forge2d/flame_forge2d.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
import 'package:sandbox/common/common.dart';
|
||||
import 'package:sandbox/stories/ball/basic_ball_game.dart';
|
||||
|
||||
class BaseboardGame extends BasicBallGame with Traceable {
|
||||
static const info = '''
|
||||
Shows how the Baseboards are rendered.
|
||||
|
||||
- Activate the "trace" parameter to overlay the body.
|
||||
- Tap anywhere on the screen to spawn a ball into the game.
|
||||
''';
|
||||
|
||||
@override
|
||||
Future<void> onLoad() async {
|
||||
await super.onLoad();
|
||||
|
||||
await images.loadAll([
|
||||
Assets.images.baseboard.left.keyName,
|
||||
Assets.images.baseboard.right.keyName,
|
||||
]);
|
||||
|
||||
final center = screenToWorld(camera.viewport.canvasSize! / 2);
|
||||
final leftBaseboard = Baseboard(side: BoardSide.left)
|
||||
..initialPosition = center - Vector2(25, 0)
|
||||
..priority = 1;
|
||||
final rightBaseboard = Baseboard(side: BoardSide.right)
|
||||
..initialPosition = center + Vector2(25, 0)
|
||||
..priority = 1;
|
||||
|
||||
await addAll([
|
||||
leftBaseboard,
|
||||
rightBaseboard,
|
||||
]);
|
||||
|
||||
await traceAllBodies();
|
||||
}
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
import 'package:flame_forge2d/flame_forge2d.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
import 'package:sandbox/common/common.dart';
|
||||
|
||||
class BasicBaseboardGame extends BasicGame {
|
||||
static const info = 'Shows how a Baseboard works.';
|
||||
|
||||
@override
|
||||
Future<void> onLoad() async {
|
||||
await super.onLoad();
|
||||
|
||||
final center = screenToWorld(camera.viewport.canvasSize! / 2);
|
||||
|
||||
final leftBaseboard = Baseboard(side: BoardSide.left)
|
||||
..initialPosition = center - Vector2(25, 0);
|
||||
final rightBaseboard = Baseboard(side: BoardSide.right)
|
||||
..initialPosition = center + Vector2(25, 0);
|
||||
|
||||
await addAll([
|
||||
leftBaseboard,
|
||||
rightBaseboard,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@ -1,15 +1,15 @@
|
||||
import 'package:dashbook/dashbook.dart';
|
||||
import 'package:flame/game.dart';
|
||||
import 'package:sandbox/common/common.dart';
|
||||
import 'package:sandbox/stories/baseboard/basic_baseboard_game.dart';
|
||||
import 'package:sandbox/stories/baseboard/baseboard_game.dart';
|
||||
|
||||
void addBaseboardStories(Dashbook dashbook) {
|
||||
dashbook.storiesOf('Baseboard').add(
|
||||
'Basic',
|
||||
(context) => GameWidget(
|
||||
game: BasicBaseboardGame(),
|
||||
game: BaseboardGame()..trace = context.boolProperty('Trace', true),
|
||||
),
|
||||
codeLink: buildSourceLink('baseboard/basic.dart'),
|
||||
info: BasicBaseboardGame.info,
|
||||
codeLink: buildSourceLink('baseboard_game/basic.dart'),
|
||||
info: BaseboardGame.info,
|
||||
);
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 277 KiB |
|
Before Width: | Height: | Size: 466 KiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 38 KiB |
@ -1,101 +1,49 @@
|
||||
import 'package:flame/components.dart';
|
||||
import 'package:flame/game.dart';
|
||||
import 'package:flame_forge2d/flame_forge2d.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
const _attachedErrorMessage = "Can't add to attached Blueprints";
|
||||
|
||||
// TODO(erickzanardo): Keeping this inside our code base
|
||||
// so we can experiment with the idea, but this is a
|
||||
// potential upstream change on Flame.
|
||||
|
||||
/// A [Blueprint] is a virtual way of grouping [Component]s
|
||||
/// that are related, but they need to be added directly on
|
||||
/// the [FlameGame] level.
|
||||
/// {@template blueprint}
|
||||
/// A [Blueprint] is a virtual way of grouping [Component]s that are related,
|
||||
/// but they need to be added directly on the [FlameGame] level.
|
||||
/// {@endtemplate blueprint}
|
||||
// TODO(alestiago): refactor with feat/make-blueprint-extend-component.
|
||||
abstract class Blueprint<T extends FlameGame> extends Component {
|
||||
final List<Component> _components = [];
|
||||
final List<Blueprint> _blueprints = [];
|
||||
|
||||
bool _isAttached = false;
|
||||
|
||||
/// Called before the the [Component]s managed
|
||||
/// by this blueprint is added to the [FlameGame]
|
||||
void build(T gameRef);
|
||||
|
||||
/// Attach the [Component]s built on [build] to the [game]
|
||||
/// instance
|
||||
@mustCallSuper
|
||||
Future<void> attach(T game) async {
|
||||
build(game);
|
||||
await Future.wait([
|
||||
game.addAll(_components),
|
||||
..._blueprints.map(game.addFromBlueprint).toList(),
|
||||
]);
|
||||
_isAttached = true;
|
||||
class Blueprint extends Component {
|
||||
/// {@macro blueprint}
|
||||
Blueprint({
|
||||
Iterable<Component>? components,
|
||||
Iterable<Blueprint>? blueprints,
|
||||
}) {
|
||||
if (components != null) _components.addAll(components);
|
||||
if (blueprints != null) {
|
||||
_blueprints.addAll(blueprints);
|
||||
for (final blueprint in blueprints) {
|
||||
_components.addAll(blueprint.components);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Adds a single [Component] to this blueprint.
|
||||
@override
|
||||
Future<void> add(Component component) async {
|
||||
assert(!_isAttached, _attachedErrorMessage);
|
||||
_components.add(component);
|
||||
}
|
||||
final List<Component> _components = [];
|
||||
|
||||
/// Adds a list of [Blueprint]s to this blueprint.
|
||||
void addAllBlueprints(List<Blueprint> blueprints) {
|
||||
assert(!_isAttached, _attachedErrorMessage);
|
||||
_blueprints.addAll(blueprints);
|
||||
}
|
||||
final List<Component> _blueprints = [];
|
||||
|
||||
/// Adds a single [Blueprint] to this blueprint.
|
||||
void addBlueprint(Blueprint blueprint) {
|
||||
assert(!_isAttached, _attachedErrorMessage);
|
||||
_blueprints.add(blueprint);
|
||||
Future<void> _addToParent(Component parent) async {
|
||||
await parent.addAll(_components);
|
||||
}
|
||||
|
||||
/// Returns a copy of the components built by this blueprint
|
||||
/// Returns a copy of the components built by this blueprint.
|
||||
List<Component> get components => List.unmodifiable(_components);
|
||||
|
||||
/// Returns a copy of the children blueprints
|
||||
List<Blueprint> get blueprints => List.unmodifiable(_blueprints);
|
||||
}
|
||||
|
||||
/// A [Blueprint] that provides additional
|
||||
/// structures specific to flame_forge2d
|
||||
abstract class Forge2DBlueprint extends Blueprint<Forge2DGame> {
|
||||
final List<ContactCallback> _callbacks = [];
|
||||
|
||||
/// Adds a single [ContactCallback] to this blueprint
|
||||
void addContactCallback(ContactCallback callback) {
|
||||
assert(!_isAttached, _attachedErrorMessage);
|
||||
_callbacks.add(callback);
|
||||
}
|
||||
|
||||
/// Adds a collection of [ContactCallback]s to this blueprint
|
||||
void addAllContactCallback(List<ContactCallback> callbacks) {
|
||||
assert(!_isAttached, _attachedErrorMessage);
|
||||
_callbacks.addAll(callbacks);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> attach(Forge2DGame game) async {
|
||||
await super.attach(game);
|
||||
|
||||
for (final callback in _callbacks) {
|
||||
game.addContactCallback(callback);
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns a copy of the callbacks built by this blueprint
|
||||
List<ContactCallback> get callbacks => List.unmodifiable(_callbacks);
|
||||
/// Returns a copy of the blueprints built by this blueprint.
|
||||
List<Component> get blueprints => List.unmodifiable(_blueprints);
|
||||
}
|
||||
|
||||
/// Adds helper methods regardin [Blueprint]s to [FlameGame]
|
||||
extension FlameGameBlueprint on FlameGame {
|
||||
/// Shortcut to attach a [Blueprint] instance to this game
|
||||
/// equivalent to `MyBluepinrt().attach(game)`
|
||||
/// Adds helper methods regarding [Blueprint]s to [FlameGame].
|
||||
extension FlameGameBlueprint on Component {
|
||||
/// Shortcut to add a [Blueprint]s components to its parent.
|
||||
Future<void> addFromBlueprint(Blueprint blueprint) async {
|
||||
await blueprint.attach(this);
|
||||
await blueprint._addToParent(this);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,138 +1,86 @@
|
||||
// ignore_for_file: cascade_invocations
|
||||
|
||||
import 'package:flame/components.dart';
|
||||
import 'package:flame_forge2d/contact_callbacks.dart';
|
||||
import 'package:flame/game.dart';
|
||||
import 'package:flame_test/flame_test.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:mocktail/mocktail.dart';
|
||||
import 'package:pinball_flame/pinball_flame.dart';
|
||||
|
||||
import '../helpers/helpers.dart';
|
||||
|
||||
class TestContactCallback extends ContactCallback<dynamic, dynamic> {}
|
||||
|
||||
class MyBlueprint extends Blueprint {
|
||||
@override
|
||||
void build(_) {
|
||||
add(Component());
|
||||
addAll([Component(), Component()]);
|
||||
}
|
||||
}
|
||||
|
||||
class MyOtherBlueprint extends Blueprint {
|
||||
@override
|
||||
void build(_) {
|
||||
add(Component());
|
||||
}
|
||||
}
|
||||
|
||||
class YetMyOtherBlueprint extends Blueprint {
|
||||
@override
|
||||
void build(_) {
|
||||
add(Component());
|
||||
}
|
||||
}
|
||||
|
||||
class MyComposedBlueprint extends Blueprint {
|
||||
@override
|
||||
void build(_) {
|
||||
addBlueprint(MyBlueprint());
|
||||
addAllBlueprints([MyOtherBlueprint(), YetMyOtherBlueprint()]);
|
||||
}
|
||||
}
|
||||
|
||||
class MyForge2dBlueprint extends Forge2DBlueprint {
|
||||
@override
|
||||
void build(_) {
|
||||
addContactCallback(MockContactCallback());
|
||||
addAllContactCallback([MockContactCallback(), MockContactCallback()]);
|
||||
}
|
||||
}
|
||||
|
||||
void main() {
|
||||
group('Blueprint', () {
|
||||
setUpAll(() {
|
||||
registerFallbackValue(MyBlueprint());
|
||||
registerFallbackValue(Component());
|
||||
});
|
||||
|
||||
test('components can be added to it', () {
|
||||
final blueprint = MyBlueprint()..build(MockForge2DGame());
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
expect(blueprint.components.length, equals(3));
|
||||
});
|
||||
|
||||
test('blueprints can be added to it', () {
|
||||
final blueprint = MyComposedBlueprint()..build(MockForge2DGame());
|
||||
|
||||
expect(blueprint.blueprints.length, equals(3));
|
||||
});
|
||||
|
||||
test('adds the components to a game on attach', () {
|
||||
final mockGame = MockForge2DGame();
|
||||
when(() => mockGame.addAll(any())).thenAnswer((_) async {});
|
||||
MyBlueprint().attach(mockGame);
|
||||
|
||||
verify(() => mockGame.addAll(any())).called(1);
|
||||
});
|
||||
|
||||
test('adds components from a child Blueprint the to a game on attach', () {
|
||||
final mockGame = MockForge2DGame();
|
||||
when(() => mockGame.addAll(any())).thenAnswer((_) async {});
|
||||
MyComposedBlueprint().attach(mockGame);
|
||||
|
||||
verify(() => mockGame.addAll(any())).called(4);
|
||||
group('Blueprint', () {
|
||||
final flameTester = FlameTester(FlameGame.new);
|
||||
|
||||
test('correctly sets and gets components', () {
|
||||
final component1 = Component();
|
||||
final component2 = Component();
|
||||
final blueprint = Blueprint(
|
||||
components: [
|
||||
component1,
|
||||
component2,
|
||||
],
|
||||
);
|
||||
|
||||
expect(blueprint.components.length, 2);
|
||||
expect(blueprint.components, contains(component1));
|
||||
expect(blueprint.components, contains(component2));
|
||||
});
|
||||
|
||||
test(
|
||||
'throws assertion error when adding to an already attached blueprint',
|
||||
() async {
|
||||
final mockGame = MockForge2DGame();
|
||||
when(() => mockGame.addAll(any())).thenAnswer((_) async {});
|
||||
final blueprint = MyBlueprint();
|
||||
await blueprint.attach(mockGame);
|
||||
|
||||
expect(() => blueprint.add(Component()), throwsAssertionError);
|
||||
expect(() => blueprint.addAll([Component()]), throwsAssertionError);
|
||||
},
|
||||
);
|
||||
});
|
||||
test('correctly sets and gets blueprints', () {
|
||||
final blueprint2 = Blueprint(
|
||||
components: [Component()],
|
||||
);
|
||||
final blueprint1 = Blueprint(
|
||||
components: [Component()],
|
||||
blueprints: [blueprint2],
|
||||
);
|
||||
|
||||
group('Forge2DBlueprint', () {
|
||||
setUpAll(() {
|
||||
registerFallbackValue(TestContactCallback());
|
||||
expect(blueprint1.blueprints, contains(blueprint2));
|
||||
});
|
||||
|
||||
test('callbacks can be added to it', () {
|
||||
final blueprint = MyForge2dBlueprint()..build(MockForge2DGame());
|
||||
|
||||
expect(blueprint.callbacks.length, equals(3));
|
||||
flameTester.test('adds the components to parent on attach', (game) async {
|
||||
final blueprint = Blueprint(
|
||||
components: [
|
||||
Component(),
|
||||
Component(),
|
||||
],
|
||||
);
|
||||
await game.addFromBlueprint(blueprint);
|
||||
await game.ready();
|
||||
|
||||
for (final component in blueprint.components) {
|
||||
expect(game.children.contains(component), isTrue);
|
||||
}
|
||||
});
|
||||
|
||||
test('adds the callbacks to a game on attach', () async {
|
||||
final mockGame = MockForge2DGame();
|
||||
when(() => mockGame.addAll(any())).thenAnswer((_) async {});
|
||||
when(() => mockGame.addContactCallback(any())).thenAnswer((_) async {});
|
||||
await MyForge2dBlueprint().attach(mockGame);
|
||||
|
||||
verify(() => mockGame.addContactCallback(any())).called(3);
|
||||
flameTester.test('adds components from a child Blueprint', (game) async {
|
||||
final childBlueprint = Blueprint(
|
||||
components: [
|
||||
Component(),
|
||||
Component(),
|
||||
],
|
||||
);
|
||||
final parentBlueprint = Blueprint(
|
||||
components: [
|
||||
Component(),
|
||||
Component(),
|
||||
],
|
||||
blueprints: [
|
||||
childBlueprint,
|
||||
],
|
||||
);
|
||||
|
||||
await game.addFromBlueprint(parentBlueprint);
|
||||
await game.ready();
|
||||
|
||||
for (final component in childBlueprint.components) {
|
||||
expect(game.children, contains(component));
|
||||
expect(parentBlueprint.components, contains(component));
|
||||
}
|
||||
for (final component in parentBlueprint.components) {
|
||||
expect(game.children, contains(component));
|
||||
}
|
||||
});
|
||||
|
||||
test(
|
||||
'throws assertion error when adding to an already attached blueprint',
|
||||
() async {
|
||||
final mockGame = MockForge2DGame();
|
||||
when(() => mockGame.addAll(any())).thenAnswer((_) async {});
|
||||
when(() => mockGame.addContactCallback(any())).thenAnswer((_) async {});
|
||||
final blueprint = MyForge2dBlueprint();
|
||||
await blueprint.attach(mockGame);
|
||||
|
||||
expect(
|
||||
() => blueprint.addContactCallback(MockContactCallback()),
|
||||
throwsAssertionError,
|
||||
);
|
||||
expect(
|
||||
() => blueprint.addAllContactCallback([MockContactCallback()]),
|
||||
throwsAssertionError,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||