From 83cc4b6316f1dee3227180af3b9e3f123c72d0fd Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Fri, 11 Feb 2022 12:43:07 -0800 Subject: [PATCH] Update AnimatedChevronDownSmallVisualSource with updated design --- .../AnimatedChevronDownSmallVisualSource.cpp | 243 +++++------------- .../AnimatedChevronDownSmallVisualSource.h | 64 ++--- .../AnimatedChevronDownSmallVisualSource.idl | 2 +- 3 files changed, 94 insertions(+), 215 deletions(-) diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp index 10f07ced62..7cfd7edd38 100644 --- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp +++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp @@ -9,7 +9,7 @@ // LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronDownSmallVisualSource.json // // Input file: -// AnimatedChevronDownSmallVisualSource.json (9531 bytes created 23:37-07:00 Oct 5 2021) +// AnimatedChevronDownSmallVisualSource.json (10093 bytes created 9:26-07:00 Jun 8 2021) // // LottieGen source: // http://aka.ms/Lottie @@ -21,11 +21,11 @@ // ____________________________________ // | Object stats | Count | // |__________________________|_______| -// | All CompositionObjects | 65 | +// | All CompositionObjects | 53 | // |--------------------------+-------| -// | Expression animators | 7 | -// | KeyFrame animators | 6 | -// | Reference parameters | 7 | +// | Expression animators | 5 | +// | KeyFrame animators | 4 | +// | Reference parameters | 5 | // | Expression operations | 4 | // |--------------------------+-------| // | Animated brushes | 1 | @@ -33,11 +33,11 @@ // | ExpressionAnimations | 2 | // | PathKeyFrameAnimations | - | // |--------------------------+-------| -// | ContainerVisuals | 4 | -// | ShapeVisuals | 3 | +// | ContainerVisuals | 3 | +// | ShapeVisuals | 2 | // |--------------------------+-------| // | ContainerShapes | - | -// | CompositionSpriteShapes | 3 | +// | CompositionSpriteShapes | 2 | // |--------------------------+-------| // | Brushes | 1 | // | Gradient stops | - | @@ -108,20 +108,15 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem IClosable> { winrt::com_ptr _d2dFactory{ nullptr }; - static constexpr int64_t c_durationTicks{ 13333333L }; + static constexpr int64_t c_durationTicks{ 4833333L }; Compositor const _c{ nullptr }; ExpressionAnimation const _reusableExpressionAnimation{ nullptr }; CompositionPropertySet const _themeProperties{ nullptr }; CompositionColorBrush _themeColor_Foreground{ nullptr }; CompositionPathGeometry _pathGeometry{ nullptr }; ContainerVisual _root{ nullptr }; - CubicBezierEasingFunction _cubicBezierEasingFunction_0{ nullptr }; - CubicBezierEasingFunction _cubicBezierEasingFunction_1{ nullptr }; - CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr }; ExpressionAnimation _rootProgress{ nullptr }; InsetClip _insetClip_0{ nullptr }; - StepEasingFunction _holdThenStepEasingFunction{ nullptr }; - StepEasingFunction _stepThenHoldEasingFunction{ nullptr }; static void StartProgressBoundAnimation( CompositionObject target, @@ -164,31 +159,19 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return result; } - // PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver + // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal BooleanKeyFrameAnimation IsVisibleBooleanAnimation_0() { - // Frame 60. - const auto result = CreateBooleanKeyFrameAnimation(0.75F, true); + // Frame 10. + const auto result = CreateBooleanKeyFrameAnimation(0.344827592F, true); return result; } - // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal + // PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed BooleanKeyFrameAnimation IsVisibleBooleanAnimation_1() { - // Frame 40. - const auto result = CreateBooleanKeyFrameAnimation(0.5F, true); - // Frame 60. - result.InsertKeyFrame(0.75F, false); - return result; - } - - // PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - - // Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - PointerOverToNormal - // Controls - 06 - Dropdown - 04 - PointerOverToPressed - BooleanKeyFrameAnimation IsVisibleBooleanAnimation_2() - { - // Frame 40. - const auto result = CreateBooleanKeyFrameAnimation(0.5F, false); + // Frame 10. + const auto result = CreateBooleanKeyFrameAnimation(0.344827592F, false); return result; } @@ -228,8 +211,8 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return _pathGeometry = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry()))); } - // - PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver - // Transforms for Controls - 06 - Dropdown - 06 - PressedToPointerOver Scale(1,1,0) + // - PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal + // Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) // Path 1 CompositionSpriteShape SpriteShape_0() { @@ -240,8 +223,8 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return result; } - // - PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal - // Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) + // - PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed + // Transforms for Controls - 06 - Dropdown - 04 - PointerOverToPressed Scale(1,1,0) // Path 1 CompositionSpriteShape SpriteShape_1() { @@ -252,23 +235,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return result; } - // - PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - // - Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - - // PointerOverToNormal Controls - 06 - Dropdown - 04 - PointerOverToPressed - // Transforms for Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - - // Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - PointerOverToNormal - // Controls - 06 - Dropdown - 04 - PointerOverToPressed Scale(1,1,0) - // Path 1 Path 1 Path 1 Path 1 - CompositionSpriteShape SpriteShape_2() - { - const auto result = _c.CreateSpriteShape(_pathGeometry); - result.Scale({ 4.0F, 4.0F }); - result.FillBrush(_themeColor_Foreground); - StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_2(), _rootProgress); - return result; - } - - // PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver + // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal ContainerVisual ContainerVisual_0() { const auto result = _c.CreateContainerVisual(); @@ -277,45 +244,26 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem result.Size({ 48.0F, 48.0F }); // Scale:<1, 1> result.TransformMatrix({ 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F }); - // Transforms for Controls - 06 - Dropdown - 06 - PressedToPointerOver Scale(1,1,0) + // Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) result.Children().InsertAtTop(ShapeVisual_0()); StartProgressBoundAnimation(result, L"IsVisible", IsVisibleBooleanAnimation_0(), _rootProgress); return result; } - // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal + // PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed ContainerVisual ContainerVisual_1() { const auto result = _c.CreateContainerVisual(); result.Clip(_insetClip_0); - result.IsVisible(false); result.Size({ 48.0F, 48.0F }); // Scale:<1, 1> result.TransformMatrix({ 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F }); - // Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) + // Transforms for Controls - 06 - Dropdown - 04 - PointerOverToPressed Scale(1,1,0) result.Children().InsertAtTop(ShapeVisual_1()); StartProgressBoundAnimation(result, L"IsVisible", IsVisibleBooleanAnimation_1(), _rootProgress); return result; } - // PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - - // Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - PointerOverToNormal - // Controls - 06 - Dropdown - 04 - PointerOverToPressed - ContainerVisual ContainerVisual_2() - { - const auto result = _c.CreateContainerVisual(); - result.Clip(_insetClip_0); - result.Size({ 48.0F, 48.0F }); - // Scale:<1, 1> - result.TransformMatrix({ 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F }); - // Transforms for Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - - // Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - PointerOverToNormal - // Controls - 06 - Dropdown - 04 - PointerOverToPressed Scale(1,1,0) - result.Children().InsertAtTop(ShapeVisual_2()); - StartProgressBoundAnimation(result, L"IsVisible", IsVisibleBooleanAnimation_2(), _rootProgress); - return result; - } - // The root of the composition. ContainerVisual Root() { @@ -323,32 +271,13 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem const auto propertySet = result.Properties(); propertySet.InsertScalar(L"Progress", 0.0F); const auto children = result.Children(); - // PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver - children.InsertAtTop(ContainerVisual_0()); // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal + children.InsertAtTop(ContainerVisual_0()); + // PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed children.InsertAtTop(ContainerVisual_1()); - // PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - - // Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - PointerOverToNormal - // Controls - 06 - Dropdown - 04 - PointerOverToPressed - children.InsertAtTop(ContainerVisual_2()); return result; } - CubicBezierEasingFunction CubicBezierEasingFunction_0() - { - return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F }); - } - - CubicBezierEasingFunction CubicBezierEasingFunction_1() - { - return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.75F, 1.0F }); - } - - CubicBezierEasingFunction CubicBezierEasingFunction_2() - { - return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F }); - } - ExpressionAnimation RootProgress() { const auto result = _rootProgress = _c.CreateExpressionAnimation(L"_.Progress"); @@ -362,7 +291,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return result; } - // PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver + // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal // Shape tree root for layer: Layer 2 ShapeVisual ShapeVisual_0() { @@ -373,8 +302,8 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return result; } - // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal - // Shape tree root for layer: Layer 2 + // PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed + // Shape tree root for layer: Layer 3 ShapeVisual ShapeVisual_1() { const auto result = _c.CreateShapeVisual(); @@ -384,94 +313,44 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem return result; } - // PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - - // Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - PointerOverToNormal - // Controls - 06 - Dropdown - 04 - PointerOverToPressed - // Shape tree root for layer: Layer 2 Layer 2 Layer 2 Layer 2 - ShapeVisual ShapeVisual_2() - { - const auto result = _c.CreateShapeVisual(); - result.Size({ 48.0F, 48.0F }); - // ShapeGroup: Group 1 Group 1 Group 1 Group 1 - result.Shapes().Append(SpriteShape_2()); - return result; - } - + // - - - PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal + // - - Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) + // - ShapeGroup: Group 1 + // Offset StepEasingFunction HoldThenStepEasingFunction() { - const auto result = _holdThenStepEasingFunction = _c.CreateStepEasingFunction(); + const auto result = _c.CreateStepEasingFunction(); result.IsFinalStepSingleFrame(true); return result; } - StepEasingFunction StepThenHoldEasingFunction() - { - const auto result = _stepThenHoldEasingFunction = _c.CreateStepEasingFunction(); - result.IsInitialStepSingleFrame(true); - return result; - } - - // - - PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver - // - Transforms for Controls - 06 - Dropdown - 06 - PressedToPointerOver Scale(1,1,0) + // - - PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal + // - Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) // ShapeGroup: Group 1 // Offset Vector2KeyFrameAnimation OffsetVector2Animation_0() { // Frame 0. - const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, StepThenHoldEasingFunction()); - // Frame 50. - result.InsertKeyFrame(0.625F, { 24.0F, 24.0F }, HoldThenStepEasingFunction()); - // Frame 60. - result.InsertKeyFrame(0.75F, { 24.0F, 22.0F }, CubicBezierEasingFunction_0()); - // Frame 70. - result.InsertKeyFrame(0.875F, { 24.0F, 31.5F }, CubicBezierEasingFunction_1()); - // Frame 79. - result.InsertKeyFrame(0.987500012F, { 24.0F, 24.0F }, CubicBezierEasingFunction_2()); + const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, HoldThenStepEasingFunction()); + // Frame 10. + result.InsertKeyFrame(0.344827592F, { 24.0F, 31.5F }, _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F })); + // Frame 15. + result.InsertKeyFrame(0.517241359F, { 24.0F, 21.0F }, _c.CreateCubicBezierEasingFunction({ 0.550000012F, 0.0F }, { 0.75F, 1.0F })); + // Frame 29. + result.InsertKeyFrame(1.0F, { 24.0F, 24.0F }, _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F })); return result; } - // - - PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal - // - Transforms for Controls - 06 - Dropdown - 05 - PressedToNormal Scale(1,1,0) + // - - PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed + // - Transforms for Controls - 06 - Dropdown - 04 - PointerOverToPressed Scale(1,1,0) // ShapeGroup: Group 1 // Offset Vector2KeyFrameAnimation OffsetVector2Animation_1() { // Frame 0. - const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction); - // Frame 30. - result.InsertKeyFrame(0.375F, { 24.0F, 24.0F }, _holdThenStepEasingFunction); - // Frame 40. - result.InsertKeyFrame(0.5F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0); - // Frame 50. - result.InsertKeyFrame(0.625F, { 24.0F, 31.5F }, _cubicBezierEasingFunction_1); - // Frame 59. - result.InsertKeyFrame(0.737500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2); - return result; - } - - // - - PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - - // 06 - Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - - // PointerOverToNormal Controls - 06 - Dropdown - 04 - PointerOverToPressed - // - Transforms for Controls - 06 - Dropdown - 01 - NormalToPointerOver Controls - 06 - // - Dropdown - 02 - NormalToPressed Controls - 06 - Dropdown - 03 - - // PointerOverToNormal Controls - 06 - Dropdown - 04 - PointerOverToPressed - // Scale(1,1,0) - // ShapeGroup: Group 1 Group 1 Group 1 Group 1 - // Offset - Vector2KeyFrameAnimation OffsetVector2Animation_2() - { - // Frame 0. - const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _holdThenStepEasingFunction); - // Frame 10. - result.InsertKeyFrame(0.125F, { 24.0F, 24.0F }, _holdThenStepEasingFunction); - // Frame 19. - result.InsertKeyFrame(0.237499997F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0); - // Frame 20. - result.InsertKeyFrame(0.25F, { 24.0F, 24.0F }, _holdThenStepEasingFunction); - // Frame 30. - result.InsertKeyFrame(0.375F, { 24.0F, 24.0F }, _holdThenStepEasingFunction); - // Frame 39. - result.InsertKeyFrame(0.487500012F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0); + const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.833000004F, 0.833000004F })); + // Frame 9. + result.InsertKeyFrame(0.310344815F, { 24.0F, 31.5F }, _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.649999976F, 1.0F })); return result; } @@ -577,7 +456,7 @@ winrt::Microsoft::UI::Xaml::Controls::IAnimatedVisual AnimatedChevronDownSmallVi double AnimatedChevronDownSmallVisualSource::FrameCount() { - return 80.0; + return 29.0; } double AnimatedChevronDownSmallVisualSource::Framerate() @@ -587,12 +466,12 @@ double AnimatedChevronDownSmallVisualSource::Framerate() TimeSpan AnimatedChevronDownSmallVisualSource::Duration() { - return TimeSpan{ 13333333L }; + return TimeSpan{ 4833333L }; } double AnimatedChevronDownSmallVisualSource::FrameToProgress(double frameNumber) { - return frameNumber / 80.0; + return frameNumber / 29.0; } winrt::Windows::Foundation::Collections::IMapView AnimatedChevronDownSmallVisualSource::Markers() @@ -601,17 +480,17 @@ winrt::Windows::Foundation::Collections::IMapView AnimatedChevr std::map { { L"NormalToPointerOver_Start", 0.0 }, - { L"NormalToPointerOver_End", 0.113125 }, - { L"NormalToPressed_Start", 0.125625 }, - { L"NormalToPressed_End", 0.238125 }, - { L"PointerOverToNormal_Start", 0.250625 }, - { L"PointerOverToNormal_End", 0.363125 }, - { L"PointerOverToPressed_Start", 0.375625 }, - { L"PointerOverToPressed_End", 0.488125 }, - { L"PressedToNormal_Start", 0.500625 }, - { L"PressedToNormal_End", 0.725625 }, - { L"PressedToPointerOver_Start", 0.750625 }, - { L"PressedToPointerOver_End", 0.988125 }, + { L"NormalToPointerOver_End", 0.0 }, + { L"NormalToPressed_Start", 0.0 }, + { L"NormalToPressed_End", 0.312068965517241 }, + { L"PointerOverToNormal_Start", 0.0 }, + { L"PointerOverToNormal_End", 0.0 }, + { L"PointerOverToPressed_Start", 0.0 }, + { L"PointerOverToPressed_End", 0.312068965517241 }, + { L"PressedToNormal_Start", 0.346551724137931 }, + { L"PressedToNormal_End", 0.967241379310345 }, + { L"PressedToPointerOver_Start", 0.346551724137931 }, + { L"PressedToPointerOver_End", 0.967241379310345 }, } ).GetView(); } diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h index 4d4c05c995..fdb95354f1 100644 --- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h +++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h @@ -10,7 +10,7 @@ // LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronDownSmallVisualSource.json // // Input file: -// AnimatedChevronDownSmallVisualSource.json (9531 bytes created 23:37-07:00 Oct 5 2021) +// AnimatedChevronDownSmallVisualSource.json (10093 bytes created 9:26-07:00 Jun 8 2021) // // LottieGen source: // http://aka.ms/Lottie @@ -24,24 +24,24 @@ // Name: Controls_06_DownChevron_DropDown+SplitBtn // Frame rate: 60 fps -// Frame count: 80 -// Duration: 1333.3 mS -// _____________________________________________________________________________________________ -// | Marker | Constant | Frame | mS | Progress | -// |____________________________|______________________________|_______|________|______________| -// | NormalToPointerOver_Start | M_NormalToPointerOver_Start | 0 | 0.0 | 0.0F | -// | NormalToPointerOver_End | M_NormalToPointerOver_End | 9 | 150.0 | 0.113124996F | -// | NormalToPressed_Start | M_NormalToPressed_Start | 10 | 166.7 | 0.125624999F | -// | NormalToPressed_End | M_NormalToPressed_End | 19 | 316.7 | 0.238124996F | -// | PointerOverToNormal_Start | M_PointerOverToNormal_Start | 20 | 333.3 | 0.250625014F | -// | PointerOverToNormal_End | M_PointerOverToNormal_End | 29 | 483.3 | 0.363124996F | -// | PointerOverToPressed_Start | M_PointerOverToPressed_Start | 30 | 500.0 | 0.375625014F | -// | PointerOverToPressed_End | M_PointerOverToPressed_End | 39 | 650.0 | 0.488124996F | -// | PressedToNormal_Start | M_PressedToNormal_Start | 40 | 666.7 | 0.500625014F | -// | PressedToNormal_End | M_PressedToNormal_End | 58 | 966.7 | 0.725624979F | -// | PressedToPointerOver_Start | M_PressedToPointerOver_Start | 60 | 1000.0 | 0.750625014F | -// | PressedToPointerOver_End | M_PressedToPointerOver_End | 79 | 1316.7 | 0.988125026F | -// --------------------------------------------------------------------------------------------- +// Frame count: 29 +// Duration: 483.3 mS +// ____________________________________________________________________________________________ +// | Marker | Constant | Frame | mS | Progress | +// |____________________________|______________________________|_______|_______|______________| +// | NormalToPointerOver_Start | M_NormalToPointerOver_Start | 0 | 0.0 | 0.0F | +// | NormalToPointerOver_End | M_NormalToPointerOver_End | 0 | 0.0 | 0.0F | +// | NormalToPressed_Start | M_NormalToPressed_Start | 0 | 0.0 | 0.0F | +// | NormalToPressed_End | M_NormalToPressed_End | 9 | 150.0 | 0.312068969F | +// | PointerOverToNormal_Start | M_PointerOverToNormal_Start | 0 | 0.0 | 0.0F | +// | PointerOverToNormal_End | M_PointerOverToNormal_End | 0 | 0.0 | 0.0F | +// | PointerOverToPressed_Start | M_PointerOverToPressed_Start | 0 | 0.0 | 0.0F | +// | PointerOverToPressed_End | M_PointerOverToPressed_End | 9 | 150.0 | 0.312068969F | +// | PressedToNormal_Start | M_PressedToNormal_Start | 10 | 166.7 | 0.346551716F | +// | PressedToNormal_End | M_PressedToNormal_End | 28 | 466.7 | 0.967241406F | +// | PressedToPointerOver_Start | M_PressedToPointerOver_Start | 10 | 166.7 | 0.346551716F | +// | PressedToPointerOver_End | M_PressedToPointerOver_End | 28 | 466.7 | 0.967241406F | +// -------------------------------------------------------------------------------------------- // _______________________________________________________ // | Theme property | Accessor | Type | Default value | // |________________|____________|_______|_______________| @@ -56,44 +56,44 @@ class AnimatedChevronDownSmallVisualSource static winrt::Windows::Foundation::Numerics::float4 ColorAsVector4(winrt::Windows::UI::Color color); public: - // Animation duration: 1.333 seconds. - static constexpr int64_t c_durationTicks{ 13333333L }; + // Animation duration: 0.483 seconds. + static constexpr int64_t c_durationTicks{ 4833333L }; // Marker: NormalToPointerOver_Start. static constexpr float M_NormalToPointerOver_Start{ 0.0F }; // Marker: NormalToPointerOver_End. - static constexpr float M_NormalToPointerOver_End{ 0.113124996F }; + static constexpr float M_NormalToPointerOver_End{ 0.0F }; // Marker: NormalToPressed_Start. - static constexpr float M_NormalToPressed_Start{ 0.125624999F }; + static constexpr float M_NormalToPressed_Start{ 0.0F }; // Marker: NormalToPressed_End. - static constexpr float M_NormalToPressed_End{ 0.238124996F }; + static constexpr float M_NormalToPressed_End{ 0.312068969F }; // Marker: PointerOverToNormal_Start. - static constexpr float M_PointerOverToNormal_Start{ 0.250625014F }; + static constexpr float M_PointerOverToNormal_Start{ 0.0F }; // Marker: PointerOverToNormal_End. - static constexpr float M_PointerOverToNormal_End{ 0.363124996F }; + static constexpr float M_PointerOverToNormal_End{ 0.0F }; // Marker: PointerOverToPressed_Start. - static constexpr float M_PointerOverToPressed_Start{ 0.375625014F }; + static constexpr float M_PointerOverToPressed_Start{ 0.0F }; // Marker: PointerOverToPressed_End. - static constexpr float M_PointerOverToPressed_End{ 0.488124996F }; + static constexpr float M_PointerOverToPressed_End{ 0.312068969F }; // Marker: PressedToNormal_Start. - static constexpr float M_PressedToNormal_Start{ 0.500625014F }; + static constexpr float M_PressedToNormal_Start{ 0.346551716F }; // Marker: PressedToNormal_End. - static constexpr float M_PressedToNormal_End{ 0.725624979F }; + static constexpr float M_PressedToNormal_End{ 0.967241406F }; // Marker: PressedToPointerOver_Start. - static constexpr float M_PressedToPointerOver_Start{ 0.750625014F }; + static constexpr float M_PressedToPointerOver_Start{ 0.346551716F }; // Marker: PressedToPointerOver_End. - static constexpr float M_PressedToPointerOver_End{ 0.988125026F }; + static constexpr float M_PressedToPointerOver_End{ 0.967241406F }; // Theme property: Foreground. static inline const winrt::Windows::UI::Color c_themeForeground{ 0xFF, 0x06, 0x08, 0x08 }; diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl index 93c208cfc7..644f98f860 100644 --- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl +++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl @@ -9,7 +9,7 @@ // LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronDownSmallVisualSource.json // // Input file: -// AnimatedChevronDownSmallVisualSource.json (9531 bytes created 23:37-07:00 Oct 5 2021) +// AnimatedChevronDownSmallVisualSource.json (10093 bytes created 9:26-07:00 Jun 8 2021) // // LottieGen source: // http://aka.ms/Lottie