Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Merge basic and advanced gesture detectors in GameWidget #1718

Merged
merged 1 commit into from
Jun 11, 2022
Merged

refactor: Merge basic and advanced gesture detectors in GameWidget #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions packages/flame/lib/src/game/game_widget/game_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,8 @@ class _GameWidgetState<T extends Game> extends State<GameWidget<T>> {
'not receive events',
);

if (hasBasicGestureDetectors(currentGame)) {
internalGameWidget = applyBasicGesturesDetectors(
currentGame,
internalGameWidget,
);
}

if (hasAdvancedGestureDetectors(currentGame)) {
internalGameWidget = applyAdvancedGesturesDetectors(
if (hasGestureDetectors(currentGame)) {
internalGameWidget = applyGesturesDetectors(
currentGame,
internalGameWidget,
);
Expand Down
257 changes: 102 additions & 155 deletions packages/flame/lib/src/game/game_widget/gestures.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:flame/src/game/mixins/game.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/widgets.dart';

bool hasBasicGestureDetectors(Game game) {
bool hasGestureDetectors(Game game) {
return game is TapDetector ||
game is SecondaryTapDetector ||
game is DoubleTapDetector ||
Expand All @@ -13,11 +13,8 @@ bool hasBasicGestureDetectors(Game game) {
game is HorizontalDragDetector ||
game is ForcePressDetector ||
game is PanDetector ||
game is ScaleDetector;
}

bool hasAdvancedGestureDetectors(Game game) {
return game is MultiTapListener ||
game is ScaleDetector ||
game is MultiTapListener ||
game is MultiTouchDragDetector ||
game is HasDraggables;
}
Expand All @@ -28,155 +25,7 @@ bool hasMouseDetectors(Game game) {
game is HasHoverables;
}

Widget applyBasicGesturesDetectors(Game game, Widget child) {
return GestureDetector(
key: const ObjectKey('BasicGesturesDetector'),
behavior: HitTestBehavior.opaque,

// Taps
onTap: game is TapDetector ? () => game.onTap() : null,
onTapCancel: game is TapDetector ? () => game.onTapCancel() : null,
onTapDown: game is TapDetector
? (TapDownDetails d) => game.onTapDown(TapDownInfo.fromDetails(game, d))
: null,
onTapUp: game is TapDetector
? (TapUpDetails d) => game.onTapUp(TapUpInfo.fromDetails(game, d))
: null,

// Secondary taps
onSecondaryTapDown: game is SecondaryTapDetector
? (TapDownDetails d) =>
game.onSecondaryTapDown(TapDownInfo.fromDetails(game, d))
: null,
onSecondaryTapUp: game is SecondaryTapDetector
? (TapUpDetails d) =>
game.onSecondaryTapUp(TapUpInfo.fromDetails(game, d))
: null,
onSecondaryTapCancel:
game is SecondaryTapDetector ? () => game.onSecondaryTapCancel() : null,

// Double tap
onDoubleTap: game is DoubleTapDetector ? () => game.onDoubleTap() : null,
onDoubleTapCancel:
game is DoubleTapDetector ? () => game.onDoubleTapCancel() : null,
onDoubleTapDown: game is DoubleTapDetector
? (TapDownDetails d) =>
game.onDoubleTapDown(TapDownInfo.fromDetails(game, d))
: null,

// Long presses
onLongPress: game is LongPressDetector ? () => game.onLongPress() : null,
onLongPressStart: game is LongPressDetector
? (LongPressStartDetails d) =>
game.onLongPressStart(LongPressStartInfo.fromDetails(game, d))
: null,
onLongPressMoveUpdate: game is LongPressDetector
? (LongPressMoveUpdateDetails d) => game
.onLongPressMoveUpdate(LongPressMoveUpdateInfo.fromDetails(game, d))
: null,
onLongPressUp:
game is LongPressDetector ? () => game.onLongPressUp() : null,
onLongPressEnd: game is LongPressDetector
? (LongPressEndDetails d) =>
game.onLongPressEnd(LongPressEndInfo.fromDetails(game, d))
: null,

// Vertical drag
onVerticalDragDown: game is VerticalDragDetector
? (DragDownDetails d) =>
game.onVerticalDragDown(DragDownInfo.fromDetails(game, d))
: null,
onVerticalDragStart: game is VerticalDragDetector
? (DragStartDetails d) =>
game.onVerticalDragStart(DragStartInfo.fromDetails(game, d))
: null,
onVerticalDragUpdate: game is VerticalDragDetector
? (DragUpdateDetails d) =>
game.onVerticalDragUpdate(DragUpdateInfo.fromDetails(game, d))
: null,
onVerticalDragEnd: game is VerticalDragDetector
? (DragEndDetails d) =>
game.onVerticalDragEnd(DragEndInfo.fromDetails(game, d))
: null,
onVerticalDragCancel:
game is VerticalDragDetector ? () => game.onVerticalDragCancel() : null,

// Horizontal drag
onHorizontalDragDown: game is HorizontalDragDetector
? (DragDownDetails d) =>
game.onHorizontalDragDown(DragDownInfo.fromDetails(game, d))
: null,
onHorizontalDragStart: game is HorizontalDragDetector
? (DragStartDetails d) =>
game.onHorizontalDragStart(DragStartInfo.fromDetails(game, d))
: null,
onHorizontalDragUpdate: game is HorizontalDragDetector
? (DragUpdateDetails d) =>
game.onHorizontalDragUpdate(DragUpdateInfo.fromDetails(game, d))
: null,
onHorizontalDragEnd: game is HorizontalDragDetector
? (DragEndDetails d) =>
game.onHorizontalDragEnd(DragEndInfo.fromDetails(game, d))
: null,
onHorizontalDragCancel: game is HorizontalDragDetector
? () => game.onHorizontalDragCancel()
: null,

// Force presses
onForcePressStart: game is ForcePressDetector
? (ForcePressDetails d) =>
game.onForcePressStart(ForcePressInfo.fromDetails(game, d))
: null,
onForcePressPeak: game is ForcePressDetector
? (ForcePressDetails d) =>
game.onForcePressPeak(ForcePressInfo.fromDetails(game, d))
: null,
onForcePressUpdate: game is ForcePressDetector
? (ForcePressDetails d) =>
game.onForcePressUpdate(ForcePressInfo.fromDetails(game, d))
: null,
onForcePressEnd: game is ForcePressDetector
? (ForcePressDetails d) =>
game.onForcePressEnd(ForcePressInfo.fromDetails(game, d))
: null,

// Pan
onPanDown: game is PanDetector
? (DragDownDetails d) =>
game.onPanDown(DragDownInfo.fromDetails(game, d))
: null,
onPanStart: game is PanDetector
? (DragStartDetails d) =>
game.onPanStart(DragStartInfo.fromDetails(game, d))
: null,
onPanUpdate: game is PanDetector
? (DragUpdateDetails d) =>
game.onPanUpdate(DragUpdateInfo.fromDetails(game, d))
: null,
onPanEnd: game is PanDetector
? (DragEndDetails d) => game.onPanEnd(DragEndInfo.fromDetails(game, d))
: null,
onPanCancel: game is PanDetector ? () => game.onPanCancel() : null,

// Scales
onScaleStart: game is ScaleDetector
? (ScaleStartDetails d) =>
game.onScaleStart(ScaleStartInfo.fromDetails(game, d))
: null,
onScaleUpdate: game is ScaleDetector
? (ScaleUpdateDetails d) =>
game.onScaleUpdate(ScaleUpdateInfo.fromDetails(game, d))
: null,
onScaleEnd: game is ScaleDetector
? (ScaleEndDetails d) =>
game.onScaleEnd(ScaleEndInfo.fromDetails(game, d))
: null,

child: child,
);
}

Widget applyAdvancedGesturesDetectors(Game game, Widget child) {
Widget applyGesturesDetectors(Game game, Widget child) {
final gestures = <Type, GestureRecognizerFactory>{};

void addRecognizer<T extends GestureRecognizer>(
Expand All @@ -186,6 +35,104 @@ Widget applyAdvancedGesturesDetectors(Game game, Widget child) {
gestures[T] = GestureRecognizerFactoryWithHandlers<T>(factory, handlers);
}

if (game is TapDetector || game is SecondaryTapDetector) {
addRecognizer(
TapGestureRecognizer.new,
(TapGestureRecognizer instance) {
if (game is TapDetector) {
instance.onTap = game.onTap;
instance.onTapCancel = game.onTapCancel;
instance.onTapUp = game.handleTapUp;
instance.onTapDown = game.handleTapDown;
}
if (game is SecondaryTapDetector) {
instance.onSecondaryTapCancel = game.onSecondaryTapCancel;
instance.onSecondaryTapUp = game.handleSecondaryTapUp;
instance.onSecondaryTapDown = game.handleSecondaryTapDown;
}
},
);
}
if (game is DoubleTapDetector) {
addRecognizer(
DoubleTapGestureRecognizer.new,
(DoubleTapGestureRecognizer instance) {
instance.onDoubleTap = game.onDoubleTap;
instance.onDoubleTapDown = game.handleDoubleTapDown;
instance.onDoubleTapCancel = game.onDoubleTapCancel;
},
);
}
if (game is LongPressDetector) {
addRecognizer(
LongPressGestureRecognizer.new,
(LongPressGestureRecognizer instance) {
instance.onLongPress = game.onLongPress;
instance.onLongPressStart = game.handleLongPressStart;
instance.onLongPressMoveUpdate = game.handleLongPressMoveUpdate;
instance.onLongPressEnd = game.handleLongPressEnd;
instance.onLongPressUp = game.onLongPressUp;
instance.onLongPressCancel = game.onLongPressCancel;
},
);
}
if (game is VerticalDragDetector) {
addRecognizer(
VerticalDragGestureRecognizer.new,
(VerticalDragGestureRecognizer instance) {
instance.onDown = game.handleVerticalDragDown;
instance.onStart = game.handleVerticalDragStart;
instance.onUpdate = game.handleVerticalDragUpdate;
instance.onEnd = game.handleVerticalDragEnd;
instance.onCancel = game.onVerticalDragCancel;
},
);
}
if (game is HorizontalDragDetector) {
addRecognizer(
HorizontalDragGestureRecognizer.new,
(HorizontalDragGestureRecognizer instance) {
instance.onDown = game.handleHorizontalDragDown;
instance.onStart = game.handleHorizontalDragStart;
instance.onUpdate = game.handleHorizontalDragUpdate;
instance.onEnd = game.handleHorizontalDragEnd;
instance.onCancel = game.onHorizontalDragCancel;
},
);
}
if (game is ForcePressDetector) {
addRecognizer(
ForcePressGestureRecognizer.new,
(ForcePressGestureRecognizer instance) {
instance.onStart = game.handleForcePressStart;
instance.onPeak = game.handleForcePressPeak;
instance.onUpdate = game.handleForcePressUpdate;
instance.onEnd = game.handleForcePressEnd;
},
);
}
if (game is PanDetector) {
addRecognizer(
PanGestureRecognizer.new,
(PanGestureRecognizer instance) {
instance.onDown = game.handlePanDown;
instance.onStart = game.handlePanStart;
instance.onUpdate = game.handlePanUpdate;
instance.onEnd = game.handlePanEnd;
instance.onCancel = game.onPanCancel;
},
);
}
if (game is ScaleDetector) {
addRecognizer(
ScaleGestureRecognizer.new,
(ScaleGestureRecognizer instance) {
instance.onStart = game.handleScaleStart;
instance.onUpdate = game.handleScaleUpdate;
instance.onEnd = game.handleScaleEnd;
},
);
}
if (game is MultiTapListener) {
addRecognizer(
MultiTapGestureRecognizer.new,
Expand Down
Loading