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

Orbitview remove animation expressions #3627

Merged
4 commits merged into from
Dec 15, 2020
Merged

Orbitview remove animation expressions #3627

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1ae601
Revert "Update orbit view to use expression builder"
Rosuavio Dec 14, 2020
a71107f
Remove animations expresion using from oribit view
Rosuavio Dec 14, 2020
590409a
Reapply change from b5e6d8f8dc6e434e22f43eb1e2685d345905e848
Rosuavio Dec 14, 2020
0d79906
Merge branch 'master' into orbitview-remove-animation-expressions
michael-hawker Dec 15, 2020
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
38 changes: 22 additions & 16 deletions Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
using Windows.UI;
using Windows.UI.Composition;
using Windows.UI.Xaml;
Expand Down Expand Up @@ -631,41 +630,48 @@ private Line CreateAnchor(UIElement element, double x, double y)
var anchorVisual = ElementCompositionPreview.GetElementVisual(anchor);
var elementVisual = ElementCompositionPreview.GetElementVisual(element);
var centerVisual = ElementCompositionPreview.GetElementVisual(_centerContent);
var elementNode = elementVisual.GetReference();
var centerNode = centerVisual.GetReference();

ScalarNode expression;
var elementY = elementNode.Offset.Y + (elementNode.Size.Y / 2);
var centerY = centerNode.Offset.Y + (centerNode.Size.Y / 2);
var elementX = elementNode.Offset.X + (elementNode.Size.X / 2);
var centerX = centerNode.Offset.X + (centerNode.Size.X / 2);
string expression = string.Empty;
var elementY = "(elementVisual.Offset.Y + elementVisual.Size.Y / 2)";
var centerY = "(centerVisual.Offset.Y + centerVisual.Size.Y / 2)";
var elementX = "(elementVisual.Offset.X + elementVisual.Size.X / 2)";
var centerX = "(centerVisual.Offset.X + centerVisual.Size.X / 2)";

var startingAngle = Math.Atan2(y, x);

if (startingAngle > Math.PI / 4 && startingAngle < 3 * Math.PI / 4)
{
expression = ExpressionFunctions.ATan((-1 * (elementX - centerX)) / (elementY - centerY)) - ((float)Math.PI / 2.0f);
expression = $"Atan((-1 * ({elementX} - {centerX})) / ( {elementY} - {centerY})) - PI / 2";
}
else if (startingAngle >= 3 * Math.PI / 4 || startingAngle < -3 * Math.PI / 4)
{
expression = ExpressionFunctions.ATan((elementY - centerY) / (elementX - centerX)) + (float)Math.PI;
expression = $"Atan(({elementY} - {centerY}) / ({elementX} - {centerX})) + PI";
}
else if (startingAngle >= -3 * Math.PI / 4 && startingAngle < Math.PI / -4)
{
expression = ExpressionFunctions.ATan((elementX - centerX) / (-1 * (elementY - centerY))) + ((float)Math.PI / 2.0f);
expression = $"Atan(({elementX} - {centerX}) / (-1 * ({elementY} - {centerY}))) + PI / 2";
}
else
{
expression = ExpressionFunctions.ATan((elementY - centerY) / (elementX - centerX));
expression = $"Atan(({elementY} - {centerY}) / ({elementX} - {centerX}))";
}

anchorVisual.CenterPoint = new Vector3(0);
anchorVisual.StartAnimation(nameof(anchorVisual.RotationAngle), expression);

var offsetExpression = ExpressionFunctions.Vector3(centerNode.Offset.X + (centerNode.Size.X / 2), centerNode.Offset.Y + (centerNode.Size.Y / 2), 0);
var rotationExpression = _compositor.CreateExpressionAnimation();
rotationExpression.Expression = expression;
rotationExpression.SetReferenceParameter("centerVisual", centerVisual);
rotationExpression.SetReferenceParameter("elementVisual", elementVisual);
anchorVisual.StartAnimation(nameof(anchorVisual.RotationAngle), rotationExpression);

var offsetExpression = _compositor.CreateExpressionAnimation();
offsetExpression.Expression = "Vector3(centerVisual.Offset.X + centerVisual.Size.X / 2, centerVisual.Offset.Y + centerVisual.Size.Y / 2, 0)";
offsetExpression.SetReferenceParameter("centerVisual", centerVisual);
anchorVisual.StartAnimation(nameof(anchorVisual.Offset), offsetExpression);

var scaleExpression = ExpressionFunctions.Vector3(ExpressionFunctions.Pow(ExpressionFunctions.Pow(elementX - centerX, 2) + ExpressionFunctions.Pow(elementY - centerY, 2), 0.5f) / 80, 1, 1);
var scaleExpression = _compositor.CreateExpressionAnimation();
scaleExpression.Expression = $"Vector3(Pow(Pow({elementX} - {centerX}, 2) + Pow({elementY} - {centerY}, 2), 0.5)/80, 1, 1)";
scaleExpression.SetReferenceParameter("centerVisual", centerVisual);
scaleExpression.SetReferenceParameter("elementVisual", elementVisual);
anchorVisual.StartAnimation(nameof(anchorVisual.Scale), scaleExpression);

return anchor;
Expand Down