From 33724f7469de8929a60a039155e7027d24444b86 Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Mon, 28 Mar 2022 10:38:05 -0300 Subject: [PATCH] fix: rebase issues --- lib/game/components/jetpack_ramp.dart | 1 - lib/game/components/launcher_ramp.dart | 1 - .../lib/src/components/ramp_opening.dart | 7 +++---- packages/pinball_components/sandbox/pubspec.lock | 7 +++++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/game/components/jetpack_ramp.dart b/lib/game/components/jetpack_ramp.dart index a24e1438..e5eae883 100644 --- a/lib/game/components/jetpack_ramp.dart +++ b/lib/game/components/jetpack_ramp.dart @@ -5,7 +5,6 @@ import 'dart:math' as math; import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; -import 'package:pinball/flame/blueprint.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; diff --git a/lib/game/components/launcher_ramp.dart b/lib/game/components/launcher_ramp.dart index 5313a2d9..b3f3cb23 100644 --- a/lib/game/components/launcher_ramp.dart +++ b/lib/game/components/launcher_ramp.dart @@ -5,7 +5,6 @@ import 'dart:math' as math; import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; -import 'package:pinball/flame/blueprint.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; diff --git a/packages/pinball_components/lib/src/components/ramp_opening.dart b/packages/pinball_components/lib/src/components/ramp_opening.dart index 3d4b350a..8f33e813 100644 --- a/packages/pinball_components/lib/src/components/ramp_opening.dart +++ b/packages/pinball_components/lib/src/components/ramp_opening.dart @@ -4,13 +4,13 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; /// {@template ramp_orientation} -/// Determines if a ramp is facing [up] or [down] on the [Board]. +/// Determines if a ramp is facing [up] or [down] on the Board. /// {@endtemplate} enum RampOrientation { - /// Facing up on the [Board]. + /// Facing up on the Board. up, - /// Facing down on the [Board]. + /// Facing down on the Board. down, } @@ -109,4 +109,3 @@ class RampOpeningBallContactCallback } } } - diff --git a/packages/pinball_components/sandbox/pubspec.lock b/packages/pinball_components/sandbox/pubspec.lock index 7452ccf4..bb132da7 100644 --- a/packages/pinball_components/sandbox/pubspec.lock +++ b/packages/pinball_components/sandbox/pubspec.lock @@ -142,6 +142,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" + geometry: + dependency: transitive + description: + path: "../../geometry" + relative: true + source: path + version: "1.0.0+1" js: dependency: transitive description: