From d0b9bc204f1c519b8cb7b711eecdd3dc5cf4ebf1 Mon Sep 17 00:00:00 2001 From: Alejandro Santiago Date: Sun, 8 May 2022 12:40:32 +0100 Subject: [PATCH 1/2] refactor: moved Shapes to pinball_flame (#410) * refactor: moved Shapes to pinball_flame package * refactor: simplified BezierCurveShape test * test: properly used isA matcher --- .../lib/src/components/baseboard.dart | 1 + .../lib/src/components/components.dart | 1 - packages/pinball_components/pubspec.yaml | 2 - .../src/components/shapes/arc_shape_test.dart | 66 --------------- .../shapes/bezier_curve_shape_test.dart | 51 ------------ .../components/shapes/ellipse_shape_test.dart | 83 ------------------- packages/pinball_flame/lib/pinball_flame.dart | 1 + .../lib/src}/shapes/arc_shape.dart | 13 --- .../lib/src}/shapes/bezier_curve_shape.dart | 6 -- .../lib/src}/shapes/ellipse_shape.dart | 15 +--- .../lib/src}/shapes/shapes.dart | 0 packages/pinball_flame/pubspec.yaml | 2 + .../test/src/shapes/arc_shape_test.dart | 20 +++++ .../src/shapes/bezier_curve_shape_test.dart | 22 +++++ .../test/src/shapes/ellipse_shape_test.dart | 41 +++++++++ 15 files changed, 90 insertions(+), 234 deletions(-) delete mode 100644 packages/pinball_components/test/src/components/shapes/arc_shape_test.dart delete mode 100644 packages/pinball_components/test/src/components/shapes/bezier_curve_shape_test.dart delete mode 100644 packages/pinball_components/test/src/components/shapes/ellipse_shape_test.dart rename packages/{pinball_components/lib/src/components => pinball_flame/lib/src}/shapes/arc_shape.dart (73%) rename packages/{pinball_components/lib/src/components => pinball_flame/lib/src}/shapes/bezier_curve_shape.dart (75%) rename packages/{pinball_components/lib/src/components => pinball_flame/lib/src}/shapes/ellipse_shape.dart (72%) rename packages/{pinball_components/lib/src/components => pinball_flame/lib/src}/shapes/shapes.dart (100%) create mode 100644 packages/pinball_flame/test/src/shapes/arc_shape_test.dart create mode 100644 packages/pinball_flame/test/src/shapes/bezier_curve_shape_test.dart create mode 100644 packages/pinball_flame/test/src/shapes/ellipse_shape_test.dart diff --git a/packages/pinball_components/lib/src/components/baseboard.dart b/packages/pinball_components/lib/src/components/baseboard.dart index 47ba4666..2965d17f 100644 --- a/packages/pinball_components/lib/src/components/baseboard.dart +++ b/packages/pinball_components/lib/src/components/baseboard.dart @@ -3,6 +3,7 @@ import 'dart:math' as math; 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'; /// {@template baseboard} /// Wing-shaped board piece to corral the [Ball] towards the [Flipper]s. diff --git a/packages/pinball_components/lib/src/components/components.dart b/packages/pinball_components/lib/src/components/components.dart index 17f3746a..2e37f927 100644 --- a/packages/pinball_components/lib/src/components/components.dart +++ b/packages/pinball_components/lib/src/components/components.dart @@ -26,7 +26,6 @@ export 'multiplier/multiplier.dart'; export 'plunger.dart'; export 'rocket.dart'; export 'score_component/score_component.dart'; -export 'shapes/shapes.dart'; export 'signpost/signpost.dart'; export 'skill_shot/skill_shot.dart'; export 'slingshot.dart'; diff --git a/packages/pinball_components/pubspec.yaml b/packages/pinball_components/pubspec.yaml index 758ebe37..c430d670 100644 --- a/packages/pinball_components/pubspec.yaml +++ b/packages/pinball_components/pubspec.yaml @@ -17,8 +17,6 @@ dependencies: ref: a50d4a1e7d9eaf66726ed1bb9894c9d495547d8f flutter: sdk: flutter - geometry: - path: ../geometry intl: ^0.17.0 pinball_flame: path: ../pinball_flame diff --git a/packages/pinball_components/test/src/components/shapes/arc_shape_test.dart b/packages/pinball_components/test/src/components/shapes/arc_shape_test.dart deleted file mode 100644 index fe778872..00000000 --- a/packages/pinball_components/test/src/components/shapes/arc_shape_test.dart +++ /dev/null @@ -1,66 +0,0 @@ -import 'dart:math' as math; -import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:pinball_components/src/components/components.dart'; - -void main() { - group('ArcShape', () { - test('can be instantiated', () { - expect( - ArcShape( - center: Vector2.zero(), - arcRadius: 10, - angle: 2 * math.pi, - ), - isNotNull, - ); - }); - - group('copyWith', () { - test( - 'copies correctly ' - 'when no argument specified', () { - final arcShape = ArcShape( - center: Vector2.zero(), - arcRadius: 10, - angle: 2 * math.pi, - ); - final arcShapeCopied = arcShape.copyWith(); - - for (var index = 0; index < arcShape.vertices.length; index++) { - expect( - arcShape.vertices[index], - equals(arcShapeCopied.vertices[index]), - ); - } - }); - - test( - 'copies correctly ' - 'when all arguments specified', () { - final arcShapeExpected = ArcShape( - center: Vector2.all(10), - arcRadius: 15, - angle: 2 * math.pi, - ); - final arcShapeCopied = ArcShape( - center: Vector2.zero(), - arcRadius: 10, - angle: math.pi, - ).copyWith( - center: Vector2.all(10), - arcRadius: 15, - angle: 2 * math.pi, - ); - - for (var index = 0; index < arcShapeCopied.vertices.length; index++) { - expect( - arcShapeCopied.vertices[index], - equals(arcShapeExpected.vertices[index]), - ); - } - }); - }); - }); -} diff --git a/packages/pinball_components/test/src/components/shapes/bezier_curve_shape_test.dart b/packages/pinball_components/test/src/components/shapes/bezier_curve_shape_test.dart deleted file mode 100644 index 6a6adeb7..00000000 --- a/packages/pinball_components/test/src/components/shapes/bezier_curve_shape_test.dart +++ /dev/null @@ -1,51 +0,0 @@ -import 'dart:math' as math; -import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:pinball_components/src/components/components.dart'; - -void main() { - group('BezierCurveShape', () { - final controlPoints = [ - Vector2(0, 0), - Vector2(10, 0), - Vector2(0, 10), - Vector2(10, 10), - ]; - - test('can be instantiated', () { - expect( - BezierCurveShape( - controlPoints: controlPoints, - ), - isNotNull, - ); - }); - - group('rotate', () { - test('returns vertices rotated', () { - const rotationAngle = 2 * math.pi; - final controlPoints = [ - Vector2(0, 0), - Vector2(10, 0), - Vector2(0, 10), - Vector2(10, 10), - ]; - - final bezierCurveShape = BezierCurveShape( - controlPoints: controlPoints, - ); - final bezierCurveShapeRotated = BezierCurveShape( - controlPoints: controlPoints, - )..rotate(rotationAngle); - - for (var index = 0; index < bezierCurveShape.vertices.length; index++) { - expect( - bezierCurveShape.vertices[index]..rotate(rotationAngle), - equals(bezierCurveShapeRotated.vertices[index]), - ); - } - }); - }); - }); -} diff --git a/packages/pinball_components/test/src/components/shapes/ellipse_shape_test.dart b/packages/pinball_components/test/src/components/shapes/ellipse_shape_test.dart deleted file mode 100644 index 31f45cc1..00000000 --- a/packages/pinball_components/test/src/components/shapes/ellipse_shape_test.dart +++ /dev/null @@ -1,83 +0,0 @@ -import 'dart:math' as math; -import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:pinball_components/src/components/components.dart'; - -void main() { - group('EllipseShape', () { - test('can be instantiated', () { - expect( - EllipseShape( - center: Vector2.zero(), - majorRadius: 10, - minorRadius: 8, - ), - isNotNull, - ); - }); - - group('rotate', () { - test('returns vertices rotated', () { - const rotationAngle = 2 * math.pi; - final ellipseShape = EllipseShape( - center: Vector2.zero(), - majorRadius: 10, - minorRadius: 8, - ); - final ellipseShapeRotated = EllipseShape( - center: Vector2.zero(), - majorRadius: 10, - minorRadius: 8, - )..rotate(rotationAngle); - - for (var index = 0; index < ellipseShape.vertices.length; index++) { - expect( - ellipseShape.vertices[index]..rotate(rotationAngle), - equals(ellipseShapeRotated.vertices[index]), - ); - } - }); - }); - - group('copyWith', () { - test('returns same shape when no properties are passed', () { - final ellipseShape = EllipseShape( - center: Vector2.zero(), - majorRadius: 10, - minorRadius: 8, - ); - final ellipseShapeCopied = ellipseShape.copyWith(); - - for (var index = 0; index < ellipseShape.vertices.length; index++) { - expect( - ellipseShape.vertices[index], - equals(ellipseShapeCopied.vertices[index]), - ); - } - }); - - test('returns object with updated properties when are passed', () { - final ellipseShapeExpected = EllipseShape( - center: Vector2.all(10), - majorRadius: 10, - minorRadius: 8, - ); - final ellipseShapeCopied = EllipseShape( - center: Vector2.zero(), - majorRadius: 10, - minorRadius: 8, - ).copyWith(center: Vector2.all(10)); - - for (var index = 0; - index < ellipseShapeCopied.vertices.length; - index++) { - expect( - ellipseShapeCopied.vertices[index], - equals(ellipseShapeExpected.vertices[index]), - ); - } - }); - }); - }); -} diff --git a/packages/pinball_flame/lib/pinball_flame.dart b/packages/pinball_flame/lib/pinball_flame.dart index bc3cae0e..c40405cb 100644 --- a/packages/pinball_flame/lib/pinball_flame.dart +++ b/packages/pinball_flame/lib/pinball_flame.dart @@ -8,4 +8,5 @@ export 'src/keyboard_input_controller.dart'; export 'src/layer.dart'; export 'src/parent_is_a.dart'; export 'src/pinball_forge2d_game.dart'; +export 'src/shapes/shapes.dart'; export 'src/sprite_animation.dart'; diff --git a/packages/pinball_components/lib/src/components/shapes/arc_shape.dart b/packages/pinball_flame/lib/src/shapes/arc_shape.dart similarity index 73% rename from packages/pinball_components/lib/src/components/shapes/arc_shape.dart rename to packages/pinball_flame/lib/src/shapes/arc_shape.dart index d58bdf1e..780fa2d3 100644 --- a/packages/pinball_components/lib/src/components/shapes/arc_shape.dart +++ b/packages/pinball_flame/lib/src/shapes/arc_shape.dart @@ -35,17 +35,4 @@ class ArcShape extends ChainShape { /// Angle in radians to rotate the arc around its [center]. final double rotation; - - ArcShape copyWith({ - Vector2? center, - double? arcRadius, - double? angle, - double? rotation, - }) => - ArcShape( - center: center ?? this.center, - arcRadius: arcRadius ?? this.arcRadius, - angle: angle ?? this.angle, - rotation: rotation ?? this.rotation, - ); } diff --git a/packages/pinball_components/lib/src/components/shapes/bezier_curve_shape.dart b/packages/pinball_flame/lib/src/shapes/bezier_curve_shape.dart similarity index 75% rename from packages/pinball_components/lib/src/components/shapes/bezier_curve_shape.dart rename to packages/pinball_flame/lib/src/shapes/bezier_curve_shape.dart index 5fcf9e08..00d1bafb 100644 --- a/packages/pinball_components/lib/src/components/shapes/bezier_curve_shape.dart +++ b/packages/pinball_flame/lib/src/shapes/bezier_curve_shape.dart @@ -1,4 +1,3 @@ -import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:geometry/geometry.dart'; @@ -18,9 +17,4 @@ class BezierCurveShape extends ChainShape { /// First and last [controlPoints] set the beginning and end of the curve, /// inner points between them set its final shape. final List controlPoints; - - /// Rotates the bezier curve by a given [angle] in radians. - void rotate(double angle) { - vertices.map((vector) => vector..rotate(angle)).toList(); - } } diff --git a/packages/pinball_components/lib/src/components/shapes/ellipse_shape.dart b/packages/pinball_flame/lib/src/shapes/ellipse_shape.dart similarity index 72% rename from packages/pinball_components/lib/src/components/shapes/ellipse_shape.dart rename to packages/pinball_flame/lib/src/shapes/ellipse_shape.dart index 488d3d6f..5c523a3f 100644 --- a/packages/pinball_components/lib/src/components/shapes/ellipse_shape.dart +++ b/packages/pinball_flame/lib/src/shapes/ellipse_shape.dart @@ -34,17 +34,8 @@ class EllipseShape extends ChainShape { /// Rotates the ellipse by a given [angle] in radians. void rotate(double angle) { - vertices.map((vector) => vector..rotate(angle)).toList(); + for (final vector in vertices) { + vector.rotate(angle); + } } - - EllipseShape copyWith({ - Vector2? center, - double? majorRadius, - double? minorRadius, - }) => - EllipseShape( - center: center ?? this.center, - majorRadius: majorRadius ?? this.majorRadius, - minorRadius: minorRadius ?? this.minorRadius, - ); } diff --git a/packages/pinball_components/lib/src/components/shapes/shapes.dart b/packages/pinball_flame/lib/src/shapes/shapes.dart similarity index 100% rename from packages/pinball_components/lib/src/components/shapes/shapes.dart rename to packages/pinball_flame/lib/src/shapes/shapes.dart diff --git a/packages/pinball_flame/pubspec.yaml b/packages/pinball_flame/pubspec.yaml index 4639a080..327951a1 100644 --- a/packages/pinball_flame/pubspec.yaml +++ b/packages/pinball_flame/pubspec.yaml @@ -17,6 +17,8 @@ dependencies: ref: a50d4a1e7d9eaf66726ed1bb9894c9d495547d8f flutter: sdk: flutter + geometry: + path: ../geometry dev_dependencies: flame_test: ^1.3.0 diff --git a/packages/pinball_flame/test/src/shapes/arc_shape_test.dart b/packages/pinball_flame/test/src/shapes/arc_shape_test.dart new file mode 100644 index 00000000..0c9f0a0f --- /dev/null +++ b/packages/pinball_flame/test/src/shapes/arc_shape_test.dart @@ -0,0 +1,20 @@ +import 'dart:math' as math; +import 'package:flame/extensions.dart'; +import 'package:flame/game.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball_flame/pinball_flame.dart'; + +void main() { + group('ArcShape', () { + test('can be instantiated', () { + expect( + ArcShape( + center: Vector2.zero(), + arcRadius: 10, + angle: 2 * math.pi, + ), + isA(), + ); + }); + }); +} diff --git a/packages/pinball_flame/test/src/shapes/bezier_curve_shape_test.dart b/packages/pinball_flame/test/src/shapes/bezier_curve_shape_test.dart new file mode 100644 index 00000000..c2328a2f --- /dev/null +++ b/packages/pinball_flame/test/src/shapes/bezier_curve_shape_test.dart @@ -0,0 +1,22 @@ +import 'package:flame/extensions.dart'; +import 'package:flame/game.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball_flame/pinball_flame.dart'; + +void main() { + group('BezierCurveShape', () { + test('can be instantiated', () { + expect( + BezierCurveShape( + controlPoints: [ + Vector2(0, 0), + Vector2(10, 0), + Vector2(0, 10), + Vector2(10, 10), + ], + ), + isA(), + ); + }); + }); +} diff --git a/packages/pinball_flame/test/src/shapes/ellipse_shape_test.dart b/packages/pinball_flame/test/src/shapes/ellipse_shape_test.dart new file mode 100644 index 00000000..0bb760d9 --- /dev/null +++ b/packages/pinball_flame/test/src/shapes/ellipse_shape_test.dart @@ -0,0 +1,41 @@ +import 'dart:math' as math; +import 'package:flame/extensions.dart'; +import 'package:flame/game.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball_flame/pinball_flame.dart'; + +void main() { + group('EllipseShape', () { + test('can be instantiated', () { + expect( + EllipseShape( + center: Vector2.zero(), + majorRadius: 10, + minorRadius: 8, + ), + isA(), + ); + }); + + test('rotate returns vertices rotated', () { + const rotationAngle = 2 * math.pi; + final ellipseShape = EllipseShape( + center: Vector2.zero(), + majorRadius: 10, + minorRadius: 8, + ); + final ellipseShapeRotated = EllipseShape( + center: Vector2.zero(), + majorRadius: 10, + minorRadius: 8, + )..rotate(rotationAngle); + + for (var index = 0; index < ellipseShape.vertices.length; index++) { + expect( + ellipseShape.vertices[index]..rotate(rotationAngle), + equals(ellipseShapeRotated.vertices[index]), + ); + } + }); + }); +} From b345c56134f6b44df220b52fe6a05c1edca0083c Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Sun, 8 May 2022 07:31:08 -0500 Subject: [PATCH 2/2] fix: use snake case for goldens (#400) --- .../{board-opening.png => board_opening.png} | Bin ...-background.png => railing_background.png} | Bin ...-foreground.png => railing_foreground.png} | Bin .../{light-beam.png => light_beam.png} | Bin ...isplay-divider.png => display_divider.png} | Bin ...rd-background.png => board_background.png} | Bin .../{outer-bottom.png => outer_bottom.png} | Bin .../dino/{bottom-wall.png => bottom_wall.png} | Bin .../dino/{top-wall.png => top_wall.png} | Bin ...op-wall-tunnel.png => top_wall_tunnel.png} | Bin .../{back-support.png => back_support.png} | Bin .../{front-support.png => front_support.png} | Bin ...und-railing.png => background_railing.png} | Bin ...und-railing.png => foreground_railing.png} | Bin .../{five-thousand.png => five_thousand.png} | Bin .../{one-million.png => one_million.png} | Bin ...wenty-thousand.png => twenty_thousand.png} | Bin ...-thousand.png => two_hundred_thousand.png} | Bin .../lib/gen/assets.gen.dart | 80 +++++++++--------- ...oard_background_sprite_component_test.dart | 2 +- .../test/src/components/dino_walls_test.dart | 2 +- ...rd-background.png => board_background.png} | Bin .../golden/{dino-walls.png => dino_walls.png} | Bin .../{launch-ramp.png => launch_ramp.png} | Bin .../{x2-dimmed.png => x2_dimmed.png} | Bin .../multipliers/{x2-lit.png => x2_lit.png} | Bin .../{x3-dimmed.png => x3_dimmed.png} | Bin .../multipliers/{x3-lit.png => x3_lit.png} | Bin .../{x4-dimmed.png => x4_dimmed.png} | Bin .../multipliers/{x4-lit.png => x4_lit.png} | Bin .../{x5-dimmed.png => x5_dimmed.png} | Bin .../multipliers/{x5-lit.png => x5_lit.png} | Bin .../{x6-dimmed.png => x6_dimmed.png} | Bin .../multipliers/{x6-lit.png => x6_lit.png} | Bin ...{spaceship-rail.png => spaceship_rail.png} | Bin ...parky-computer.png => sparky_computer.png} | Bin .../test/src/components/launch_ramp_test.dart | 2 +- .../multiplier/multiplier_test.dart | 20 ++--- .../src/components/spaceship_rail_test.dart | 2 +- .../sparky_computer/sparky_computer_test.dart | 2 +- 40 files changed, 55 insertions(+), 55 deletions(-) rename packages/pinball_components/assets/images/android/ramp/{board-opening.png => board_opening.png} (100%) rename packages/pinball_components/assets/images/android/ramp/{railing-background.png => railing_background.png} (100%) rename packages/pinball_components/assets/images/android/ramp/{railing-foreground.png => railing_foreground.png} (100%) rename packages/pinball_components/assets/images/android/spaceship/{light-beam.png => light_beam.png} (100%) rename packages/pinball_components/assets/images/backbox/{display-divider.png => display_divider.png} (100%) rename packages/pinball_components/assets/images/{board-background.png => board_background.png} (100%) rename packages/pinball_components/assets/images/boundary/{outer-bottom.png => outer_bottom.png} (100%) rename packages/pinball_components/assets/images/dino/{bottom-wall.png => bottom_wall.png} (100%) rename packages/pinball_components/assets/images/dino/{top-wall.png => top_wall.png} (100%) rename packages/pinball_components/assets/images/dino/{top-wall-tunnel.png => top_wall_tunnel.png} (100%) rename packages/pinball_components/assets/images/flapper/{back-support.png => back_support.png} (100%) rename packages/pinball_components/assets/images/flapper/{front-support.png => front_support.png} (100%) rename packages/pinball_components/assets/images/launch_ramp/{background-railing.png => background_railing.png} (100%) rename packages/pinball_components/assets/images/launch_ramp/{foreground-railing.png => foreground_railing.png} (100%) rename packages/pinball_components/assets/images/score/{five-thousand.png => five_thousand.png} (100%) rename packages/pinball_components/assets/images/score/{one-million.png => one_million.png} (100%) rename packages/pinball_components/assets/images/score/{twenty-thousand.png => twenty_thousand.png} (100%) rename packages/pinball_components/assets/images/score/{two-hundred-thousand.png => two_hundred_thousand.png} (100%) rename packages/pinball_components/test/src/components/golden/{board-background.png => board_background.png} (100%) rename packages/pinball_components/test/src/components/golden/{dino-walls.png => dino_walls.png} (100%) rename packages/pinball_components/test/src/components/golden/{launch-ramp.png => launch_ramp.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x2-dimmed.png => x2_dimmed.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x2-lit.png => x2_lit.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x3-dimmed.png => x3_dimmed.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x3-lit.png => x3_lit.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x4-dimmed.png => x4_dimmed.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x4-lit.png => x4_lit.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x5-dimmed.png => x5_dimmed.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x5-lit.png => x5_lit.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x6-dimmed.png => x6_dimmed.png} (100%) rename packages/pinball_components/test/src/components/golden/multipliers/{x6-lit.png => x6_lit.png} (100%) rename packages/pinball_components/test/src/components/golden/{spaceship-rail.png => spaceship_rail.png} (100%) rename packages/pinball_components/test/src/components/golden/{sparky-computer.png => sparky_computer.png} (100%) diff --git a/packages/pinball_components/assets/images/android/ramp/board-opening.png b/packages/pinball_components/assets/images/android/ramp/board_opening.png similarity index 100% rename from packages/pinball_components/assets/images/android/ramp/board-opening.png rename to packages/pinball_components/assets/images/android/ramp/board_opening.png diff --git a/packages/pinball_components/assets/images/android/ramp/railing-background.png b/packages/pinball_components/assets/images/android/ramp/railing_background.png similarity index 100% rename from packages/pinball_components/assets/images/android/ramp/railing-background.png rename to packages/pinball_components/assets/images/android/ramp/railing_background.png diff --git a/packages/pinball_components/assets/images/android/ramp/railing-foreground.png b/packages/pinball_components/assets/images/android/ramp/railing_foreground.png similarity index 100% rename from packages/pinball_components/assets/images/android/ramp/railing-foreground.png rename to packages/pinball_components/assets/images/android/ramp/railing_foreground.png diff --git a/packages/pinball_components/assets/images/android/spaceship/light-beam.png b/packages/pinball_components/assets/images/android/spaceship/light_beam.png similarity index 100% rename from packages/pinball_components/assets/images/android/spaceship/light-beam.png rename to packages/pinball_components/assets/images/android/spaceship/light_beam.png diff --git a/packages/pinball_components/assets/images/backbox/display-divider.png b/packages/pinball_components/assets/images/backbox/display_divider.png similarity index 100% rename from packages/pinball_components/assets/images/backbox/display-divider.png rename to packages/pinball_components/assets/images/backbox/display_divider.png diff --git a/packages/pinball_components/assets/images/board-background.png b/packages/pinball_components/assets/images/board_background.png similarity index 100% rename from packages/pinball_components/assets/images/board-background.png rename to packages/pinball_components/assets/images/board_background.png diff --git a/packages/pinball_components/assets/images/boundary/outer-bottom.png b/packages/pinball_components/assets/images/boundary/outer_bottom.png similarity index 100% rename from packages/pinball_components/assets/images/boundary/outer-bottom.png rename to packages/pinball_components/assets/images/boundary/outer_bottom.png diff --git a/packages/pinball_components/assets/images/dino/bottom-wall.png b/packages/pinball_components/assets/images/dino/bottom_wall.png similarity index 100% rename from packages/pinball_components/assets/images/dino/bottom-wall.png rename to packages/pinball_components/assets/images/dino/bottom_wall.png diff --git a/packages/pinball_components/assets/images/dino/top-wall.png b/packages/pinball_components/assets/images/dino/top_wall.png similarity index 100% rename from packages/pinball_components/assets/images/dino/top-wall.png rename to packages/pinball_components/assets/images/dino/top_wall.png diff --git a/packages/pinball_components/assets/images/dino/top-wall-tunnel.png b/packages/pinball_components/assets/images/dino/top_wall_tunnel.png similarity index 100% rename from packages/pinball_components/assets/images/dino/top-wall-tunnel.png rename to packages/pinball_components/assets/images/dino/top_wall_tunnel.png diff --git a/packages/pinball_components/assets/images/flapper/back-support.png b/packages/pinball_components/assets/images/flapper/back_support.png similarity index 100% rename from packages/pinball_components/assets/images/flapper/back-support.png rename to packages/pinball_components/assets/images/flapper/back_support.png diff --git a/packages/pinball_components/assets/images/flapper/front-support.png b/packages/pinball_components/assets/images/flapper/front_support.png similarity index 100% rename from packages/pinball_components/assets/images/flapper/front-support.png rename to packages/pinball_components/assets/images/flapper/front_support.png diff --git a/packages/pinball_components/assets/images/launch_ramp/background-railing.png b/packages/pinball_components/assets/images/launch_ramp/background_railing.png similarity index 100% rename from packages/pinball_components/assets/images/launch_ramp/background-railing.png rename to packages/pinball_components/assets/images/launch_ramp/background_railing.png diff --git a/packages/pinball_components/assets/images/launch_ramp/foreground-railing.png b/packages/pinball_components/assets/images/launch_ramp/foreground_railing.png similarity index 100% rename from packages/pinball_components/assets/images/launch_ramp/foreground-railing.png rename to packages/pinball_components/assets/images/launch_ramp/foreground_railing.png diff --git a/packages/pinball_components/assets/images/score/five-thousand.png b/packages/pinball_components/assets/images/score/five_thousand.png similarity index 100% rename from packages/pinball_components/assets/images/score/five-thousand.png rename to packages/pinball_components/assets/images/score/five_thousand.png diff --git a/packages/pinball_components/assets/images/score/one-million.png b/packages/pinball_components/assets/images/score/one_million.png similarity index 100% rename from packages/pinball_components/assets/images/score/one-million.png rename to packages/pinball_components/assets/images/score/one_million.png diff --git a/packages/pinball_components/assets/images/score/twenty-thousand.png b/packages/pinball_components/assets/images/score/twenty_thousand.png similarity index 100% rename from packages/pinball_components/assets/images/score/twenty-thousand.png rename to packages/pinball_components/assets/images/score/twenty_thousand.png diff --git a/packages/pinball_components/assets/images/score/two-hundred-thousand.png b/packages/pinball_components/assets/images/score/two_hundred_thousand.png similarity index 100% rename from packages/pinball_components/assets/images/score/two-hundred-thousand.png rename to packages/pinball_components/assets/images/score/two_hundred_thousand.png diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index 0288d3f4..0c51342b 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -15,9 +15,9 @@ class $AssetsImagesGen { $AssetsImagesBallGen get ball => const $AssetsImagesBallGen(); $AssetsImagesBaseboardGen get baseboard => const $AssetsImagesBaseboardGen(); - /// File path: assets/images/board-background.png + /// File path: assets/images/board_background.png AssetGenImage get boardBackground => - const AssetGenImage('assets/images/board-background.png'); + const AssetGenImage('assets/images/board_background.png'); $AssetsImagesBoundaryGen get boundary => const $AssetsImagesBoundaryGen(); $AssetsImagesDashGen get dash => const $AssetsImagesDashGen(); @@ -59,9 +59,9 @@ class $AssetsImagesAndroidGen { class $AssetsImagesBackboxGen { const $AssetsImagesBackboxGen(); - /// File path: assets/images/backbox/display-divider.png + /// File path: assets/images/backbox/display_divider.png AssetGenImage get displayDivider => - const AssetGenImage('assets/images/backbox/display-divider.png'); + const AssetGenImage('assets/images/backbox/display_divider.png'); /// File path: assets/images/backbox/display_title_decoration.png AssetGenImage get displayTitleDecoration => @@ -99,13 +99,13 @@ class $AssetsImagesBoundaryGen { AssetGenImage get bottom => const AssetGenImage('assets/images/boundary/bottom.png'); - /// File path: assets/images/boundary/outer-bottom.png - AssetGenImage get outerBottom => - const AssetGenImage('assets/images/boundary/outer-bottom.png'); - /// File path: assets/images/boundary/outer.png AssetGenImage get outer => const AssetGenImage('assets/images/boundary/outer.png'); + + /// File path: assets/images/boundary/outer_bottom.png + AssetGenImage get outerBottom => + const AssetGenImage('assets/images/boundary/outer_bottom.png'); } class $AssetsImagesDashGen { @@ -124,33 +124,33 @@ class $AssetsImagesDinoGen { $AssetsImagesDinoAnimatronicGen get animatronic => const $AssetsImagesDinoAnimatronicGen(); - /// File path: assets/images/dino/bottom-wall.png + /// File path: assets/images/dino/bottom_wall.png AssetGenImage get bottomWall => - const AssetGenImage('assets/images/dino/bottom-wall.png'); + const AssetGenImage('assets/images/dino/bottom_wall.png'); - /// File path: assets/images/dino/top-wall-tunnel.png - AssetGenImage get topWallTunnel => - const AssetGenImage('assets/images/dino/top-wall-tunnel.png'); - - /// File path: assets/images/dino/top-wall.png + /// File path: assets/images/dino/top_wall.png AssetGenImage get topWall => - const AssetGenImage('assets/images/dino/top-wall.png'); + const AssetGenImage('assets/images/dino/top_wall.png'); + + /// File path: assets/images/dino/top_wall_tunnel.png + AssetGenImage get topWallTunnel => + const AssetGenImage('assets/images/dino/top_wall_tunnel.png'); } class $AssetsImagesFlapperGen { const $AssetsImagesFlapperGen(); - /// File path: assets/images/flapper/back-support.png + /// File path: assets/images/flapper/back_support.png AssetGenImage get backSupport => - const AssetGenImage('assets/images/flapper/back-support.png'); + const AssetGenImage('assets/images/flapper/back_support.png'); /// File path: assets/images/flapper/flap.png AssetGenImage get flap => const AssetGenImage('assets/images/flapper/flap.png'); - /// File path: assets/images/flapper/front-support.png + /// File path: assets/images/flapper/front_support.png AssetGenImage get frontSupport => - const AssetGenImage('assets/images/flapper/front-support.png'); + const AssetGenImage('assets/images/flapper/front_support.png'); } class $AssetsImagesFlipperGen { @@ -192,13 +192,13 @@ class $AssetsImagesKickerGen { class $AssetsImagesLaunchRampGen { const $AssetsImagesLaunchRampGen(); - /// File path: assets/images/launch_ramp/background-railing.png + /// File path: assets/images/launch_ramp/background_railing.png AssetGenImage get backgroundRailing => - const AssetGenImage('assets/images/launch_ramp/background-railing.png'); + const AssetGenImage('assets/images/launch_ramp/background_railing.png'); - /// File path: assets/images/launch_ramp/foreground-railing.png + /// File path: assets/images/launch_ramp/foreground_railing.png AssetGenImage get foregroundRailing => - const AssetGenImage('assets/images/launch_ramp/foreground-railing.png'); + const AssetGenImage('assets/images/launch_ramp/foreground_railing.png'); /// File path: assets/images/launch_ramp/ramp.png AssetGenImage get ramp => @@ -242,21 +242,21 @@ class $AssetsImagesPlungerGen { class $AssetsImagesScoreGen { const $AssetsImagesScoreGen(); - /// File path: assets/images/score/five-thousand.png + /// File path: assets/images/score/five_thousand.png AssetGenImage get fiveThousand => - const AssetGenImage('assets/images/score/five-thousand.png'); + const AssetGenImage('assets/images/score/five_thousand.png'); - /// File path: assets/images/score/one-million.png + /// File path: assets/images/score/one_million.png AssetGenImage get oneMillion => - const AssetGenImage('assets/images/score/one-million.png'); + const AssetGenImage('assets/images/score/one_million.png'); - /// File path: assets/images/score/twenty-thousand.png + /// File path: assets/images/score/twenty_thousand.png AssetGenImage get twentyThousand => - const AssetGenImage('assets/images/score/twenty-thousand.png'); + const AssetGenImage('assets/images/score/twenty_thousand.png'); - /// File path: assets/images/score/two-hundred-thousand.png + /// File path: assets/images/score/two_hundred_thousand.png AssetGenImage get twoHundredThousand => - const AssetGenImage('assets/images/score/two-hundred-thousand.png'); + const AssetGenImage('assets/images/score/two_hundred_thousand.png'); } class $AssetsImagesSignpostGen { @@ -353,21 +353,21 @@ class $AssetsImagesAndroidRampGen { $AssetsImagesAndroidRampArrowGen get arrow => const $AssetsImagesAndroidRampArrowGen(); - /// File path: assets/images/android/ramp/board-opening.png + /// File path: assets/images/android/ramp/board_opening.png AssetGenImage get boardOpening => - const AssetGenImage('assets/images/android/ramp/board-opening.png'); + const AssetGenImage('assets/images/android/ramp/board_opening.png'); /// File path: assets/images/android/ramp/main.png AssetGenImage get main => const AssetGenImage('assets/images/android/ramp/main.png'); - /// File path: assets/images/android/ramp/railing-background.png + /// File path: assets/images/android/ramp/railing_background.png AssetGenImage get railingBackground => - const AssetGenImage('assets/images/android/ramp/railing-background.png'); + const AssetGenImage('assets/images/android/ramp/railing_background.png'); - /// File path: assets/images/android/ramp/railing-foreground.png + /// File path: assets/images/android/ramp/railing_foreground.png AssetGenImage get railingForeground => - const AssetGenImage('assets/images/android/ramp/railing-foreground.png'); + const AssetGenImage('assets/images/android/ramp/railing_foreground.png'); } class $AssetsImagesAndroidSpaceshipGen { @@ -377,9 +377,9 @@ class $AssetsImagesAndroidSpaceshipGen { AssetGenImage get animatronic => const AssetGenImage('assets/images/android/spaceship/animatronic.png'); - /// File path: assets/images/android/spaceship/light-beam.png + /// File path: assets/images/android/spaceship/light_beam.png AssetGenImage get lightBeam => - const AssetGenImage('assets/images/android/spaceship/light-beam.png'); + const AssetGenImage('assets/images/android/spaceship/light_beam.png'); /// File path: assets/images/android/spaceship/saucer.png AssetGenImage get saucer => diff --git a/packages/pinball_components/test/src/components/board_background_sprite_component_test.dart b/packages/pinball_components/test/src/components/board_background_sprite_component_test.dart index df35594f..79e8c56b 100644 --- a/packages/pinball_components/test/src/components/board_background_sprite_component_test.dart +++ b/packages/pinball_components/test/src/components/board_background_sprite_component_test.dart @@ -40,7 +40,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/board-background.png'), + matchesGoldenFile('golden/board_background.png'), ); }, ); diff --git a/packages/pinball_components/test/src/components/dino_walls_test.dart b/packages/pinball_components/test/src/components/dino_walls_test.dart index 5e4471e5..dd8172ac 100644 --- a/packages/pinball_components/test/src/components/dino_walls_test.dart +++ b/packages/pinball_components/test/src/components/dino_walls_test.dart @@ -37,7 +37,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/dino-walls.png'), + matchesGoldenFile('golden/dino_walls.png'), ); }, ); diff --git a/packages/pinball_components/test/src/components/golden/board-background.png b/packages/pinball_components/test/src/components/golden/board_background.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/board-background.png rename to packages/pinball_components/test/src/components/golden/board_background.png diff --git a/packages/pinball_components/test/src/components/golden/dino-walls.png b/packages/pinball_components/test/src/components/golden/dino_walls.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/dino-walls.png rename to packages/pinball_components/test/src/components/golden/dino_walls.png diff --git a/packages/pinball_components/test/src/components/golden/launch-ramp.png b/packages/pinball_components/test/src/components/golden/launch_ramp.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/launch-ramp.png rename to packages/pinball_components/test/src/components/golden/launch_ramp.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x2-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x2_dimmed.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x2-dimmed.png rename to packages/pinball_components/test/src/components/golden/multipliers/x2_dimmed.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x2-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x2_lit.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x2-lit.png rename to packages/pinball_components/test/src/components/golden/multipliers/x2_lit.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x3-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x3_dimmed.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x3-dimmed.png rename to packages/pinball_components/test/src/components/golden/multipliers/x3_dimmed.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x3-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x3_lit.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x3-lit.png rename to packages/pinball_components/test/src/components/golden/multipliers/x3_lit.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x4-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x4_dimmed.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x4-dimmed.png rename to packages/pinball_components/test/src/components/golden/multipliers/x4_dimmed.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x4-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x4_lit.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x4-lit.png rename to packages/pinball_components/test/src/components/golden/multipliers/x4_lit.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x5-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x5_dimmed.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x5-dimmed.png rename to packages/pinball_components/test/src/components/golden/multipliers/x5_dimmed.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x5-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x5_lit.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x5-lit.png rename to packages/pinball_components/test/src/components/golden/multipliers/x5_lit.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x6-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x6_dimmed.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x6-dimmed.png rename to packages/pinball_components/test/src/components/golden/multipliers/x6_dimmed.png diff --git a/packages/pinball_components/test/src/components/golden/multipliers/x6-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x6_lit.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/multipliers/x6-lit.png rename to packages/pinball_components/test/src/components/golden/multipliers/x6_lit.png diff --git a/packages/pinball_components/test/src/components/golden/spaceship-rail.png b/packages/pinball_components/test/src/components/golden/spaceship_rail.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/spaceship-rail.png rename to packages/pinball_components/test/src/components/golden/spaceship_rail.png diff --git a/packages/pinball_components/test/src/components/golden/sparky-computer.png b/packages/pinball_components/test/src/components/golden/sparky_computer.png similarity index 100% rename from packages/pinball_components/test/src/components/golden/sparky-computer.png rename to packages/pinball_components/test/src/components/golden/sparky_computer.png diff --git a/packages/pinball_components/test/src/components/launch_ramp_test.dart b/packages/pinball_components/test/src/components/launch_ramp_test.dart index 38c0920b..11033b5a 100644 --- a/packages/pinball_components/test/src/components/launch_ramp_test.dart +++ b/packages/pinball_components/test/src/components/launch_ramp_test.dart @@ -36,7 +36,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/launch-ramp.png'), + matchesGoldenFile('golden/launch_ramp.png'), ); }, ); diff --git a/packages/pinball_components/test/src/components/multiplier/multiplier_test.dart b/packages/pinball_components/test/src/components/multiplier/multiplier_test.dart index c612ecb9..0a28ae54 100644 --- a/packages/pinball_components/test/src/components/multiplier/multiplier_test.dart +++ b/packages/pinball_components/test/src/components/multiplier/multiplier_test.dart @@ -122,7 +122,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x2-lit.png'), + matchesGoldenFile('../golden/multipliers/x2_lit.png'), ); }, ); @@ -162,7 +162,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x2-dimmed.png'), + matchesGoldenFile('../golden/multipliers/x2_dimmed.png'), ); }, ); @@ -206,7 +206,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x3-lit.png'), + matchesGoldenFile('../golden/multipliers/x3_lit.png'), ); }, ); @@ -246,7 +246,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x3-dimmed.png'), + matchesGoldenFile('../golden/multipliers/x3_dimmed.png'), ); }, ); @@ -290,7 +290,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x4-lit.png'), + matchesGoldenFile('../golden/multipliers/x4_lit.png'), ); }, ); @@ -330,7 +330,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x4-dimmed.png'), + matchesGoldenFile('../golden/multipliers/x4_dimmed.png'), ); }, ); @@ -374,7 +374,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x5-lit.png'), + matchesGoldenFile('../golden/multipliers/x5_lit.png'), ); }, ); @@ -414,7 +414,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x5-dimmed.png'), + matchesGoldenFile('../golden/multipliers/x5_dimmed.png'), ); }, ); @@ -458,7 +458,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x6-lit.png'), + matchesGoldenFile('../golden/multipliers/x6_lit.png'), ); }, ); @@ -498,7 +498,7 @@ void main() { await expectLater( find.byGame<_TestGame>(), - matchesGoldenFile('../golden/multipliers/x6-dimmed.png'), + matchesGoldenFile('../golden/multipliers/x6_dimmed.png'), ); }, ); diff --git a/packages/pinball_components/test/src/components/spaceship_rail_test.dart b/packages/pinball_components/test/src/components/spaceship_rail_test.dart index 65e9dbd7..78aa4aaa 100644 --- a/packages/pinball_components/test/src/components/spaceship_rail_test.dart +++ b/packages/pinball_components/test/src/components/spaceship_rail_test.dart @@ -35,7 +35,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/spaceship-rail.png'), + matchesGoldenFile('golden/spaceship_rail.png'), ); }, ); diff --git a/packages/pinball_components/test/src/components/sparky_computer/sparky_computer_test.dart b/packages/pinball_components/test/src/components/sparky_computer/sparky_computer_test.dart index d15f8056..0c045cb1 100644 --- a/packages/pinball_components/test/src/components/sparky_computer/sparky_computer_test.dart +++ b/packages/pinball_components/test/src/components/sparky_computer/sparky_computer_test.dart @@ -42,7 +42,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('../golden/sparky-computer.png'), + matchesGoldenFile('../golden/sparky_computer.png'), ); }, );