flutter/rive-flutter
1
0
Fork 0
mirror of https://github.com/rive-app/rive-flutter.git synced 2025-06-29 11:16:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Luigi Rosso
2021-05-07 22:25:29 -07:00
parent df1ed3e288
commit 607a8a3ee4
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/src/core/importers/layer_state_importer.dart
View File

@ -1,7 +1,6 @@
import 'package:rive/src/core/importers/artboard_import_stack_object.dart'; import 'package:rive/src/core/importers/artboard_import_stack_object.dart';
import 'package:rive/src/rive_core/animation/blend_animation.dart'; import 'package:rive/src/rive_core/animation/blend_animation.dart';
import 'package:rive/src/rive_core/animation/blend_state.dart'; import 'package:rive/src/rive_core/animation/blend_state.dart';
import 'package:rive/src/rive_core/animation/blend_state_direct.dart';
import 'package:rive/src/rive_core/animation/blend_state_transition.dart'; import 'package:rive/src/rive_core/animation/blend_state_transition.dart';
import 'package:rive/src/rive_core/animation/layer_state.dart'; import 'package:rive/src/rive_core/animation/layer_state.dart';
import 'package:rive/src/rive_core/animation/state_transition.dart'; import 'package:rive/src/rive_core/animation/state_transition.dart';
@ -16,8 +15,10 @@ class LayerStateImporter extends ArtboardImportStackObject {
} }
bool addBlendAnimation(BlendAnimation blendAnimation) { bool addBlendAnimation(BlendAnimation blendAnimation) {
if (state is BlendStateDirect) { // This works because we explicitly export our transitions before our
var blendState = state as BlendStateDirect; // animations.
if (state is BlendState) {
var blendState = state as BlendState;
for (final transition for (final transition
in state.transitions.whereType<BlendStateTransition>()) { in state.transitions.whereType<BlendStateTransition>()) {
if (transition.exitBlendAnimationId >= 0 && if (transition.exitBlendAnimationId >= 0 &&

2
lib/src/rive_core/animation/blend_state.dart
View File

@ -10,7 +10,7 @@ abstract class BlendState<T extends BlendAnimation> extends BlendStateBase {
void internalAddAnimation(T animation) { void internalAddAnimation(T animation) {
assert(!_animations.contains(animation), assert(!_animations.contains(animation),
'shouln\'t already contain the animation'); 'shouldn\'t already contain the animation');
_animations.add(animation); _animations.add(animation);
} }

2
lib/src/rive_core/animation/blend_state_direct_instance.dart
View File

@ -18,7 +18,7 @@ class BlendStateDirectInstance
? inputValue ? inputValue
: animation.blendAnimation.input?.value) ?? : animation.blendAnimation.input?.value) ??
0; 0;
animation.mix = value / 100; animation.mix = (value / 100).clamp(0, 1);
} }
} }
} }