Skip to content

Commit

Permalink
update flutter objects
Browse files Browse the repository at this point in the history
Diffs=
e0816fdfa update flutter objects (#7797)
8c7ac0329 added a blt command for render targets that do not support VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT (#7757)
66d9f1725 Better premake support for Visual Studio (#7779)
f0da6a7a0 Add Xcode support to build_rive.sh (#7780)
c12b0bb24 Added support for xcode builds (#7774)

Co-authored-by: hernan <[email protected]>
  • Loading branch information
bodymovin and bodymovin committed Aug 9, 2024
1 parent de596cb commit 3dbef04
Show file tree
Hide file tree
Showing 9 changed files with 263 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0dc0b435ffb0df61de0afcdc2cea0c69bb8fedd4
e0816fdfa0adde292f343b4a018b2f515a8bc1c4
14 changes: 14 additions & 0 deletions lib/src/generated/animation/listener_viewmodel_change_base.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Core automatically generated
// lib/src/generated/animation/listener_viewmodel_change_base.dart.
// Do not modify manually.

import 'package:rive/src/rive_core/animation/listener_action.dart';

abstract class ListenerViewModelChangeBase extends ListenerAction {
static const int typeKey = 487;
@override
int get coreType => ListenerViewModelChangeBase.typeKey;
@override
Set<int> get coreTypes =>
{ListenerViewModelChangeBase.typeKey, ListenerActionBase.typeKey};
}
45 changes: 45 additions & 0 deletions lib/src/generated/data_bind/converters/data_converter_base.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Core automatically generated
// lib/src/generated/data_bind/converters/data_converter_base.dart.
// Do not modify manually.

import 'package:rive/src/core/core.dart';

abstract class DataConverterBase<T extends CoreContext> extends Core<T> {
static const int typeKey = 488;
@override
int get coreType => DataConverterBase.typeKey;
@override
Set<int> get coreTypes => {DataConverterBase.typeKey};

/// --------------------------------------------------------------------------
/// Name field with key 662.
static const int namePropertyKey = 662;
static const String nameInitialValue = '';
String _name = nameInitialValue;

/// Non-unique identifier, used to give friendly names to data converters.
String get name => _name;

/// Change the [_name] field value.
/// [nameChanged] will be invoked only if the field's value has changed.
set name(String value) {
if (_name == value) {
return;
}
String from = _name;
_name = value;
if (hasValidated) {
nameChanged(from, value);
}
}

void nameChanged(String from, String to);

@override
void copy(Core source) {
super.copy(source);
if (source is DataConverterBase) {
_name = source._name;
}
}
}
26 changes: 26 additions & 0 deletions lib/src/generated/data_bind/data_bind_base.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,38 @@ abstract class DataBindBase<T extends CoreContext> extends Core<T> {

void flagsChanged(int from, int to);

/// --------------------------------------------------------------------------
/// ConverterId field with key 660.
static const int converterIdPropertyKey = 660;
static const int converterIdInitialValue = -1;
int _converterId = converterIdInitialValue;

/// Identifier used to link to a data converter.
int get converterId => _converterId;

/// Change the [_converterId] field value.
/// [converterIdChanged] will be invoked only if the field's value has
/// changed.
set converterId(int value) {
if (_converterId == value) {
return;
}
int from = _converterId;
_converterId = value;
if (hasValidated) {
converterIdChanged(from, value);
}
}

void converterIdChanged(int from, int to);

@override
void copy(Core source) {
super.copy(source);
if (source is DataBindBase) {
_propertyKey = source._propertyKey;
_flags = source._flags;
_converterId = source._converterId;
}
}
}
30 changes: 30 additions & 0 deletions lib/src/generated/rive_core_context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
import 'package:rive/src/generated/constraints/transform_component_constraint_base.dart';
import 'package:rive/src/generated/constraints/transform_component_constraint_y_base.dart';
import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
import 'package:rive/src/generated/data_bind/converters/data_converter_base.dart';
import 'package:rive/src/generated/drawable_base.dart';
import 'package:rive/src/generated/nested_animation_base.dart';
import 'package:rive/src/generated/shapes/paint/shape_paint_base.dart';
Expand Down Expand Up @@ -68,6 +69,7 @@ import 'package:rive/src/rive_core/animation/listener_bool_change.dart';
import 'package:rive/src/rive_core/animation/listener_fire_event.dart';
import 'package:rive/src/rive_core/animation/listener_number_change.dart';
import 'package:rive/src/rive_core/animation/listener_trigger_change.dart';
import 'package:rive/src/rive_core/animation/listener_viewmodel_change.dart';
import 'package:rive/src/rive_core/animation/nested_bool.dart';
import 'package:rive/src/rive_core/animation/nested_number.dart';
import 'package:rive/src/rive_core/animation/nested_remap_animation.dart';
Expand Down Expand Up @@ -336,6 +338,8 @@ class RiveCoreContext {
return ListenerTriggerChange();
case BlendStateDirectBase.typeKey:
return BlendStateDirect();
case ListenerViewModelChangeBase.typeKey:
return ListenerViewModelChange();
case TransitionValueNumberComparatorBase.typeKey:
return TransitionValueNumberComparator();
case NestedStateMachineBase.typeKey:
Expand Down Expand Up @@ -1994,6 +1998,16 @@ class RiveCoreContext {
object.flags = value;
}
break;
case DataBindBase.converterIdPropertyKey:
if (object is DataBindBase && value is int) {
object.converterId = value;
}
break;
case DataConverterBase.namePropertyKey:
if (object is DataConverterBase && value is String) {
object.name = value;
}
break;
case DataBindContextBase.sourcePathIdsPropertyKey:
if (object is DataBindContextBase && value is Uint8List) {
object.sourcePathIds = value;
Expand Down Expand Up @@ -2532,6 +2546,7 @@ class RiveCoreContext {
case OpenUrlEventBase.targetValuePropertyKey:
case DataBindBase.propertyKeyPropertyKey:
case DataBindBase.flagsPropertyKey:
case DataBindBase.converterIdPropertyKey:
case BindablePropertyEnumBase.propertyValuePropertyKey:
case TendonBase.boneIdPropertyKey:
case TextModifierRangeBase.unitsValuePropertyKey:
Expand Down Expand Up @@ -2569,6 +2584,7 @@ class RiveCoreContext {
case KeyFrameStringBase.valuePropertyKey:
case TransitionValueStringComparatorBase.valuePropertyKey:
case OpenUrlEventBase.urlPropertyKey:
case DataConverterBase.namePropertyKey:
case BindablePropertyStringBase.propertyValuePropertyKey:
case TextValueRunBase.textPropertyKey:
case CustomPropertyStringBase.propertyValuePropertyKey:
Expand Down Expand Up @@ -3101,6 +3117,8 @@ class RiveCoreContext {
return (object as DataBindBase).propertyKey;
case DataBindBase.flagsPropertyKey:
return (object as DataBindBase).flags;
case DataBindBase.converterIdPropertyKey:
return (object as DataBindBase).converterId;
case BindablePropertyEnumBase.propertyValuePropertyKey:
return (object as BindablePropertyEnumBase).propertyValue;
case TendonBase.boneIdPropertyKey:
Expand Down Expand Up @@ -3183,6 +3201,8 @@ class RiveCoreContext {
return (object as TransitionValueStringComparatorBase).value;
case OpenUrlEventBase.urlPropertyKey:
return (object as OpenUrlEventBase).url;
case DataConverterBase.namePropertyKey:
return (object as DataConverterBase).name;
case BindablePropertyStringBase.propertyValuePropertyKey:
return (object as BindablePropertyStringBase).propertyValue;
case TextValueRunBase.textPropertyKey:
Expand Down Expand Up @@ -4377,6 +4397,11 @@ class RiveCoreContext {
object.flags = value;
}
break;
case DataBindBase.converterIdPropertyKey:
if (object is DataBindBase) {
object.converterId = value;
}
break;
case BindablePropertyEnumBase.propertyValuePropertyKey:
if (object is BindablePropertyEnumBase) {
object.propertyValue = value;
Expand Down Expand Up @@ -4562,6 +4587,11 @@ class RiveCoreContext {
object.url = value;
}
break;
case DataConverterBase.namePropertyKey:
if (object is DataConverterBase) {
object.name = value;
}
break;
case BindablePropertyStringBase.propertyValuePropertyKey:
if (object is BindablePropertyStringBase) {
object.propertyValue = value;
Expand Down
11 changes: 11 additions & 0 deletions lib/src/rive_core/animation/listener_viewmodel_change.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import 'package:rive/src/generated/animation/listener_viewmodel_change_base.dart';
import 'package:rive/src/rive_core/state_machine_controller.dart';
import 'package:rive_common/math.dart';

export 'package:rive/src/generated/animation/listener_viewmodel_change_base.dart';

class ListenerViewModelChange extends ListenerViewModelChangeBase {
@override
void perform(StateMachineController controller, Vec2D position,
Vec2D previousPosition) {}
}
4 changes: 3 additions & 1 deletion lib/src/rive_core/animation/state_machine_listener.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import 'package:rive_common/math.dart';

export 'package:rive/src/generated/animation/state_machine_listener_base.dart';

enum ListenerType { enter, exit, down, up, move, event }
enum ListenerType { enter, exit, down, up, move, event, click }

enum GestureClickPhase { out, down, clicked }

class StateMachineListener extends StateMachineListenerBase {
final ListenerActions actions = ListenerActions();
Expand Down
4 changes: 3 additions & 1 deletion lib/src/rive_core/data_bind/data_bind.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@ class DataBind extends DataBindBase {
}

@override
// ignore: override_on_non_overriding_member
void targetIdChanged(int from, int to) {
// TODO: @hernan implement nameChanged
}

@override
void converterIdChanged(int from, int to) {}

@override
void flagsChanged(int from, int to) {}

Expand Down
Loading

0 comments on commit 3dbef04

Please sign in to comment.