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

Generated dupe of PR #258 #260

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Generated dupe of PR #258 #260

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
7 changes: 4 additions & 3 deletions lib/src/rive_core/animation/nested_state_machine.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:rive/src/core/core.dart';
import 'package:rive/src/generated/animation/nested_state_machine_base.dart';
import 'package:rive/src/rive_core/math/vec2d.dart';
Expand All @@ -14,7 +15,7 @@ abstract class NestedStateMachineInstance {

void pointerMove(Vec2D position);

void pointerDown(Vec2D position);
void pointerDown(Vec2D position, PointerDownEvent event);

void pointerUp(Vec2D position);

Expand Down Expand Up @@ -57,8 +58,8 @@ class NestedStateMachine extends NestedStateMachineBase {
void pointerMove(Vec2D position) =>
_stateMachineInstance?.pointerMove(position);

void pointerDown(Vec2D position) =>
_stateMachineInstance?.pointerDown(position);
void pointerDown(Vec2D position, PointerDownEvent event) =>
_stateMachineInstance?.pointerDown(position, event);

void pointerUp(Vec2D position) => _stateMachineInstance?.pointerUp(position);

Expand Down
34 changes: 27 additions & 7 deletions lib/src/rive_core/state_machine_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:collection';

import 'package:flutter/gestures.dart';
import 'package:flutter/scheduler.dart';
import 'package:rive/src/core/core.dart';
import 'package:rive/src/rive_core/animation/animation_state.dart';
Expand Down Expand Up @@ -256,6 +257,8 @@ class StateMachineController extends RiveAnimationController<CoreContext> {

late CoreContext core;

final _recognizer = ImmediateMultiDragGestureRecognizer();

@override
bool init(CoreContext core) {
this.core = core;
Expand Down Expand Up @@ -344,10 +347,14 @@ class StateMachineController extends RiveAnimationController<CoreContext> {
isActive = keepGoing;
}

void _processEvent(Vec2D position, {ListenerType? hitEvent}) {
bool _processEvent(
Vec2D position, {
PointerEvent? pointerEvent,
ListenerType? hitEvent,
}) {
var artboard = this.artboard;
if (artboard == null) {
return;
return false;
}
if (artboard.frameOrigin) {
// ignore: parameter_assignments
Expand All @@ -365,6 +372,7 @@ class StateMachineController extends RiveAnimationController<CoreContext> {
(position.y + hitRadius).round(),
);

bool hitSomething = false;
for (final hitShape in hitShapes) {
// for (final hitShape in event.shapes) {
var shape = hitShape.shape;
Expand All @@ -384,6 +392,9 @@ class StateMachineController extends RiveAnimationController<CoreContext> {

// Just use bounds for now
isOver = hitTester.test();
if (isOver) {
hitSomething = true;
}
}

bool hoverChange = hitShape.isHovered != isOver;
Expand Down Expand Up @@ -418,7 +429,10 @@ class StateMachineController extends RiveAnimationController<CoreContext> {
in nestedArtboard.animations.whereType<NestedStateMachine>()) {
switch (hitEvent) {
case ListenerType.down:
nestedStateMachine.pointerDown(nestedPosition);
nestedStateMachine.pointerDown(
nestedPosition,
pointerEvent as PointerDownEvent,
);
break;
case ListenerType.up:
nestedStateMachine.pointerUp(nestedPosition);
Expand All @@ -429,17 +443,23 @@ class StateMachineController extends RiveAnimationController<CoreContext> {
}
}
}
return hitSomething;
}

void pointerMove(Vec2D position) => _processEvent(
position,
hitEvent: ListenerType.move,
);

void pointerDown(Vec2D position) => _processEvent(
position,
hitEvent: ListenerType.down,
);
void pointerDown(Vec2D position, PointerDownEvent event) {
if (_processEvent(
position,
hitEvent: ListenerType.down,
pointerEvent: event,
)) {
_recognizer.addPointer(event);
}
}

void pointerUp(Vec2D position) => _processEvent(
position,
Expand Down
4 changes: 2 additions & 2 deletions lib/src/runtime_nested_artboard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ class RuntimeNestedStateMachineInstance extends NestedStateMachineInstance {
stateMachineController.isActiveChanged;

@override
void pointerDown(Vec2D position) =>
stateMachineController.pointerDown(position);
void pointerDown(Vec2D position, PointerDownEvent event) =>
stateMachineController.pointerDown(position, event);

@override
void pointerMove(Vec2D position) =>
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/rive_animation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class RiveAnimationState extends State<RiveAnimation> {
onPointerDown: (details) => hitHelper(
details,
(controller, artboardPosition) =>
controller.pointerDown(artboardPosition),
controller.pointerDown(artboardPosition, details),
),
onPointerUp: (details) => hitHelper(
details,
Expand Down