flame-engine · spydon · Apr 2, 2023 · Mar 16, 2023 · Mar 19, 2023 · Mar 19, 2023
diff --git a/doc/flame/examples/lib/anchor_by_effect.dart b/doc/flame/examples/lib/anchor_by_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class AnchorByEffectGame extends FlameGame with HasTappableComponents {
+class AnchorByEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/anchor_to_effect.dart b/doc/flame/examples/lib/anchor_to_effect.dart
@@ -1,10 +1,9 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class AnchorToEffectGame extends FlameGame with HasTappableComponents {
+class AnchorToEffectGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  final flower = Flower(

diff --git a/doc/flame/examples/lib/collision_detection.dart b/doc/flame/examples/lib/collision_detection.dart
@@ -2,12 +2,10 @@ import 'package:doc_flame_examples/ember.dart';
 import 'package:flame/collisions.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/material.dart' hide Image, Draggable;
 
-class CollisionDetectionGame extends FlameGame
- with HasCollisionDetection, HasTappableComponents {
+class CollisionDetectionGame extends FlameGame with HasCollisionDetection {
  @override
  Future<void> onLoad() async {
  final emberPlayer = EmberPlayer(

diff --git a/doc/flame/examples/lib/color_effect.dart b/doc/flame/examples/lib/color_effect.dart
@@ -1,12 +1,11 @@
 import 'package:doc_flame_examples/ember.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/animation.dart';
 import 'package:flutter/cupertino.dart';
 
-class ColorEffectExample extends FlameGame with HasTappableComponents {
+class ColorEffectExample extends FlameGame {
  bool reset = false;
 
  @override

diff --git a/doc/flame/examples/lib/decorator_blur.dart b/doc/flame/examples/lib/decorator_blur.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flame/rendering.dart';
 
-class DecoratorBlurGame extends FlameGame with HasTappableComponents {
+class DecoratorBlurGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  var step = 0;

diff --git a/doc/flame/examples/lib/decorator_grayscale.dart b/doc/flame/examples/lib/decorator_grayscale.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flame/rendering.dart';
 
-class DecoratorGrayscaleGame extends FlameGame with HasTappableComponents {
+class DecoratorGrayscaleGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  var step = 0;

diff --git a/doc/flame/examples/lib/decorator_rotate3d.dart b/doc/flame/examples/lib/decorator_rotate3d.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flame/rendering.dart';
 
-class DecoratorRotate3DGame extends FlameGame with HasTappableComponents {
+class DecoratorRotate3DGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  var step = 0;

diff --git a/doc/flame/examples/lib/decorator_shadow3d.dart b/doc/flame/examples/lib/decorator_shadow3d.dart
@@ -2,11 +2,10 @@ import 'dart:ui';
 
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/components.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flame/rendering.dart';
 
-class DecoratorShadowGame extends FlameGame with HasTappableComponents {
+class DecoratorShadowGame extends FlameGame {
  @override
  Color backgroundColor() => const Color(0xFFC7C7C7);
 

diff --git a/doc/flame/examples/lib/decorator_tint.dart b/doc/flame/examples/lib/decorator_tint.dart
@@ -1,11 +1,10 @@
 import 'dart:ui';
 
 import 'package:doc_flame_examples/flower.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flame/rendering.dart';
 
-class DecoratorTintGame extends FlameGame with HasTappableComponents {
+class DecoratorTintGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  var step = 0;

diff --git a/doc/flame/examples/lib/move_along_path_effect.dart b/doc/flame/examples/lib/move_along_path_effect.dart
@@ -2,10 +2,9 @@ import 'dart:ui';
 
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class MoveAlongPathEffectGame extends FlameGame with HasTappableComponents {
+class MoveAlongPathEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/move_by_effect.dart b/doc/flame/examples/lib/move_by_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class MoveByEffectGame extends FlameGame with HasTappableComponents {
+class MoveByEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/move_to_effect.dart b/doc/flame/examples/lib/move_to_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class MoveToEffectGame extends FlameGame with HasTappableComponents {
+class MoveToEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/opacity_by_effect.dart b/doc/flame/examples/lib/opacity_by_effect.dart
@@ -1,10 +1,9 @@
 import 'package:doc_flame_examples/ember.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class OpacityByEffectGame extends FlameGame with HasTappableComponents {
+class OpacityByEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/opacity_effect_with_target.dart b/doc/flame/examples/lib/opacity_effect_with_target.dart
@@ -1,10 +1,9 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class OpacityEffectWithTargetGame extends FlameGame with HasTappableComponents {
+class OpacityEffectWithTargetGame extends FlameGame {
  bool reset = false;
 
  // This reference needs to be stored because every new instance of

diff --git a/doc/flame/examples/lib/opacity_to_effect.dart b/doc/flame/examples/lib/opacity_to_effect.dart
@@ -1,10 +1,9 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class OpacityToEffectGame extends FlameGame with HasTappableComponents {
+class OpacityToEffectGame extends FlameGame {
  bool reset = false;
 
  @override

diff --git a/doc/flame/examples/lib/rotate_by_effect.dart b/doc/flame/examples/lib/rotate_by_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class RotateByEffectGame extends FlameGame with HasTappableComponents {
+class RotateByEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/rotate_to_effect.dart b/doc/flame/examples/lib/rotate_to_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class RotateToEffectGame extends FlameGame with HasTappableComponents {
+class RotateToEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/router.dart b/doc/flame/examples/lib/router.dart
@@ -5,7 +5,7 @@ import 'package:flame/game.dart';
 import 'package:flame/rendering.dart';
 import 'package:flutter/rendering.dart';
 
-class RouterGame extends FlameGame with HasTappableComponents {
+class RouterGame extends FlameGame {
  late final RouterComponent router;
 
  @override

diff --git a/doc/flame/examples/lib/scale_by_effect.dart b/doc/flame/examples/lib/scale_by_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class ScaleByEffectGame extends FlameGame with HasTappableComponents {
+class ScaleByEffectGame extends FlameGame {
  bool reverse = false;
  bool hold = false;
  @override

diff --git a/doc/flame/examples/lib/scale_to_effect.dart b/doc/flame/examples/lib/scale_to_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class ScaleToEffectGame extends FlameGame with HasTappableComponents {
+class ScaleToEffectGame extends FlameGame {
  bool reverse = false;
  bool hold = false;
  @override

diff --git a/doc/flame/examples/lib/sequence_effect.dart b/doc/flame/examples/lib/sequence_effect.dart
@@ -1,9 +1,8 @@
 import 'package:doc_flame_examples/flower.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class SequenceEffectGame extends FlameGame with HasTappableComponents {
+class SequenceEffectGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  final flower = Flower(

diff --git a/doc/flame/examples/lib/size_by_effect.dart b/doc/flame/examples/lib/size_by_effect.dart
@@ -1,10 +1,9 @@
 import 'package:doc_flame_examples/ember.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class SizeByEffectGame extends FlameGame with HasTappableComponents {
+class SizeByEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/size_to_effect.dart b/doc/flame/examples/lib/size_to_effect.dart
@@ -1,10 +1,9 @@
 import 'package:doc_flame_examples/ember.dart';
 import 'package:flame/components.dart';
 import 'package:flame/effects.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class SizeToEffectGame extends FlameGame with HasTappableComponents {
+class SizeToEffectGame extends FlameGame {
  bool reset = false;
  @override
  Future<void> onLoad() async {

diff --git a/doc/flame/examples/lib/tap_events.dart b/doc/flame/examples/lib/tap_events.dart
@@ -5,18 +5,15 @@ import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/rendering.dart';
 
-/// The main [FlameGame] class uses [HasTappableComponents] in order to enable
-/// tap events propagation.
-class TapEventsGame extends FlameGame with HasTappableComponents {
+class TapEventsGame extends FlameGame {
  @override
  Future<void> onLoad() async {
  add(TapTarget());
  }
 }
 
-/// This component is the tappable blue-ish rectangle in the center of the
-/// game. It uses the [TapCallbacks] mixin in order to inform the game that it
-/// wants to receive tap events.
+/// This component is the tappable blue-ish rectangle in the center of the game.
+/// It uses the [TapCallbacks] mixin to receive tap events.
 class TapTarget extends PositionComponent with TapCallbacks {
  TapTarget() : super(anchor: Anchor.center);
 

diff --git a/doc/flame/examples/lib/time_scale.dart b/doc/flame/examples/lib/time_scale.dart
@@ -2,10 +2,9 @@ import 'dart:async';
 
 import 'package:doc_flame_examples/ember.dart';
 import 'package:flame/components.dart';
-import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class TimeScaleGame extends FlameGame with HasTimeScale, HasTappableComponents {
+class TimeScaleGame extends FlameGame with HasTimeScale {
  final _timeScales = [0.5, 1.0, 2.0];
  var _index = 1;
 

diff --git a/doc/flame/examples/lib/value_route.dart b/doc/flame/examples/lib/value_route.dart
@@ -6,7 +6,7 @@ import 'package:flame/components.dart';
 import 'package:flame/experimental.dart';
 import 'package:flame/game.dart';
 
-class ValueRouteExample extends FlameGame with HasTappableComponents {
+class ValueRouteExample extends FlameGame {
  late final RouterComponent router;
 
  @override

diff --git a/doc/flame/examples/pubspec.yaml b/doc/flame/examples/pubspec.yaml
@@ -15,6 +15,7 @@ dependencies:
 
 dev_dependencies:
  flame_lint: ^0.2.0
+
 flutter:
  assets:
  - assets/

diff --git a/doc/flame/inputs/drag_events.md b/doc/flame/inputs/drag_events.md
@@ -17,7 +17,8 @@ For those components that you want to respond to drags, add the `DragCallbacks`
 - This mixin adds four overridable methods to your component: `onDragStart`, `onDragUpdate`,
  `onDragEnd`, and `onDragCancel`. By default, these methods do nothing -- they need to be
  overridden in order to perform any function.
-- In addition, the component must implement the `containsLocalPoint()` method -- this method
+- In addition, the component must implement the `containsLocalPoint()` method (already implemented
+ in `PositionComponent`, so most of the time you don't need to do anything here) -- this method
  allows Flame to know whether the event occurred within the component or not.
 
 ```dart