From 87b8a067f3e0096cebff3db4f5767e68616928fd Mon Sep 17 00:00:00 2001 From: Lukas Klingsbo Date: Wed, 19 Apr 2023 09:55:32 +0200 Subject: [PATCH] refactor!: Move `CameraComponent` and events out of experimental (#2505) This moves the CameraComponent and the new event system out of experimental since this now is the recommended way of handling things. --- doc/flame/camera_component.md | 5 ++- doc/flame/examples/lib/drag_events.dart | 2 +- doc/flame/examples/lib/ember.dart | 2 +- doc/flame/examples/lib/flower.dart | 2 +- doc/flame/examples/lib/router.dart | 2 +- doc/flame/examples/lib/tap_events.dart | 2 +- doc/flame/examples/lib/value_route.dart | 1 + .../klondike/app/lib/step2/klondike_game.dart | 1 - .../klondike/app/lib/step3/klondike_game.dart | 1 - .../app/lib/step4/components/card.dart | 2 +- .../app/lib/step4/components/stock_pile.dart | 2 +- .../klondike/app/lib/step4/klondike_game.dart | 1 - examples/games/padracing/lib/car.dart | 2 +- .../games/padracing/lib/padracing_game.dart | 2 +- .../flame_isolate/simple_isolate_example.dart | 2 +- .../forge2d/tap_callbacks_example.dart | 2 +- .../camera_component_example.dart | 2 +- .../camera_component_properties_example.dart | 3 +- .../follow_component_example.dart | 2 +- .../multiple_shapes_example.dart | 2 +- .../multiple_worlds_example.dart | 1 - .../components_notifier_example.dart | 2 +- .../components_notifier_provider_example.dart | 2 +- .../stories/components/priority_example.dart | 2 +- .../effects/remove_effect_example.dart | 2 +- .../input/double_tap_callbacks_example.dart | 2 +- .../lib/stories/input/draggables_example.dart | 2 +- .../input/gesture_hitboxes_example.dart | 2 +- .../input/overlapping_tappables_example.dart | 2 +- .../stories/input/tap_callbacks_example.dart | 2 +- .../stories/sprites/sprite_group_example.dart | 2 +- packages/flame/example/lib/main.dart | 2 +- packages/flame/lib/camera.dart | 12 ++++++ packages/flame/lib/components.dart | 2 + packages/flame/lib/events.dart | 25 +++++++++++++ packages/flame/lib/experimental.dart | 37 ------------------- .../components/input/button_component.dart | 2 +- .../components/input/joystick_component.dart | 2 +- .../input/sprite_button_component.dart | 2 +- .../mixins/component_viewport_margin.dart | 1 - .../src/components/position_component.dart | 5 ++- .../src/events/messages/position_event.dart | 4 +- .../bounded_position_behavior_test.dart | 1 + .../behaviors/follow_behavior_test.dart | 2 +- .../test/camera/camera_component_test.dart | 2 + .../flame/test/camera/viewfinder_test.dart | 2 +- .../viewports/circular_viewport_test.dart | 2 +- .../fixed_aspect_ratio_viewport_test.dart | 2 +- .../viewports/fixed_size_viewport_test.dart | 2 +- .../camera/viewports/max_viewport_test.dart | 2 +- .../collisions/collision_callback_test.dart | 1 - .../collisions/collision_test_helpers.dart | 1 - .../test/components/mixins/tappable_test.dart | 2 +- .../test/effects/anchor_to_effect_test.dart | 1 - .../effects/move_along_path_effect_test.dart | 1 - .../double_tap_callbacks_test.dart | 2 +- .../component_mixins/drag_callbacks_test.dart | 2 +- .../component_mixins/tap_callbacks_test.dart | 2 +- .../has_draggable_components_test.dart | 1 - .../has_tappable_components_test.dart | 1 - packages/flame/test/game/flame_game_test.dart | 2 +- packages/flame_forge2d/example/lib/main.dart | 2 +- .../flame_forge2d/lib/body_component.dart | 2 +- .../lib/brains/worker_overmind_hud.dart | 2 +- packages/flame_rive/example/lib/main.dart | 2 +- packages/flame_rive/test/flame_rive_test.dart | 2 +- .../lib/src/mock_tap_drag_events.dart | 2 +- 67 files changed, 98 insertions(+), 100 deletions(-) create mode 100644 packages/flame/lib/camera.dart diff --git a/doc/flame/camera_component.md b/doc/flame/camera_component.md index 6ebe46a0e9..7c4041d935 100644 --- a/doc/flame/camera_component.md +++ b/doc/flame/camera_component.md @@ -1,8 +1,9 @@ # Camera component ```{note} -This document describes a new experimental API. The more traditional approach -for handling a camera is described in [](camera_and_viewport.md). +This document describes a new camera API. The more traditional approach +(which will be deprecated) for handling a camera is described in +[](camera_and_viewport.md). ``` Camera-as-a-component is an alternative way of structuring a game, an approach diff --git a/doc/flame/examples/lib/drag_events.dart b/doc/flame/examples/lib/drag_events.dart index 4965752a4f..625745fd95 100644 --- a/doc/flame/examples/lib/drag_events.dart +++ b/doc/flame/examples/lib/drag_events.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flutter/rendering.dart'; diff --git a/doc/flame/examples/lib/ember.dart b/doc/flame/examples/lib/ember.dart index 5343897010..4536c810bf 100644 --- a/doc/flame/examples/lib/ember.dart +++ b/doc/flame/examples/lib/ember.dart @@ -1,6 +1,6 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/flame.dart'; class EmberPlayer extends SpriteAnimationComponent with TapCallbacks { diff --git a/doc/flame/examples/lib/flower.dart b/doc/flame/examples/lib/flower.dart index c3a9aa56b4..283ac2e3eb 100644 --- a/doc/flame/examples/lib/flower.dart +++ b/doc/flame/examples/lib/flower.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'dart:ui'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/rendering.dart'; const tau = 2 * pi; diff --git a/doc/flame/examples/lib/router.dart b/doc/flame/examples/lib/router.dart index f11e930f9f..3a84131107 100644 --- a/doc/flame/examples/lib/router.dart +++ b/doc/flame/examples/lib/router.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/rendering.dart'; import 'package:flutter/rendering.dart'; diff --git a/doc/flame/examples/lib/tap_events.dart b/doc/flame/examples/lib/tap_events.dart index 8cfbad1c67..f582b7654f 100644 --- a/doc/flame/examples/lib/tap_events.dart +++ b/doc/flame/examples/lib/tap_events.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flutter/rendering.dart'; diff --git a/doc/flame/examples/lib/value_route.dart b/doc/flame/examples/lib/value_route.dart index 85d3f402d9..e34a618fc6 100644 --- a/doc/flame/examples/lib/value_route.dart +++ b/doc/flame/examples/lib/value_route.dart @@ -3,6 +3,7 @@ import 'dart:ui'; import 'package:doc_flame_examples/router.dart'; import 'package:flame/components.dart'; +import 'package:flame/events.dart'; import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; diff --git a/doc/tutorials/klondike/app/lib/step2/klondike_game.dart b/doc/tutorials/klondike/app/lib/step2/klondike_game.dart index 91b9d15840..888cbe079d 100644 --- a/doc/tutorials/klondike/app/lib/step2/klondike_game.dart +++ b/doc/tutorials/klondike/app/lib/step2/klondike_game.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/flame.dart'; import 'package:flame/game.dart'; diff --git a/doc/tutorials/klondike/app/lib/step3/klondike_game.dart b/doc/tutorials/klondike/app/lib/step3/klondike_game.dart index 1c45d93660..a886cfdf0b 100644 --- a/doc/tutorials/klondike/app/lib/step3/klondike_game.dart +++ b/doc/tutorials/klondike/app/lib/step3/klondike_game.dart @@ -1,7 +1,6 @@ import 'dart:math'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/flame.dart'; import 'package:flame/game.dart'; diff --git a/doc/tutorials/klondike/app/lib/step4/components/card.dart b/doc/tutorials/klondike/app/lib/step4/components/card.dart index 9dae573a44..d05135e177 100644 --- a/doc/tutorials/klondike/app/lib/step4/components/card.dart +++ b/doc/tutorials/klondike/app/lib/step4/components/card.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'dart:ui'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import '../klondike_game.dart'; import '../pile.dart'; diff --git a/doc/tutorials/klondike/app/lib/step4/components/stock_pile.dart b/doc/tutorials/klondike/app/lib/step4/components/stock_pile.dart index a894362547..3a85debf7a 100644 --- a/doc/tutorials/klondike/app/lib/step4/components/stock_pile.dart +++ b/doc/tutorials/klondike/app/lib/step4/components/stock_pile.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import '../klondike_game.dart'; import '../pile.dart'; diff --git a/doc/tutorials/klondike/app/lib/step4/klondike_game.dart b/doc/tutorials/klondike/app/lib/step4/klondike_game.dart index dc928ad1cc..52eb91646a 100644 --- a/doc/tutorials/klondike/app/lib/step4/klondike_game.dart +++ b/doc/tutorials/klondike/app/lib/step4/klondike_game.dart @@ -1,7 +1,6 @@ import 'dart:ui'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/flame.dart'; import 'package:flame/game.dart'; diff --git a/examples/games/padracing/lib/car.dart b/examples/games/padracing/lib/car.dart index b8fbaaddc8..2a97dc3ad8 100644 --- a/examples/games/padracing/lib/car.dart +++ b/examples/games/padracing/lib/car.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:flame/experimental.dart'; +import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide Particle, World; import 'package:flutter/material.dart' hide Image, Gradient; diff --git a/examples/games/padracing/lib/padracing_game.dart b/examples/games/padracing/lib/padracing_game.dart index 5a0e203af7..2f8b989745 100644 --- a/examples/games/padracing/lib/padracing_game.dart +++ b/examples/games/padracing/lib/padracing_game.dart @@ -1,9 +1,9 @@ import 'dart:math'; import 'package:collection/collection.dart'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/extensions.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide Particle, World; diff --git a/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart b/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart index 0103f21236..fcedc98f8d 100644 --- a/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart +++ b/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame_isolate/flame_isolate.dart'; diff --git a/examples/lib/stories/bridge_libraries/forge2d/tap_callbacks_example.dart b/examples/lib/stories/bridge_libraries/forge2d/tap_callbacks_example.dart index e3faf3c55e..9bb7eb1c88 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/tap_callbacks_example.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/tap_callbacks_example.dart @@ -1,6 +1,6 @@ import 'package:examples/stories/bridge_libraries/forge2d/utils/balls.dart'; import 'package:examples/stories/bridge_libraries/forge2d/utils/boundaries.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/palette.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; diff --git a/examples/lib/stories/camera_and_viewport/camera_component_example.dart b/examples/lib/stories/camera_and_viewport/camera_component_example.dart index a9dcb6320e..a107bc8044 100644 --- a/examples/lib/stories/camera_and_viewport/camera_component_example.dart +++ b/examples/lib/stories/camera_and_viewport/camera_component_example.dart @@ -1,7 +1,7 @@ import 'dart:math'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/extensions.dart' show OffsetExtension; import 'package:flame/game.dart'; import 'package:flame/input.dart'; diff --git a/examples/lib/stories/camera_and_viewport/camera_component_properties_example.dart b/examples/lib/stories/camera_and_viewport/camera_component_properties_example.dart index 9d9d2262e1..9817a6a0ea 100644 --- a/examples/lib/stories/camera_and_viewport/camera_component_properties_example.dart +++ b/examples/lib/stories/camera_and_viewport/camera_component_properties_example.dart @@ -1,7 +1,8 @@ import 'dart:ui'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart' hide Viewport; class CameraComponentPropertiesExample extends FlameGame with TapCallbacks { diff --git a/examples/lib/stories/camera_and_viewport/follow_component_example.dart b/examples/lib/stories/camera_and_viewport/follow_component_example.dart index 43f2ec705d..20801e617b 100644 --- a/examples/lib/stories/camera_and_viewport/follow_component_example.dart +++ b/examples/lib/stories/camera_and_viewport/follow_component_example.dart @@ -4,7 +4,7 @@ import 'package:examples/commons/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/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; diff --git a/examples/lib/stories/collision_detection/multiple_shapes_example.dart b/examples/lib/stories/collision_detection/multiple_shapes_example.dart index 682fa6598f..2e83cf30f1 100644 --- a/examples/lib/stories/collision_detection/multiple_shapes_example.dart +++ b/examples/lib/stories/collision_detection/multiple_shapes_example.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; diff --git a/examples/lib/stories/collision_detection/multiple_worlds_example.dart b/examples/lib/stories/collision_detection/multiple_worlds_example.dart index 34e77820e9..2994d35b68 100644 --- a/examples/lib/stories/collision_detection/multiple_worlds_example.dart +++ b/examples/lib/stories/collision_detection/multiple_worlds_example.dart @@ -4,7 +4,6 @@ import 'package:examples/commons/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'; diff --git a/examples/lib/stories/components/components_notifier_example.dart b/examples/lib/stories/components/components_notifier_example.dart index eff9eba5fb..46d036010c 100644 --- a/examples/lib/stories/components/components_notifier_example.dart +++ b/examples/lib/stories/components/components_notifier_example.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/widgets.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/components/components_notifier_provider_example.dart b/examples/lib/stories/components/components_notifier_provider_example.dart index 383bf3ca7b..81826b5fcb 100644 --- a/examples/lib/stories/components/components_notifier_provider_example.dart +++ b/examples/lib/stories/components/components_notifier_provider_example.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/examples/lib/stories/components/priority_example.dart b/examples/lib/stories/components/priority_example.dart index a1f8d92ca4..04b3d3ab8d 100644 --- a/examples/lib/stories/components/priority_example.dart +++ b/examples/lib/stories/components/priority_example.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; diff --git a/examples/lib/stories/effects/remove_effect_example.dart b/examples/lib/stories/effects/remove_effect_example.dart index f5d0d959bc..713c85176e 100644 --- a/examples/lib/stories/effects/remove_effect_example.dart +++ b/examples/lib/stories/effects/remove_effect_example.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/input/double_tap_callbacks_example.dart b/examples/lib/stories/input/double_tap_callbacks_example.dart index f24d751806..df8190d815 100644 --- a/examples/lib/stories/input/double_tap_callbacks_example.dart +++ b/examples/lib/stories/input/double_tap_callbacks_example.dart @@ -1,6 +1,6 @@ import 'package:examples/commons/ember.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/input/draggables_example.dart b/examples/lib/stories/input/draggables_example.dart index 7e37e16581..dc3ed54983 100644 --- a/examples/lib/stories/input/draggables_example.dart +++ b/examples/lib/stories/input/draggables_example.dart @@ -1,5 +1,5 @@ import 'package:examples/commons/ember.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart' show Colors; diff --git a/examples/lib/stories/input/gesture_hitboxes_example.dart b/examples/lib/stories/input/gesture_hitboxes_example.dart index 75538c9fee..5c262471fd 100644 --- a/examples/lib/stories/input/gesture_hitboxes_example.dart +++ b/examples/lib/stories/input/gesture_hitboxes_example.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; diff --git a/examples/lib/stories/input/overlapping_tappables_example.dart b/examples/lib/stories/input/overlapping_tappables_example.dart index 8a5f01a681..19d4c97eb9 100644 --- a/examples/lib/stories/input/overlapping_tappables_example.dart +++ b/examples/lib/stories/input/overlapping_tappables_example.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/input/tap_callbacks_example.dart b/examples/lib/stories/input/tap_callbacks_example.dart index 234b3adb79..1aa852400a 100644 --- a/examples/lib/stories/input/tap_callbacks_example.dart +++ b/examples/lib/stories/input/tap_callbacks_example.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/sprites/sprite_group_example.dart b/examples/lib/stories/sprites/sprite_group_example.dart index 4dad2514f7..7cbe07f136 100644 --- a/examples/lib/stories/sprites/sprite_group_example.dart +++ b/examples/lib/stories/sprites/sprite_group_example.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; enum ButtonState { unpressed, pressed } diff --git a/packages/flame/example/lib/main.dart b/packages/flame/example/lib/main.dart index f9408ab6f7..4ee6b7b8eb 100644 --- a/packages/flame/example/lib/main.dart +++ b/packages/flame/example/lib/main.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; import 'package:flutter/material.dart'; diff --git a/packages/flame/lib/camera.dart b/packages/flame/lib/camera.dart new file mode 100644 index 0000000000..afe919bed0 --- /dev/null +++ b/packages/flame/lib/camera.dart @@ -0,0 +1,12 @@ +export 'src/camera/behaviors/bounded_position_behavior.dart' + show BoundedPositionBehavior; +export 'src/camera/behaviors/follow_behavior.dart' show FollowBehavior; +export 'src/camera/camera_component.dart' show CameraComponent; +export 'src/camera/viewfinder.dart' show Viewfinder; +export 'src/camera/viewport.dart' show Viewport; +export 'src/camera/viewports/circular_viewport.dart' show CircularViewport; +export 'src/camera/viewports/fixed_aspect_ratio_viewport.dart' + show FixedAspectRatioViewport; +export 'src/camera/viewports/fixed_size_viewport.dart' show FixedSizeViewport; +export 'src/camera/viewports/max_viewport.dart' show MaxViewport; +export 'src/camera/world.dart' show World; diff --git a/packages/flame/lib/components.dart b/packages/flame/lib/components.dart index 3820f992b6..aeeb46aabe 100644 --- a/packages/flame/lib/components.dart +++ b/packages/flame/lib/components.dart @@ -1,5 +1,7 @@ /// {@canonicalFor anchor.Anchor} export 'src/anchor.dart'; +export 'src/camera/camera_component.dart' show CameraComponent; +export 'src/camera/world.dart' show World; export 'src/collisions/has_collision_detection.dart'; export 'src/collisions/hitboxes/screen_hitbox.dart'; export 'src/components/clip_component.dart'; diff --git a/packages/flame/lib/events.dart b/packages/flame/lib/events.dart index 77857c22ef..5f85822e1b 100644 --- a/packages/flame/lib/events.dart +++ b/packages/flame/lib/events.dart @@ -1,3 +1,17 @@ +export 'src/events/component_mixins/double_tap_callbacks.dart' + show DoubleTapCallbacks; +export 'src/events/component_mixins/drag_callbacks.dart' show DragCallbacks; +export 'src/events/component_mixins/tap_callbacks.dart' show TapCallbacks; +export 'src/events/flame_game_mixins/has_draggable_components.dart' + show + HasDraggableComponents; // ignore: deprecated_member_use_from_same_package +export 'src/events/flame_game_mixins/has_draggables_bridge.dart' + show HasDraggablesBridge; // ignore: deprecated_member_use_from_same_package +export 'src/events/flame_game_mixins/has_tappable_components.dart' + show + HasTappableComponents; // ignore: deprecated_member_use_from_same_package +export 'src/events/flame_game_mixins/has_tappables_bridge.dart' + show HasTappablesBridge; // ignore: deprecated_member_use_from_same_package export 'src/events/game_mixins/multi_touch_drag_detector.dart' show MultiTouchDragDetector; export 'src/events/game_mixins/multi_touch_tap_detector.dart' @@ -6,6 +20,17 @@ export 'src/events/hardware_keyboard_detector.dart' show HardwareKeyboardDetector; export 'src/events/interfaces/multi_drag_listener.dart' show MultiDragListener; export 'src/events/interfaces/multi_tap_listener.dart' show MultiTapListener; +export 'src/events/messages/double_tap_cancel_event.dart' + show DoubleTapCancelEvent; +export 'src/events/messages/double_tap_down_event.dart' show DoubleTapDownEvent; +export 'src/events/messages/double_tap_event.dart' show DoubleTapEvent; +export 'src/events/messages/drag_cancel_event.dart' show DragCancelEvent; +export 'src/events/messages/drag_end_event.dart' show DragEndEvent; +export 'src/events/messages/drag_start_event.dart' show DragStartEvent; +export 'src/events/messages/drag_update_event.dart' show DragUpdateEvent; +export 'src/events/messages/tap_cancel_event.dart' show TapCancelEvent; +export 'src/events/messages/tap_down_event.dart' show TapDownEvent; +export 'src/events/messages/tap_up_event.dart' show TapUpEvent; export 'src/game/mixins/has_draggables.dart' show HasDraggables; export 'src/game/mixins/has_hoverables.dart' show HasHoverables; export 'src/game/mixins/has_tappables.dart' show HasTappables; diff --git a/packages/flame/lib/experimental.dart b/packages/flame/lib/experimental.dart index dcc6bdb59e..b921868555 100644 --- a/packages/flame/lib/experimental.dart +++ b/packages/flame/lib/experimental.dart @@ -9,43 +9,6 @@ /// After the components lived here for some time, and when we gain more /// confidence in their robustness, they will be moved out into the main Flame /// library. -export 'src/camera/behaviors/bounded_position_behavior.dart' - show BoundedPositionBehavior; -export 'src/camera/behaviors/follow_behavior.dart' show FollowBehavior; -export 'src/camera/camera_component.dart' show CameraComponent; -export 'src/camera/viewfinder.dart' show Viewfinder; -export 'src/camera/viewport.dart' show Viewport; -export 'src/camera/viewports/circular_viewport.dart' show CircularViewport; -export 'src/camera/viewports/fixed_aspect_ratio_viewport.dart' - show FixedAspectRatioViewport; -export 'src/camera/viewports/fixed_size_viewport.dart' show FixedSizeViewport; -export 'src/camera/viewports/max_viewport.dart' show MaxViewport; -export 'src/camera/world.dart' show World; -export 'src/events/component_mixins/double_tap_callbacks.dart' - show DoubleTapCallbacks; -export 'src/events/component_mixins/drag_callbacks.dart' show DragCallbacks; -export 'src/events/component_mixins/tap_callbacks.dart' show TapCallbacks; -export 'src/events/flame_game_mixins/has_draggable_components.dart' - show - HasDraggableComponents; // ignore: deprecated_member_use_from_same_package -export 'src/events/flame_game_mixins/has_draggables_bridge.dart' - show HasDraggablesBridge; // ignore: deprecated_member_use_from_same_package -export 'src/events/flame_game_mixins/has_tappable_components.dart' - show - HasTappableComponents; // ignore: deprecated_member_use_from_same_package -export 'src/events/flame_game_mixins/has_tappables_bridge.dart' - show HasTappablesBridge; // ignore: deprecated_member_use_from_same_package -export 'src/events/messages/double_tap_cancel_event.dart' - show DoubleTapCancelEvent; -export 'src/events/messages/double_tap_down_event.dart' show DoubleTapDownEvent; -export 'src/events/messages/double_tap_event.dart' show DoubleTapEvent; -export 'src/events/messages/drag_cancel_event.dart' show DragCancelEvent; -export 'src/events/messages/drag_end_event.dart' show DragEndEvent; -export 'src/events/messages/drag_start_event.dart' show DragStartEvent; -export 'src/events/messages/drag_update_event.dart' show DragUpdateEvent; -export 'src/events/messages/tap_cancel_event.dart' show TapCancelEvent; -export 'src/events/messages/tap_down_event.dart' show TapDownEvent; -export 'src/events/messages/tap_up_event.dart' show TapUpEvent; export 'src/experimental/fixed_integer_resolution_viewport.dart' show FixedIntegerResolutionViewport; export 'src/experimental/geometry/shapes/circle.dart' show Circle; diff --git a/packages/flame/lib/src/components/input/button_component.dart b/packages/flame/lib/src/components/input/button_component.dart index f758899b29..3e96c15b5c 100644 --- a/packages/flame/lib/src/components/input/button_component.dart +++ b/packages/flame/lib/src/components/input/button_component.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:meta/meta.dart'; /// The [ButtonComponent] bundles two [PositionComponent]s, one that shows while diff --git a/packages/flame/lib/src/components/input/joystick_component.dart b/packages/flame/lib/src/components/input/joystick_component.dart index ef6301366b..b96d07fa0b 100644 --- a/packages/flame/lib/src/components/input/joystick_component.dart +++ b/packages/flame/lib/src/components/input/joystick_component.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/src/components/input/hud_margin_component.dart'; import 'package:meta/meta.dart'; diff --git a/packages/flame/lib/src/components/input/sprite_button_component.dart b/packages/flame/lib/src/components/input/sprite_button_component.dart index e35420a7dd..b4d8ca99db 100644 --- a/packages/flame/lib/src/components/input/sprite_button_component.dart +++ b/packages/flame/lib/src/components/input/sprite_button_component.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:meta/meta.dart'; enum ButtonState { diff --git a/packages/flame/lib/src/components/mixins/component_viewport_margin.dart b/packages/flame/lib/src/components/mixins/component_viewport_margin.dart index 03ec0fcedf..ee09855cc4 100644 --- a/packages/flame/lib/src/components/mixins/component_viewport_margin.dart +++ b/packages/flame/lib/src/components/mixins/component_viewport_margin.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart' show CameraComponent; import 'package:flame/game.dart'; import 'package:flutter/widgets.dart' show EdgeInsets; import 'package:meta/meta.dart'; diff --git a/packages/flame/lib/src/components/position_component.dart b/packages/flame/lib/src/components/position_component.dart index 07754679ac..cb4f67970e 100644 --- a/packages/flame/lib/src/components/position_component.dart +++ b/packages/flame/lib/src/components/position_component.dart @@ -250,7 +250,7 @@ class PositionComponent extends Component //#region Coordinate transformations - /// Test whether the `point` (given in global coordinates) lies within this + /// Test whether the `point` (given in local coordinates) lies within this /// component. The top and the left borders of the component are inclusive, /// while the bottom and the right borders are exclusive. @override @@ -261,6 +261,9 @@ class PositionComponent extends Component (point.y < _size.y); } + /// Test whether the `point` (given in global coordinates) lies within this + /// component. The top and the left borders of the component are inclusive, + /// while the bottom and the right borders are exclusive. @override bool containsPoint(Vector2 point) { return containsLocalPoint(absoluteToLocal(point)); diff --git a/packages/flame/lib/src/events/messages/position_event.dart b/packages/flame/lib/src/events/messages/position_event.dart index 69e58e5798..0488a11aaf 100644 --- a/packages/flame/lib/src/events/messages/position_event.dart +++ b/packages/flame/lib/src/events/messages/position_event.dart @@ -1,8 +1,6 @@ -import 'package:flame/experimental.dart'; -import 'package:flame/src/components/core/component.dart'; +import 'package:flame/components.dart'; import 'package:flame/src/events/messages/event.dart'; import 'package:meta/meta.dart'; -import 'package:vector_math/vector_math_64.dart'; /// Base class for events that originate at some point on the screen. These /// include: tap events, drag events, scale events, etc. diff --git a/packages/flame/test/camera/behaviors/bounded_position_behavior_test.dart b/packages/flame/test/camera/behaviors/bounded_position_behavior_test.dart index 750a81ca27..6454f7b6ba 100644 --- a/packages/flame/test/camera/behaviors/bounded_position_behavior_test.dart +++ b/packages/flame/test/camera/behaviors/bounded_position_behavior_test.dart @@ -1,3 +1,4 @@ +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/experimental.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/camera/behaviors/follow_behavior_test.dart b/packages/flame/test/camera/behaviors/follow_behavior_test.dart index 6a2e5f04b4..708e37cfca 100644 --- a/packages/flame/test/camera/behaviors/follow_behavior_test.dart +++ b/packages/flame/test/camera/behaviors/follow_behavior_test.dart @@ -1,5 +1,5 @@ +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/src/effects/provider_interfaces.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/camera/camera_component_test.dart b/packages/flame/test/camera/camera_component_test.dart index 6a920a4c19..230384ff21 100644 --- a/packages/flame/test/camera/camera_component_test.dart +++ b/packages/flame/test/camera/camera_component_test.dart @@ -1,8 +1,10 @@ import 'dart:math'; import 'dart:ui'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/experimental.dart'; +import 'package:flame/extensions.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/camera/viewfinder_test.dart b/packages/flame/test/camera/viewfinder_test.dart index 8506bdd5bb..44a8301ebf 100644 --- a/packages/flame/test/camera/viewfinder_test.dart +++ b/packages/flame/test/camera/viewfinder_test.dart @@ -1,9 +1,9 @@ import 'dart:ui'; import 'package:canvas_test/canvas_test.dart'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/camera/viewports/circular_viewport_test.dart b/packages/flame/test/camera/viewports/circular_viewport_test.dart index c676777120..8573a74999 100644 --- a/packages/flame/test/camera/viewports/circular_viewport_test.dart +++ b/packages/flame/test/camera/viewports/circular_viewport_test.dart @@ -1,7 +1,7 @@ import 'dart:ui'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/camera/viewports/fixed_aspect_ratio_viewport_test.dart b/packages/flame/test/camera/viewports/fixed_aspect_ratio_viewport_test.dart index 931c9e7407..80d5fa16c6 100644 --- a/packages/flame/test/camera/viewports/fixed_aspect_ratio_viewport_test.dart +++ b/packages/flame/test/camera/viewports/fixed_aspect_ratio_viewport_test.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'dart:ui'; -import 'package:flame/experimental.dart'; +import 'package:flame/camera.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:vector_math/vector_math_64.dart'; diff --git a/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart b/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart index 87634e0f0d..ccf3a31a43 100644 --- a/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart +++ b/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart @@ -1,7 +1,7 @@ import 'dart:ui'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/camera/viewports/max_viewport_test.dart b/packages/flame/test/camera/viewports/max_viewport_test.dart index 32152e2847..490e386a5e 100644 --- a/packages/flame/test/camera/viewports/max_viewport_test.dart +++ b/packages/flame/test/camera/viewports/max_viewport_test.dart @@ -1,4 +1,4 @@ -import 'package:flame/experimental.dart'; +import 'package:flame/camera.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:vector_math/vector_math_64.dart'; diff --git a/packages/flame/test/collisions/collision_callback_test.dart b/packages/flame/test/collisions/collision_callback_test.dart index 0f983312c1..d30f1e985c 100644 --- a/packages/flame/test/collisions/collision_callback_test.dart +++ b/packages/flame/test/collisions/collision_callback_test.dart @@ -1,6 +1,5 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; import 'package:test/test.dart'; diff --git a/packages/flame/test/collisions/collision_test_helpers.dart b/packages/flame/test/collisions/collision_test_helpers.dart index 9862a5f133..bd0af53926 100644 --- a/packages/flame/test/collisions/collision_test_helpers.dart +++ b/packages/flame/test/collisions/collision_test_helpers.dart @@ -1,6 +1,5 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame/image_composition.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/components/mixins/tappable_test.dart b/packages/flame/test/components/mixins/tappable_test.dart index ed6208051d..240910a5e3 100644 --- a/packages/flame/test/components/mixins/tappable_test.dart +++ b/packages/flame/test/components/mixins/tappable_test.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/has_tappable_components.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/effects/anchor_to_effect_test.dart b/packages/flame/test/effects/anchor_to_effect_test.dart index 3efc4cdb48..d583fe67cc 100644 --- a/packages/flame/test/effects/anchor_to_effect_test.dart +++ b/packages/flame/test/effects/anchor_to_effect_test.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/effects/move_along_path_effect_test.dart b/packages/flame/test/effects/move_along_path_effect_test.dart index 8126e6a07b..c46b5a0612 100644 --- a/packages/flame/test/effects/move_along_path_effect_test.dart +++ b/packages/flame/test/effects/move_along_path_effect_test.dart @@ -3,7 +3,6 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/events/component_mixins/double_tap_callbacks_test.dart b/packages/flame/test/events/component_mixins/double_tap_callbacks_test.dart index c5435a8c51..4cafb5129e 100644 --- a/packages/flame/test/events/component_mixins/double_tap_callbacks_test.dart +++ b/packages/flame/test/events/component_mixins/double_tap_callbacks_test.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/double_tap_dispatcher.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/events/component_mixins/drag_callbacks_test.dart b/packages/flame/test/events/component_mixins/drag_callbacks_test.dart index 7ecb9cd44a..99bb4823a1 100644 --- a/packages/flame/test/events/component_mixins/drag_callbacks_test.dart +++ b/packages/flame/test/events/component_mixins/drag_callbacks_test.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/has_draggable_components.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/events/component_mixins/tap_callbacks_test.dart b/packages/flame/test/events/component_mixins/tap_callbacks_test.dart index 10edb98ef3..3e003fea04 100644 --- a/packages/flame/test/events/component_mixins/tap_callbacks_test.dart +++ b/packages/flame/test/events/component_mixins/tap_callbacks_test.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/has_tappable_components.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart b/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart index 97fd36c4bd..5e2a624b1a 100644 --- a/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart +++ b/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/has_draggable_components.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart b/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart index f9ec83e35f..67dbfc9e46 100644 --- a/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart +++ b/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; -import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/has_tappable_components.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/game/flame_game_test.dart b/packages/flame/test/game/flame_game_test.dart index 1993b31de5..f665f7f573 100644 --- a/packages/flame/test/game/flame_game_test.dart +++ b/packages/flame/test/game/flame_game_test.dart @@ -2,7 +2,7 @@ import 'dart:ui'; import 'package:collection/collection.dart'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/src/events/flame_game_mixins/has_tappable_components.dart'; import 'package:flame/src/game/game_render_box.dart'; diff --git a/packages/flame_forge2d/example/lib/main.dart b/packages/flame_forge2d/example/lib/main.dart index acdb5853c0..7dc4a5e3b0 100644 --- a/packages/flame_forge2d/example/lib/main.dart +++ b/packages/flame_forge2d/example/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/flame_forge2d/lib/body_component.dart b/packages/flame_forge2d/lib/body_component.dart index 4c3b3a5d8e..075e145a6c 100644 --- a/packages/flame_forge2d/lib/body_component.dart +++ b/packages/flame_forge2d/lib/body_component.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:flame/components.dart'; +import 'package:flame/components.dart' hide World; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame_forge2d/forge2d_game.dart'; diff --git a/packages/flame_isolate/example/lib/brains/worker_overmind_hud.dart b/packages/flame_isolate/example/lib/brains/worker_overmind_hud.dart index a5e576eadd..c6b60e8684 100644 --- a/packages/flame_isolate/example/lib/brains/worker_overmind_hud.dart +++ b/packages/flame_isolate/example/lib/brains/worker_overmind_hud.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flutter/rendering.dart'; diff --git a/packages/flame_rive/example/lib/main.dart b/packages/flame_rive/example/lib/main.dart index 2cf1c6ec48..9f8ec4c615 100644 --- a/packages/flame_rive/example/lib/main.dart +++ b/packages/flame_rive/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_rive/flame_rive.dart'; import 'package:flutter/material.dart'; diff --git a/packages/flame_rive/test/flame_rive_test.dart b/packages/flame_rive/test/flame_rive_test.dart index 525eb653cf..8a84788f8a 100644 --- a/packages/flame_rive/test/flame_rive_test.dart +++ b/packages/flame_rive/test/flame_rive_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flame/components.dart'; -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_rive/flame_rive.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame_test/lib/src/mock_tap_drag_events.dart b/packages/flame_test/lib/src/mock_tap_drag_events.dart index 32b6ce4630..21a5c3e5ba 100644 --- a/packages/flame_test/lib/src/mock_tap_drag_events.dart +++ b/packages/flame_test/lib/src/mock_tap_drag_events.dart @@ -1,4 +1,4 @@ -import 'package:flame/experimental.dart'; +import 'package:flame/events.dart'; import 'package:flutter/gestures.dart'; TapDownEvent createTapDownEvents({