chore: renamed rotation

pull/231/head
RuiAlonso 3 years ago
parent 69ba18ea3d
commit 62835180da

@ -14,23 +14,23 @@ class Multipliers extends Component {
children: [
Multiplier.x2(
position: Vector2(-19.5, -2),
rotation: -15 * math.pi / 180,
angle: -15 * math.pi / 180,
),
Multiplier.x3(
position: Vector2(13, -9.4),
rotation: 15 * math.pi / 180,
angle: 15 * math.pi / 180,
),
Multiplier.x4(
position: Vector2(0, -21.2),
rotation: 0,
angle: 0,
),
Multiplier.x5(
position: Vector2(-8.5, -28),
rotation: -3 * math.pi / 180,
angle: -3 * math.pi / 180,
),
Multiplier.x6(
position: Vector2(10, -30.7),
rotation: 8 * math.pi / 180,
angle: 8 * math.pi / 180,
),
MultipliersBehavior(),
],

@ -1,5 +1,3 @@
// ignore_for_file: public_member_api_docs
import 'package:flame/components.dart';
import 'package:flutter/material.dart';
import 'package:pinball_components/gen/assets.gen.dart';
@ -9,72 +7,72 @@ import 'package:pinball_flame/pinball_flame.dart';
export 'cubit/multiplier_cubit.dart';
/// {@template multiplier}
/// A [Component] for the multiplier over the board.
/// Backlit multiplier decal displayed on the board.
/// {@endtemplate}
class Multiplier extends Component {
/// {@macro multiplier}
Multiplier._({
required MultiplierValue value,
required Vector2 position,
required double rotation,
required double angle,
required this.bloc,
}) : _value = value,
_position = position,
_rotation = rotation,
_angle = angle,
super();
/// {@macro multiplier}
Multiplier.x2({
required Vector2 position,
required double rotation,
required double angle,
}) : this._(
value: MultiplierValue.x2,
position: position,
rotation: rotation,
angle: angle,
bloc: MultiplierCubit(MultiplierValue.x2),
);
/// {@macro multiplier}
Multiplier.x3({
required Vector2 position,
required double rotation,
required double angle,
}) : this._(
value: MultiplierValue.x3,
position: position,
rotation: rotation,
angle: angle,
bloc: MultiplierCubit(MultiplierValue.x3),
);
/// {@macro multiplier}
Multiplier.x4({
required Vector2 position,
required double rotation,
required double angle,
}) : this._(
value: MultiplierValue.x4,
position: position,
rotation: rotation,
angle: angle,
bloc: MultiplierCubit(MultiplierValue.x4),
);
/// {@macro multiplier}
Multiplier.x5({
required Vector2 position,
required double rotation,
required double angle,
}) : this._(
value: MultiplierValue.x5,
position: position,
rotation: rotation,
angle: angle,
bloc: MultiplierCubit(MultiplierValue.x5),
);
/// {@macro multiplier}
Multiplier.x6({
required Vector2 position,
required double rotation,
required double angle,
}) : this._(
value: MultiplierValue.x6,
position: position,
rotation: rotation,
angle: angle,
bloc: MultiplierCubit(MultiplierValue.x6),
);
@ -89,7 +87,7 @@ class Multiplier extends Component {
required this.bloc,
}) : _value = value,
_position = Vector2.zero(),
_rotation = 0;
_angle = 0;
// TODO(ruimiguel): Consider refactoring once the following is merged:
// https://github.com/flame-engine/flame/pull/1538
@ -97,7 +95,7 @@ class Multiplier extends Component {
final MultiplierValue _value;
final Vector2 _position;
final double _rotation;
final double _angle;
late final MultiplierSpriteGroupComponent _sprite;
@override
@ -113,7 +111,7 @@ class Multiplier extends Component {
position: _position,
litAssetPath: _value.litAssetPath,
dimmedAssetPath: _value.dimmedAssetPath,
rotation: _rotation,
angle: _angle,
current: bloc.state,
);
await add(_sprite);
@ -162,7 +160,7 @@ extension on MultiplierValue {
}
/// {@template multiplier_sprite_group_component}
/// A [SpriteGroupComponent] for the multiplier over the board.
/// A [SpriteGroupComponent] for a [Multiplier] with lit and dimmed states.
/// {@endtemplate}
@visibleForTesting
class MultiplierSpriteGroupComponent
@ -173,14 +171,14 @@ class MultiplierSpriteGroupComponent
required Vector2 position,
required String litAssetPath,
required String dimmedAssetPath,
required double rotation,
required double angle,
required MultiplierState current,
}) : _litAssetPath = litAssetPath,
_dimmedAssetPath = dimmedAssetPath,
super(
anchor: Anchor.center,
position: position,
angle: rotation,
angle: angle,
current: current.spriteState,
);

@ -32,23 +32,23 @@ class MultipliersGame extends BallGame with KeyboardEvents {
final List<Multiplier> multipliers = [
Multiplier.x2(
position: Vector2(-20, 0),
rotation: -15 * math.pi / 180,
angle: -15 * math.pi / 180,
),
Multiplier.x3(
position: Vector2(20, -5),
rotation: 15 * math.pi / 180,
angle: 15 * math.pi / 180,
),
Multiplier.x4(
position: Vector2(0, -15),
rotation: 0,
angle: 0,
),
Multiplier.x5(
position: Vector2(-10, -25),
rotation: -3 * math.pi / 180,
angle: -3 * math.pi / 180,
),
Multiplier.x6(
position: Vector2(10, -35),
rotation: 8 * math.pi / 180,
angle: 8 * math.pi / 180,
),
];

@ -31,7 +31,7 @@ void main() {
flameTester.test('"x2" loads correctly', (game) async {
final multiplier = Multiplier.x2(
position: Vector2.zero(),
rotation: 0,
angle: 0,
);
await game.ensureAdd(multiplier);
expect(game.contains(multiplier), isTrue);
@ -40,7 +40,7 @@ void main() {
flameTester.test('"x3" loads correctly', (game) async {
final multiplier = Multiplier.x3(
position: Vector2.zero(),
rotation: 0,
angle: 0,
);
await game.ensureAdd(multiplier);
expect(game.contains(multiplier), isTrue);
@ -49,7 +49,7 @@ void main() {
flameTester.test('"x4" loads correctly', (game) async {
final multiplier = Multiplier.x4(
position: Vector2.zero(),
rotation: 0,
angle: 0,
);
await game.ensureAdd(multiplier);
expect(game.contains(multiplier), isTrue);
@ -58,7 +58,7 @@ void main() {
flameTester.test('"x5" loads correctly', (game) async {
final multiplier = Multiplier.x5(
position: Vector2.zero(),
rotation: 0,
angle: 0,
);
await game.ensureAdd(multiplier);
expect(game.contains(multiplier), isTrue);
@ -67,7 +67,7 @@ void main() {
flameTester.test('"x6" loads correctly', (game) async {
final multiplier = Multiplier.x6(
position: Vector2.zero(),
rotation: 0,
angle: 0,
);
await game.ensureAdd(multiplier);
expect(game.contains(multiplier), isTrue);

Loading…
Cancel
Save