From 8bdd10dfca4af31450623287c6c11f1864e133c6 Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Fri, 1 Apr 2022 12:26:20 +0100
Subject: [PATCH] refactor: migrated to ParticleSystemComponent

---
 .../lib/src/components/ball.dart              |  4 +-
 .../lib/src/components/fire_effect.dart       | 53 +++++--------------
 .../lib/stories/effects/fire_effect.dart      |  1 -
 .../test/src/components/fire_effect_test.dart | 17 ------
 4 files changed, 14 insertions(+), 61 deletions(-)

diff --git a/packages/pinball_components/lib/src/components/ball.dart b/packages/pinball_components/lib/src/components/ball.dart
index b62ceeba..3d7c3427 100644
--- a/packages/pinball_components/lib/src/components/ball.dart
+++ b/packages/pinball_components/lib/src/components/ball.dart
@@ -83,8 +83,8 @@ class Ball<T extends Forge2DGame> extends BodyComponent<T>
       final direction = body.linearVelocity.normalized();
       final effect = FireEffect(
         burstPower: _boostTimer,
-        direction: direction,
-        position: body.position,
+        direction: -direction,
+        position: Vector2(body.position.x, -body.position.y),
       );
 
       unawaited(gameRef.add(effect));
diff --git a/packages/pinball_components/lib/src/components/fire_effect.dart b/packages/pinball_components/lib/src/components/fire_effect.dart
index 0a7cef2b..2970083d 100644
--- a/packages/pinball_components/lib/src/components/fire_effect.dart
+++ b/packages/pinball_components/lib/src/components/fire_effect.dart
@@ -1,5 +1,6 @@
 import 'dart:math' as math;
 
+import 'package:flame/components.dart';
 import 'package:flame/extensions.dart';
 import 'package:flame/particles.dart';
 import 'package:flame_forge2d/flame_forge2d.dart' hide Particle;
@@ -19,33 +20,20 @@ const _particleRadius = 0.25;
 /// A [BodyComponent] which creates a fire trail effect using the given
 /// parameters
 /// {@endtemplate}
-class FireEffect extends BodyComponent {
+class FireEffect extends ParticleSystemComponent {
   /// {@macro fire_effect}
   FireEffect({
     required this.burstPower,
-    required this.position,
     required this.direction,
-  });
+    Vector2? position,
+  }) : super(position: position);
 
   /// A [double] value that will define how "strong" the burst of particles
-  /// will be
+  /// will be.
   final double burstPower;
 
-  /// The position of the burst
-  final Vector2 position;
-
-  /// Which direction the burst will aim
+  /// Which direction the burst will aim.
   final Vector2 direction;
-  late Particle _particle;
-
-  @override
-  Body createBody() {
-    final bodyDef = BodyDef()..position = position;
-
-    final fixtureDef = FixtureDef(CircleShape()..radius = 0)..isSensor = true;
-
-    return world.createBody(bodyDef)..createFixture(fixtureDef);
-  }
 
   @override
   Future<void> onLoad() async {
@@ -71,15 +59,15 @@ class FireEffect extends BodyComponent {
         );
       }),
     ];
-    final rng = math.Random();
+    final random = math.Random();
     final spreadTween = Tween<double>(begin: -0.2, end: 0.2);
 
-    _particle = Particle.generate(
-      count: (rng.nextDouble() * (burstPower * 10)).toInt(),
+    particle = Particle.generate(
+      count: (random.nextDouble() * (burstPower * 10)).toInt(),
       generator: (_) {
         final spread = Vector2(
-          spreadTween.transform(rng.nextDouble()),
-          spreadTween.transform(rng.nextDouble()),
+          spreadTween.transform(random.nextDouble()),
+          spreadTween.transform(random.nextDouble()),
         );
         final finalDirection = Vector2(direction.x, -direction.y) + spread;
         final speed = finalDirection * (burstPower * 20);
@@ -88,26 +76,9 @@ class FireEffect extends BodyComponent {
           lifespan: 5 / burstPower,
           position: Vector2.zero(),
           speed: speed,
-          child: children[rng.nextInt(children.length)],
+          child: children[random.nextInt(children.length)],
         );
       },
     );
   }
-
-  @override
-  void update(double dt) {
-    super.update(dt);
-    _particle.update(dt);
-
-    if (_particle.shouldRemove) {
-      removeFromParent();
-    }
-  }
-
-  @override
-  void render(Canvas canvas) {
-    super.render(canvas);
-
-    _particle.render(canvas);
-  }
 }
diff --git a/packages/pinball_components/sandbox/lib/stories/effects/fire_effect.dart b/packages/pinball_components/sandbox/lib/stories/effects/fire_effect.dart
index 9f066952..1262af11 100644
--- a/packages/pinball_components/sandbox/lib/stories/effects/fire_effect.dart
+++ b/packages/pinball_components/sandbox/lib/stories/effects/fire_effect.dart
@@ -34,7 +34,6 @@ class _EffectEmitter extends Component {
       add(
         FireEffect(
           burstPower: (_timer / _timerLimit) * _force,
-          position: Vector2.zero(),
           direction: _direction,
         ),
       );
diff --git a/packages/pinball_components/test/src/components/fire_effect_test.dart b/packages/pinball_components/test/src/components/fire_effect_test.dart
index 7bc62212..ad4caa35 100644
--- a/packages/pinball_components/test/src/components/fire_effect_test.dart
+++ b/packages/pinball_components/test/src/components/fire_effect_test.dart
@@ -35,22 +35,5 @@ void main() {
       await game.ready();
       expect(game.children.whereType<FireEffect>().length, equals(0));
     });
-
-    flameTester.test('render circles on the canvas', (game) async {
-      final effect = FireEffect(
-        burstPower: 1,
-        position: Vector2.zero(),
-        direction: Vector2.all(2),
-      );
-      await game.ensureAdd(effect);
-      await game.ready();
-
-      final canvas = MockCanvas();
-      effect.render(canvas);
-
-      verify(() => canvas.drawCircle(any(), any(), any())).called(
-        greaterThan(0),
-      );
-    });
   });
 }