Browse Source
# Conflicts: # samples/RenderDemo/MainWindow.xaml # src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs # src/Avalonia.Base/Rotate3DTransform.cs # tests/Avalonia.Base.UnitTests/MatrixTests.cspull/8184/head
Nikita Tsukanov
4 years ago
15 changed files with 932 additions and 86 deletions
@ -0,0 +1,210 @@ |
|||||
|
<UserControl xmlns="https://github.com/avaloniaui" |
||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
||||
|
mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="700" |
||||
|
x:Class="RenderDemo.Pages.Transform3DPage"> |
||||
|
<UserControl.Styles> |
||||
|
<Styles> |
||||
|
<Styles.Resources> |
||||
|
<Template x:Key="TestContent"> |
||||
|
<Grid RowDefinitions="*,*" ColumnDefinitions="*,*" Margin="5"> |
||||
|
<TextBlock>I'm a text</TextBlock> |
||||
|
<Button Grid.Row="0" Grid.Column="1" Content="A Button"></Button> |
||||
|
<Slider Grid.Row="1" |
||||
|
Grid.Column="0" |
||||
|
Grid.ColumnSpan="2" |
||||
|
Value="{Binding Depth}" |
||||
|
Minimum="100" |
||||
|
Maximum="300" /> |
||||
|
</Grid> |
||||
|
</Template> |
||||
|
</Styles.Resources> |
||||
|
</Styles> |
||||
|
<Style Selector="Border.Test"> |
||||
|
<Setter Property="Width" Value="200" /> |
||||
|
<Setter Property="Height" Value="200" /> |
||||
|
<Setter Property="Child" Value="{StaticResource TestContent}" /> |
||||
|
<Setter Property="BorderThickness" Value="2" /> |
||||
|
<Setter Property="BorderBrush" Value="Black" /> |
||||
|
<Setter Property="Grid.ColumnSpan" Value="2" /> |
||||
|
</Style> |
||||
|
<Style Selector="TextBlock, Label, Slider"> |
||||
|
<Setter Property="VerticalAlignment" Value="Center" /> |
||||
|
<Setter Property="Margin" Value="10,0,10,0" /> |
||||
|
</Style> |
||||
|
<Style Selector="Border TextBlock"> |
||||
|
<Setter Property="Foreground" Value="White" /> |
||||
|
</Style> |
||||
|
<Style Selector="Border Button"> |
||||
|
<Setter Property="Background" Value="White"></Setter> |
||||
|
<Setter Property="Foreground" Value="Black" /> |
||||
|
</Style> |
||||
|
|
||||
|
<Style Selector="Border#B1"> |
||||
|
<Style.Animations> |
||||
|
<Animation Duration="0:0:10" |
||||
|
IterationCount="Infinite"> |
||||
|
<KeyFrame Cue="0%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="0" /> |
||||
|
<Setter Property="ZIndex" Value="4" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="25%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="90" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="100%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="360" /> |
||||
|
<Setter Property="ZIndex" Value="4" /> |
||||
|
</KeyFrame> |
||||
|
</Animation> |
||||
|
</Style.Animations> |
||||
|
</Style> |
||||
|
<Style Selector="Border#B2"> |
||||
|
<Style.Animations> |
||||
|
<Animation Duration="0:0:10" |
||||
|
IterationCount="Infinite"> |
||||
|
<KeyFrame Cue="0%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="90" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="25%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="180" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="75%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="360" /> |
||||
|
<Setter Property="ZIndex" Value="4" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="100%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="450" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
</Animation> |
||||
|
</Style.Animations> |
||||
|
</Style> |
||||
|
<Style Selector="Border#B3"> |
||||
|
<Style.Animations> |
||||
|
<Animation Duration="0:0:10" |
||||
|
IterationCount="Infinite"> |
||||
|
<KeyFrame Cue="0%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="180" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="50%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="360" /> |
||||
|
<Setter Property="ZIndex" Value="4" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="75%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="450" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="100%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="540" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
</Animation> |
||||
|
</Style.Animations> |
||||
|
</Style> |
||||
|
<Style Selector="Border#B4"> |
||||
|
<Style.Animations> |
||||
|
<Animation Duration="0:0:10" |
||||
|
IterationCount="Infinite"> |
||||
|
<KeyFrame Cue="0%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="270" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="25%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="360" /> |
||||
|
<Setter Property="ZIndex" Value="4" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="50%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="450" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
<KeyFrame Cue="100%"> |
||||
|
<Setter Property="Rotate3DTransform.AngleX" Value="630" /> |
||||
|
<Setter Property="ZIndex" Value="1" /> |
||||
|
</KeyFrame> |
||||
|
</Animation> |
||||
|
</Style.Animations> |
||||
|
</Style> |
||||
|
</UserControl.Styles> |
||||
|
|
||||
|
<Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="*, Auto, Auto, Auto, Auto, Auto, Auto, Auto"> |
||||
|
<Grid.Clock> |
||||
|
<Clock /> |
||||
|
</Grid.Clock> |
||||
|
<Border Name="B1" Background="DarkRed" Classes="Test"> |
||||
|
<Border.RenderTransform> |
||||
|
<Rotate3DTransform CenterZ="-100" |
||||
|
Depth="{Binding Depth}" /> |
||||
|
</Border.RenderTransform> |
||||
|
</Border> |
||||
|
<Border Name="B2" Grid.Row="0" Grid.Column="0" Classes="Test" Background="DarkGreen"> |
||||
|
<Border.RenderTransform> |
||||
|
<Rotate3DTransform CenterZ="-100" |
||||
|
Depth="{Binding Depth}" /> |
||||
|
</Border.RenderTransform> |
||||
|
</Border> |
||||
|
<Border Name="B3" Grid.Row="0" Grid.Column="0" Classes="Test" Background="DarkBlue"> |
||||
|
<Border.RenderTransform> |
||||
|
<Rotate3DTransform CenterZ="-100" |
||||
|
Depth="{Binding Depth}" /> |
||||
|
</Border.RenderTransform> |
||||
|
</Border> |
||||
|
<Border Name="B4" Grid.Row="0" Grid.Column="0" Classes="Test" Background="Orange"> |
||||
|
<Border.RenderTransform> |
||||
|
<Rotate3DTransform CenterZ="-100" |
||||
|
Depth="{Binding Depth}" /> |
||||
|
</Border.RenderTransform> |
||||
|
</Border> |
||||
|
|
||||
|
<Label Grid.Column="0" Grid.Row="1">Depth: </Label> |
||||
|
<Slider Grid.Column="1" Grid.Row="1" Value="{Binding Depth}" Minimum="100" Maximum="300" /> |
||||
|
|
||||
|
<Border Grid.Row="0" Grid.Column="2" Classes="Test" ZIndex="-2"> |
||||
|
<Border.Background> |
||||
|
<LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%"> |
||||
|
<GradientStop Offset="0" Color="Red" /> |
||||
|
<GradientStop Offset="1" Color="Blue" /> |
||||
|
</LinearGradientBrush> |
||||
|
</Border.Background> |
||||
|
<Border.Styles> |
||||
|
<Style Selector="Label"> |
||||
|
<Setter Property="VerticalAlignment" Value="Center" /> |
||||
|
</Style> |
||||
|
<Style Selector="Slider"> |
||||
|
<Setter Property="Width" Value="100" /> |
||||
|
</Style> |
||||
|
</Border.Styles> |
||||
|
<Border.RenderTransform> |
||||
|
<Rotate3DTransform Depth="{Binding Depth}" |
||||
|
CenterX="{Binding CenterX}" |
||||
|
CenterY="{Binding CenterY}" |
||||
|
CenterZ="{Binding CenterZ}" |
||||
|
AngleX="{Binding AngleX}" |
||||
|
AngleY="{Binding AngleY}" |
||||
|
AngleZ="{Binding AngleZ}" /> |
||||
|
</Border.RenderTransform> |
||||
|
</Border> |
||||
|
|
||||
|
<Label Grid.Row="1" Grid.Column="2">Center X: </Label> |
||||
|
<Slider Grid.Row="1" Grid.Column="3" Value="{Binding CenterX}" Minimum="-100" Maximum="100" /> |
||||
|
|
||||
|
<Label Grid.Row="2" Grid.Column="2">Center Y: </Label> |
||||
|
<Slider Grid.Row="2" Grid.Column="3" Value="{Binding CenterY}" Minimum="-100" Maximum="100" /> |
||||
|
|
||||
|
<Label Grid.Row="3" Grid.Column="2">Center Z: </Label> |
||||
|
<Slider Grid.Row="3" Grid.Column="3" Value="{Binding CenterZ}" Minimum="-100" Maximum="100" /> |
||||
|
|
||||
|
<Label Grid.Row="4" Grid.Column="2">Angle X: </Label> |
||||
|
<Slider Grid.Row="4" Grid.Column="3" Value="{Binding AngleX}" Minimum="-180" Maximum="180" /> |
||||
|
|
||||
|
<Label Grid.Row="5" Grid.Column="2">Angle Y: </Label> |
||||
|
<Slider Grid.Row="5" Grid.Column="3" Value="{Binding AngleY}" Minimum="-180" Maximum="180" /> |
||||
|
|
||||
|
<Label Grid.Row="6" Grid.Column="2">Angle Z: </Label> |
||||
|
<Slider Grid.Row="6" Grid.Column="3" Value="{Binding AngleZ}" Minimum="-180" Maximum="180" /> |
||||
|
</Grid> |
||||
|
</UserControl> |
||||
@ -0,0 +1,21 @@ |
|||||
|
using Avalonia; |
||||
|
using Avalonia.Controls; |
||||
|
using Avalonia.Markup.Xaml; |
||||
|
using RenderDemo.ViewModels; |
||||
|
|
||||
|
namespace RenderDemo.Pages; |
||||
|
|
||||
|
public class Transform3DPage : UserControl |
||||
|
{ |
||||
|
public Transform3DPage() |
||||
|
{ |
||||
|
InitializeComponent(); |
||||
|
this.DataContext = new Transform3DPageViewModel(); |
||||
|
} |
||||
|
|
||||
|
private void InitializeComponent() |
||||
|
{ |
||||
|
AvaloniaXamlLoader.Load(this); |
||||
|
} |
||||
|
} |
||||
|
|
||||
@ -0,0 +1,55 @@ |
|||||
|
using System; |
||||
|
using MiniMvvm; |
||||
|
using Avalonia.Animation; |
||||
|
|
||||
|
namespace RenderDemo.ViewModels |
||||
|
{ |
||||
|
public class Transform3DPageViewModel : ViewModelBase |
||||
|
{ |
||||
|
private double _depth = 200; |
||||
|
|
||||
|
private double _centerX = 0; |
||||
|
private double _centerY = 0; |
||||
|
private double _centerZ = 0; |
||||
|
private double _angleX = 0; |
||||
|
private double _angleY = 0; |
||||
|
private double _angleZ = 0; |
||||
|
|
||||
|
public double Depth |
||||
|
{ |
||||
|
get => _depth; |
||||
|
set => RaiseAndSetIfChanged(ref _depth, value); |
||||
|
} |
||||
|
|
||||
|
public double CenterX |
||||
|
{ |
||||
|
get => _centerX; |
||||
|
set => RaiseAndSetIfChanged(ref _centerX, value); |
||||
|
} |
||||
|
public double CenterY |
||||
|
{ |
||||
|
get => _centerY; |
||||
|
set => RaiseAndSetIfChanged(ref _centerY, value); |
||||
|
} |
||||
|
public double CenterZ |
||||
|
{ |
||||
|
get => _centerZ; |
||||
|
set => RaiseAndSetIfChanged(ref _centerZ, value); |
||||
|
} |
||||
|
public double AngleX |
||||
|
{ |
||||
|
get => _angleX; |
||||
|
set => RaiseAndSetIfChanged(ref _angleX, value); |
||||
|
} |
||||
|
public double AngleY |
||||
|
{ |
||||
|
get => _angleY; |
||||
|
set => RaiseAndSetIfChanged(ref _angleY, value); |
||||
|
} |
||||
|
public double AngleZ |
||||
|
{ |
||||
|
get => _angleZ; |
||||
|
set => RaiseAndSetIfChanged(ref _angleZ, value); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,120 @@ |
|||||
|
using System; |
||||
|
using System.Threading; |
||||
|
using System.Threading.Tasks; |
||||
|
using Avalonia.Media; |
||||
|
using Avalonia.Styling; |
||||
|
|
||||
|
namespace Avalonia.Animation; |
||||
|
|
||||
|
public class Rotate3DTransition: PageSlide |
||||
|
{ |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Creates a new instance of the <see cref="Rotate3DTransition"/>
|
||||
|
/// </summary>
|
||||
|
/// <param name="duration">How long the rotation should take place</param>
|
||||
|
/// <param name="orientation">The orientation of the rotation</param>
|
||||
|
public Rotate3DTransition(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal, double? depth = null) |
||||
|
: base(duration, orientation) |
||||
|
{ |
||||
|
Depth = depth; |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height
|
||||
|
/// of the common parent of the visual being rotated.
|
||||
|
/// </summary>
|
||||
|
public double? Depth { get; set; } |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Creates a new instance of the <see cref="Rotate3DTransition"/>
|
||||
|
/// </summary>
|
||||
|
public Rotate3DTransition() { } |
||||
|
|
||||
|
/// <inheritdoc />
|
||||
|
public override async Task Start(Visual? @from, Visual? to, bool forward, CancellationToken cancellationToken) |
||||
|
{ |
||||
|
if (cancellationToken.IsCancellationRequested) |
||||
|
{ |
||||
|
return; |
||||
|
} |
||||
|
|
||||
|
var tasks = new Task[from != null && to != null ? 2 : 1]; |
||||
|
var parent = GetVisualParent(from, to); |
||||
|
var (rotateProperty, center) = Orientation switch |
||||
|
{ |
||||
|
SlideAxis.Vertical => (Rotate3DTransform.AngleXProperty, parent.Bounds.Height), |
||||
|
SlideAxis.Horizontal => (Rotate3DTransform.AngleYProperty, parent.Bounds.Width), |
||||
|
_ => throw new ArgumentOutOfRangeException() |
||||
|
}; |
||||
|
|
||||
|
var depthSetter = new Setter {Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center}; |
||||
|
var centerZSetter = new Setter {Property = Rotate3DTransform.CenterZProperty, Value = -center / 2}; |
||||
|
|
||||
|
KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) => |
||||
|
new() { |
||||
|
Setters = |
||||
|
{ |
||||
|
new Setter { Property = rotateProperty, Value = rotation }, |
||||
|
new Setter { Property = Visual.ZIndexProperty, Value = zIndex }, |
||||
|
new Setter { Property = Visual.IsVisibleProperty, Value = isVisible }, |
||||
|
centerZSetter, |
||||
|
depthSetter |
||||
|
}, |
||||
|
Cue = new Cue(cue) |
||||
|
}; |
||||
|
|
||||
|
if (from != null) |
||||
|
{ |
||||
|
var animation = new Animation |
||||
|
{ |
||||
|
Easing = SlideOutEasing, |
||||
|
Duration = Duration, |
||||
|
FillMode = FillMode.Forward, |
||||
|
Children = |
||||
|
{ |
||||
|
CreateKeyFrame(0d, 0d, 2), |
||||
|
CreateKeyFrame(0.5d, 45d * (forward ? -1 : 1), 1), |
||||
|
CreateKeyFrame(1d, 90d * (forward ? -1 : 1), 1, isVisible: false) |
||||
|
} |
||||
|
}; |
||||
|
|
||||
|
tasks[0] = animation.RunAsync(from, null, cancellationToken); |
||||
|
} |
||||
|
|
||||
|
if (to != null) |
||||
|
{ |
||||
|
to.IsVisible = true; |
||||
|
var animation = new Animation |
||||
|
{ |
||||
|
Easing = SlideInEasing, |
||||
|
Duration = Duration, |
||||
|
FillMode = FillMode.Forward, |
||||
|
Children = |
||||
|
{ |
||||
|
CreateKeyFrame(0d, 90d * (forward ? 1 : -1), 1), |
||||
|
CreateKeyFrame(0.5d, 45d * (forward ? 1 : -1), 1), |
||||
|
CreateKeyFrame(1d, 0d, 2) |
||||
|
} |
||||
|
}; |
||||
|
|
||||
|
tasks[from != null ? 1 : 0] = animation.RunAsync(to, null, cancellationToken); |
||||
|
} |
||||
|
|
||||
|
await Task.WhenAll(tasks); |
||||
|
|
||||
|
if (!cancellationToken.IsCancellationRequested) |
||||
|
{ |
||||
|
if (to != null) |
||||
|
{ |
||||
|
to.ZIndex = 2; |
||||
|
} |
||||
|
|
||||
|
if (from != null) |
||||
|
{ |
||||
|
from.IsVisible = false; |
||||
|
from.ZIndex = 1; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,210 @@ |
|||||
|
using System; |
||||
|
using System.Numerics; |
||||
|
using Avalonia.Animation.Animators; |
||||
|
|
||||
|
namespace Avalonia.Media; |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Non-Affine 3D transformation for rotating a visual around a definable axis
|
||||
|
/// </summary>
|
||||
|
public class Rotate3DTransform : Transform |
||||
|
{ |
||||
|
private readonly bool _isInitializing; |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="AngleX"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> AngleXProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleX)); |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="AngleY"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> AngleYProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleY)); |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="AngleZ"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> AngleZProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleZ)); |
||||
|
|
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="CenterX"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> CenterXProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterX)); |
||||
|
|
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="CenterY"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> CenterYProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterY)); |
||||
|
|
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="CenterZ"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> CenterZProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterZ)); |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Defines the <see cref="Depth"/> property.
|
||||
|
/// </summary>
|
||||
|
public static readonly StyledProperty<double> DepthProperty = |
||||
|
AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(Depth)); |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Initializes a new instance of the <see cref="Rotate3DTransform"/> class.
|
||||
|
/// </summary>
|
||||
|
public Rotate3DTransform() { } |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Initializes a new instance of the <see cref="Rotate3DTransform"/> class.
|
||||
|
/// </summary>
|
||||
|
/// <param name="angleX">The rotation around the X-Axis</param>
|
||||
|
/// <param name="angleY">The rotation around the Y-Axis</param>
|
||||
|
/// <param name="angleZ">The rotation around the Z-Axis</param>
|
||||
|
/// <param name="centerX">The origin of the X-Axis</param>
|
||||
|
/// <param name="centerY">The origin of the Y-Axis</param>
|
||||
|
/// <param name="centerZ">The origin of the Z-Axis</param>
|
||||
|
/// <param name="depth">The depth of the 3D effect</param>
|
||||
|
public Rotate3DTransform( |
||||
|
double angleX, |
||||
|
double angleY, |
||||
|
double angleZ, |
||||
|
double centerX, |
||||
|
double centerY, |
||||
|
double centerZ, |
||||
|
double depth) : this() |
||||
|
{ |
||||
|
_isInitializing = true; |
||||
|
AngleX = angleX; |
||||
|
AngleY = angleY; |
||||
|
AngleZ = angleZ; |
||||
|
CenterX = centerX; |
||||
|
CenterY = centerY; |
||||
|
CenterZ = centerZ; |
||||
|
Depth = depth; |
||||
|
_isInitializing = false; |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Sets the rotation around the X-Axis
|
||||
|
/// </summary>
|
||||
|
public double AngleX |
||||
|
{ |
||||
|
get => GetValue(AngleXProperty); |
||||
|
set => SetValue(AngleXProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Sets the rotation around the Y-Axis
|
||||
|
/// </summary>
|
||||
|
public double AngleY |
||||
|
{ |
||||
|
get => GetValue(AngleYProperty); |
||||
|
set => SetValue(AngleYProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Sets the rotation around the Z-Axis
|
||||
|
/// </summary>
|
||||
|
public double AngleZ |
||||
|
{ |
||||
|
get => GetValue(AngleZProperty); |
||||
|
set => SetValue(AngleZProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Moves the origin the X-Axis rotates around
|
||||
|
/// </summary>
|
||||
|
public double CenterX |
||||
|
{ |
||||
|
get => GetValue(CenterXProperty); |
||||
|
set => SetValue(CenterXProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Moves the origin the Y-Axis rotates around
|
||||
|
/// </summary>
|
||||
|
public double CenterY |
||||
|
{ |
||||
|
get => GetValue(CenterYProperty); |
||||
|
set => SetValue(CenterYProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Moves the origin the Z-Axis rotates around
|
||||
|
/// </summary>
|
||||
|
public double CenterZ |
||||
|
{ |
||||
|
get => GetValue(CenterZProperty); |
||||
|
set => SetValue(CenterZProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Affects the depth of the rotation effect
|
||||
|
/// </summary>
|
||||
|
public double Depth |
||||
|
{ |
||||
|
get => GetValue(DepthProperty); |
||||
|
set => SetValue(DepthProperty, value); |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Gets the transform's <see cref="Matrix"/>.
|
||||
|
/// </summary>
|
||||
|
public override Matrix Value |
||||
|
{ |
||||
|
get |
||||
|
{ |
||||
|
var matrix44 = Matrix4x4.Identity; |
||||
|
//Copy values first, because it's not guaranteed, that values will not change during calculation
|
||||
|
var (copyCenterX, |
||||
|
copyCenterY, |
||||
|
copyCenterZ, |
||||
|
copyAngleX, |
||||
|
copyAngleY, |
||||
|
copyAngleZ, |
||||
|
copyDepth) = (CenterX, CenterY, CenterZ, AngleX, AngleY, AngleZ, Depth); |
||||
|
|
||||
|
var centerSum = copyCenterX + copyCenterY + copyCenterZ; |
||||
|
|
||||
|
if (Math.Abs(centerSum) > double.Epsilon) matrix44 *= Matrix4x4.CreateTranslation(-(float)copyCenterX, -(float)copyCenterY, -(float)copyCenterZ); |
||||
|
|
||||
|
if (copyAngleX != 0) matrix44 *= Matrix4x4.CreateRotationX((float)Matrix.ToRadians(copyAngleX)); |
||||
|
if (copyAngleY != 0) matrix44 *= Matrix4x4.CreateRotationY((float)Matrix.ToRadians(copyAngleY)); |
||||
|
if (copyAngleZ != 0) matrix44 *= Matrix4x4.CreateRotationZ((float)Matrix.ToRadians(copyAngleZ)); |
||||
|
|
||||
|
if (Math.Abs(centerSum) > double.Epsilon) matrix44 *= Matrix4x4.CreateTranslation((float)copyCenterX, (float)copyCenterY, (float)copyCenterZ); |
||||
|
|
||||
|
if (copyDepth != 0) |
||||
|
{ |
||||
|
var perspectiveMatrix = Matrix4x4.Identity; |
||||
|
perspectiveMatrix.M34 = -1 / (float)copyDepth; |
||||
|
matrix44 *= perspectiveMatrix; |
||||
|
} |
||||
|
|
||||
|
var matrix = new Matrix( |
||||
|
matrix44.M11, |
||||
|
matrix44.M12, |
||||
|
matrix44.M14, |
||||
|
matrix44.M21, |
||||
|
matrix44.M22, |
||||
|
matrix44.M24, |
||||
|
matrix44.M41, |
||||
|
matrix44.M42, |
||||
|
matrix44.M44); |
||||
|
|
||||
|
return matrix; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change) |
||||
|
{ |
||||
|
if (!_isInitializing) RaiseChanged(); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,92 @@ |
|||||
|
using System; |
||||
|
using System.Numerics; |
||||
|
using System.Runtime.InteropServices; |
||||
|
using Avalonia.Media; |
||||
|
using Xunit; |
||||
|
|
||||
|
namespace Avalonia.Visuals.UnitTests; |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// These tests use the "official" Matrix4x4 and Matrix3x2 from the System.Numerics namespace, to validate
|
||||
|
/// that Avalonias own implementation of a 3x3 Matrix works correctly.
|
||||
|
/// </summary>
|
||||
|
public class MatrixTests |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Because Avalonia is working internally with doubles, but System.Numerics Vector and Matrix implementations
|
||||
|
/// only make use of floats, we need to reduce precision, comparing them. It should be sufficient to compare
|
||||
|
/// 5 fractional digits to ensure, that the result is correct.
|
||||
|
/// </summary>
|
||||
|
/// <param name="expected">The expected vector</param>
|
||||
|
/// <param name="actual">The actual transformed point</param>
|
||||
|
private void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual) |
||||
|
{ |
||||
|
double ReducePrecision(double input) => Math.Truncate(input * 10000); |
||||
|
|
||||
|
var expectedX = ReducePrecision(expected.X); |
||||
|
var expectedY = ReducePrecision(expected.Y); |
||||
|
|
||||
|
var actualX = ReducePrecision(actual.X); |
||||
|
var actualY = ReducePrecision(actual.Y); |
||||
|
|
||||
|
Assert.Equal(expectedX, actualX); |
||||
|
Assert.Equal(expectedY, actualY); |
||||
|
} |
||||
|
|
||||
|
[Fact] |
||||
|
public void Transform_Point_Should_Return_Correct_Value_For_Translated_Matrix() |
||||
|
{ |
||||
|
var vector2 = Vector2.Transform( |
||||
|
new Vector2(1, 1), |
||||
|
Matrix3x2.CreateTranslation(2, 2)); |
||||
|
var expected = new Point(vector2.X, vector2.Y); |
||||
|
|
||||
|
var matrix = Matrix.CreateTranslation(2, 2); |
||||
|
var point = new Point(1, 1); |
||||
|
var transformedPoint = matrix.Transform(point); |
||||
|
|
||||
|
Assert.Equal(expected, transformedPoint); |
||||
|
} |
||||
|
|
||||
|
[Fact] |
||||
|
public void Transform_Point_Should_Return_Correct_Value_For_Rotated_Matrix() |
||||
|
{ |
||||
|
var expected = Vector2.Transform( |
||||
|
new Vector2(0, 10), |
||||
|
Matrix3x2.CreateRotation((float)Matrix.ToRadians(45))); |
||||
|
|
||||
|
var matrix = Matrix.CreateRotation(Matrix.ToRadians(45)); |
||||
|
var point = new Point(0, 10); |
||||
|
var actual = matrix.Transform(point); |
||||
|
|
||||
|
AssertCoordinatesEqualWithReducedPrecision(expected, actual); |
||||
|
} |
||||
|
|
||||
|
[Fact] |
||||
|
public void Transform_Point_Should_Return_Correct_Value_For_Scaled_Matrix() |
||||
|
{ |
||||
|
var vector2 = Vector2.Transform( |
||||
|
new Vector2(1, 1), |
||||
|
Matrix3x2.CreateScale(2, 2)); |
||||
|
var expected = new Point(vector2.X, vector2.Y); |
||||
|
var matrix = Matrix.CreateScale(2, 2); |
||||
|
var point = new Point(1, 1); |
||||
|
var actual = matrix.Transform(point); |
||||
|
|
||||
|
Assert.Equal(expected, actual); |
||||
|
} |
||||
|
|
||||
|
[Fact] |
||||
|
public void Transform_Point_Should_Return_Correct_Value_For_Skewed_Matrix() |
||||
|
{ |
||||
|
var expected = Vector2.Transform( |
||||
|
new Vector2(1, 1), |
||||
|
Matrix3x2.CreateSkew(30, 20)); |
||||
|
|
||||
|
var matrix = Matrix.CreateSkew(30, 20); |
||||
|
var point = new Point(1, 1); |
||||
|
var actual = matrix.Transform(point); |
||||
|
|
||||
|
AssertCoordinatesEqualWithReducedPrecision(expected, actual); |
||||
|
} |
||||
|
} |
||||
Loading…
Reference in new issue