Browse Source

Removed unnecessary Matrix property

flabbet 11 months ago
parent
commit
e2fd5fcc99

+ 1 - 1
src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/LineExecutor.cs

@@ -107,7 +107,7 @@ internal abstract class LineExecutor<T> : UpdateableChangeExecutor where T : ILi
             return;
             return;
         }
         }
 
 
-        document!.LineToolOverlayHandler.Show(startPos + new VecD(0.5), curPos + new VecD(0.5), Matrix3X3.Identity, true);
+        document!.LineToolOverlayHandler.Show(startPos + new VecD(0.5), curPos + new VecD(0.5), true);
         transforming = true;
         transforming = true;
     }
     }
 
 

+ 1 - 1
src/PixiEditor/Models/Handlers/ILineOverlayHandler.cs

@@ -9,5 +9,5 @@ internal interface ILineOverlayHandler
     public bool Nudge(VecD distance);
     public bool Nudge(VecD distance);
     public bool Undo();
     public bool Undo();
     public bool Redo();
     public bool Redo();
-    public void Show(VecD startPos, VecD endPos, Matrix3X3 transformation, bool showApplyButton);
+    public void Show(VecD startPos, VecD endPos, bool showApplyButton);
 }
 }

+ 1 - 10
src/PixiEditor/ViewModels/Document/TransformOverlays/LineToolOverlayViewModel.cs

@@ -1,7 +1,6 @@
 using System.Windows.Input;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Input;
-using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Numerics;
 using PixiEditor.Numerics;
 
 
@@ -14,7 +13,6 @@ internal class LineToolOverlayViewModel : ObservableObject, ILineOverlayHandler
     private TransformOverlayUndoStack<(VecD, VecD)>? undoStack = null;
     private TransformOverlayUndoStack<(VecD, VecD)>? undoStack = null;
 
 
     private VecD lineStart;
     private VecD lineStart;
-    private Matrix3X3 transformationMatrix;
 
 
     public VecD LineStart
     public VecD LineStart
     {
     {
@@ -37,12 +35,6 @@ internal class LineToolOverlayViewModel : ObservableObject, ILineOverlayHandler
                 LineMoved?.Invoke(this, (lineStart, lineEnd));
                 LineMoved?.Invoke(this, (lineStart, lineEnd));
         }
         }
     }
     }
-
-    public Matrix3X3 TransformationMatrix
-    {
-        get => transformationMatrix;
-        set => SetProperty(ref transformationMatrix, value);
-    }
     
     
     private bool isEnabled;
     private bool isEnabled;
 
 
@@ -74,7 +66,7 @@ internal class LineToolOverlayViewModel : ObservableObject, ILineOverlayHandler
             new RelayCommand(() => undoStack?.AddState((LineStart, LineEnd), TransformOverlayStateType.Move));
             new RelayCommand(() => undoStack?.AddState((LineStart, LineEnd), TransformOverlayStateType.Move));
     }
     }
 
 
-    public void Show(VecD lineStart, VecD endPos, Matrix3X3 transformationMatrix, bool showApplyButton)
+    public void Show(VecD lineStart, VecD endPos, bool showApplyButton)
     {
     {
         if (undoStack is not null)
         if (undoStack is not null)
             return;
             return;
@@ -84,7 +76,6 @@ internal class LineToolOverlayViewModel : ObservableObject, ILineOverlayHandler
 
 
         LineStart = lineStart;
         LineStart = lineStart;
         LineEnd = endPos; 
         LineEnd = endPos; 
-        TransformationMatrix = transformationMatrix;
         IsEnabled = true;
         IsEnabled = true;
         ShowApplyButton = showApplyButton;
         ShowApplyButton = showApplyButton;
     }
     }

+ 1 - 1
src/PixiEditor/ViewModels/Tools/Tools/VectorLineToolViewModel.cs

@@ -68,7 +68,7 @@ internal class VectorLineToolViewModel : ShapeTool, IVectorLineToolHandler
             IReadOnlyLineData? lineVectorData = vectorLayer.GetShapeData(document.AnimationDataViewModel.ActiveFrameTime) as IReadOnlyLineData;
             IReadOnlyLineData? lineVectorData = vectorLayer.GetShapeData(document.AnimationDataViewModel.ActiveFrameTime) as IReadOnlyLineData;
             if (lineVectorData is null) return;
             if (lineVectorData is null) return;
             
             
-            document.LineToolOverlayViewModel.Show(lineVectorData.TransformedStart, lineVectorData.TransformedEnd, lineVectorData.TransformationMatrix, false);
+            document.LineToolOverlayViewModel.Show(lineVectorData.TransformedStart, lineVectorData.TransformedEnd, false);
         }
         }
 
 
         document.Tools.UseVectorLineTool();
         document.Tools.UseVectorLineTool();

+ 0 - 8
src/PixiEditor/Views/Main/ViewportControls/ViewportOverlays.cs

@@ -217,19 +217,11 @@ internal class ViewportOverlays
             Mode = BindingMode.TwoWay
             Mode = BindingMode.TwoWay
         };
         };
         
         
-        Binding transformationMatrixBinding = new()
-        {
-            Source = Viewport,
-            Path = "Document.LineToolOverlayViewModel.TransformationMatrix",
-            Mode = BindingMode.TwoWay
-        };
-
         lineToolOverlay.Bind(Visual.IsVisibleProperty, isVisibleBinding);
         lineToolOverlay.Bind(Visual.IsVisibleProperty, isVisibleBinding);
         lineToolOverlay.Bind(LineToolOverlay.SnappingControllerProperty, snappingBinding);
         lineToolOverlay.Bind(LineToolOverlay.SnappingControllerProperty, snappingBinding);
         lineToolOverlay.Bind(LineToolOverlay.ActionCompletedProperty, actionCompletedBinding);
         lineToolOverlay.Bind(LineToolOverlay.ActionCompletedProperty, actionCompletedBinding);
         lineToolOverlay.Bind(LineToolOverlay.LineStartProperty, lineStartBinding);
         lineToolOverlay.Bind(LineToolOverlay.LineStartProperty, lineStartBinding);
         lineToolOverlay.Bind(LineToolOverlay.LineEndProperty, lineEndBinding);
         lineToolOverlay.Bind(LineToolOverlay.LineEndProperty, lineEndBinding);
-        lineToolOverlay.Bind(LineToolOverlay.TransformationMatrixProperty, transformationMatrixBinding);
     }
     }
 
 
     private void BindTransformOverlay()
     private void BindTransformOverlay()

+ 2 - 11
src/PixiEditor/Views/Overlays/LineToolOverlay/LineToolOverlay.cs

@@ -32,15 +32,6 @@ internal class LineToolOverlay : Overlay
         set => SetValue(LineEndProperty, value);
         set => SetValue(LineEndProperty, value);
     }
     }
 
 
-    public static readonly StyledProperty<Matrix3X3> TransformationMatrixProperty = AvaloniaProperty.Register<LineToolOverlay, Matrix3X3>(
-        nameof(TransformationMatrix));
-
-    public Matrix3X3 TransformationMatrix
-    {
-        get => GetValue(TransformationMatrixProperty);
-        set => SetValue(TransformationMatrixProperty, value);
-    }
-
     public static readonly StyledProperty<ICommand?> ActionCompletedProperty =
     public static readonly StyledProperty<ICommand?> ActionCompletedProperty =
         AvaloniaProperty.Register<LineToolOverlay, ICommand?>(nameof(ActionCompleted));
         AvaloniaProperty.Register<LineToolOverlay, ICommand?>(nameof(ActionCompleted));
 
 
@@ -124,8 +115,8 @@ internal class LineToolOverlay : Overlay
 
 
     public override void RenderOverlay(DrawingContext context, RectD canvasBounds)
     public override void RenderOverlay(DrawingContext context, RectD canvasBounds)
     {
     {
-        VecD mappedStart = LineStart; //TransformationMatrix.MapPoint(LineStart); 
-        VecD mappedEnd = LineEnd; //TransformationMatrix.MapPoint(LineEnd);
+        VecD mappedStart = LineStart;
+        VecD mappedEnd = LineEnd;
         
         
         startHandle.Position = mappedStart;
         startHandle.Position = mappedStart;
         endHandle.Position = mappedEnd; 
         endHandle.Position = mappedEnd;