Blend animation direct change - silence a few linter issues - update default blend animation mix value to be 100. its either 0 or 100, 1 made no sense. i think 100 is right. - made a clamped input converter to set values between 0 & 100 nicely & it rounds values when you drag adds option for selecting setting the mix input or the mix value on uat @alxgibsn, what do we want this to say? "Set Blend Value? "Set Mix Value? <img width="320" alt="image" src="https://user-images.githubusercontent.com/1216025/229121083-d8233155-4bce-475e-bdb3-697ebd951360.png"> can have both by input and by value, they look very subtlely different <img width="272" alt="image" src="https://user-images.githubusercontent.com/1216025/229121329-f8bd8596-0247-42f9-bd82-1979778b8ad3.png"> Diffs= d9fc7d927 Blend animation direct change (#5080)
diff --git a/.rive_head b/.rive_head index 044102c..2744b5e 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -6df791fe4cbf6f70dc026314400d88ce3fec0a79 +d9fc7d92736d3ac97fafc2f2713ec25211584799
diff --git a/dev/core_generator/lib/main.dart b/dev/core_generator/lib/main.dart index 8538ea7..a48945c 100644 --- a/dev/core_generator/lib/main.dart +++ b/dev/core_generator/lib/main.dart
@@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:core_generator/src/field_types/initialize.dart'; import 'package:core_generator/src/configuration.dart'; import 'package:core_generator/src/definition.dart'; +import 'package:core_generator/src/field_types/initialize.dart'; void main(List<String> arguments) { initializeFields();
diff --git a/dev/core_generator/lib/src/field_type.dart b/dev/core_generator/lib/src/field_type.dart index c5dd856..486bd92 100644 --- a/dev/core_generator/lib/src/field_type.dart +++ b/dev/core_generator/lib/src/field_type.dart
@@ -1,7 +1,7 @@ export 'package:core_generator/src/field_types/bool_field_type.dart'; +export 'package:core_generator/src/field_types/color_field_type.dart'; export 'package:core_generator/src/field_types/double_field_type.dart'; export 'package:core_generator/src/field_types/string_field_type.dart'; -export 'package:core_generator/src/field_types/color_field_type.dart'; export 'package:core_generator/src/field_types/uint_field_type.dart'; Map<String, FieldType> _types = <String, FieldType>{};
diff --git a/dev/defs/animation/blend_animation_direct.json b/dev/defs/animation/blend_animation_direct.json index b15dfbb..303dc45 100644 --- a/dev/defs/animation/blend_animation_direct.json +++ b/dev/defs/animation/blend_animation_direct.json
@@ -19,7 +19,7 @@ }, "mixValue": { "type": "double", - "initialValue": "1", + "initialValue": "100", "key": { "int": 297, "string": "mixvalue"
diff --git a/include/rive/generated/animation/blend_animation_direct_base.hpp b/include/rive/generated/animation/blend_animation_direct_base.hpp index cb0f7bd..915c2d1 100644 --- a/include/rive/generated/animation/blend_animation_direct_base.hpp +++ b/include/rive/generated/animation/blend_animation_direct_base.hpp
@@ -35,7 +35,7 @@ private: uint32_t m_InputId = -1; - float m_MixValue = 1.0f; + float m_MixValue = 100.0f; uint32_t m_BlendSource = 0; public: