Merge pull request #236 from mishun/pushtransform

Fix for handling nested transform
wieslawsoltes · Jul 18, 2024 · 3b6acae · 3b6acae
2 parents 40e8976 + bff857c
commit 3b6acae
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 deletions.
diff --git a/src/Avalonia.Svg/AvaloniaPicture.cs b/src/Avalonia.Svg/AvaloniaPicture.cs
@@ -152,8 +152,8 @@ private static void RecordCommand(CanvasCommand canvasCommand, List<DrawCommand>
             }
             case SetMatrixCanvasCommand setMatrixCanvasCommand:
             {
-                var matrix = setMatrixCanvasCommand.Matrix.ToMatrix();
-                commands.Add(new SetTransformDrawCommand(matrix));
+                var matrix = setMatrixCanvasCommand.DeltaMatrix.ToMatrix();
+                commands.Add(new PushTransformDrawCommand(matrix));
                 break;
             }
             case SaveLayerCanvasCommand saveLayerCanvasCommand:
@@ -267,9 +267,9 @@ private void Draw(AM.DrawingContext context, DrawCommand command, Stack<Stack<ID
                 }
                 break;
             }
-            case SetTransformDrawCommand setTransformDrawCommand:
+            case PushTransformDrawCommand pushTransformDrawCommand:
             {
-                var transformPreTransform = context.PushTransform(setTransformDrawCommand.Matrix);
+                var transformPreTransform = context.PushTransform(pushTransformDrawCommand.Matrix);
                 var currentPushedStates = pushedStates.Peek();
                 currentPushedStates.Push(transformPreTransform);
                 break;

diff --git a/...a.Svg/Commands/SetTransformDrawCommand.cs → ....Svg/Commands/PushTransformDrawCommand.cs b/...a.Svg/Commands/SetTransformDrawCommand.cs → ....Svg/Commands/PushTransformDrawCommand.cs
@@ -2,11 +2,11 @@
 
 namespace Avalonia.Svg.Commands;
 
-public sealed class SetTransformDrawCommand : DrawCommand
+public sealed class PushTransformDrawCommand : DrawCommand
 {
     public A.Matrix Matrix { get; }
 
-    public SetTransformDrawCommand(A.Matrix matrix)
+    public PushTransformDrawCommand(A.Matrix matrix)
     {
         Matrix = matrix;
     }

diff --git a/src/ShimSkiaSharp/SKCanvas.cs b/src/ShimSkiaSharp/SKCanvas.cs
@@ -25,7 +25,7 @@ public record SaveCanvasCommand(int Count) : CanvasCommand;
 
 public record SaveLayerCanvasCommand(int Count, SKPaint? Paint = null) : CanvasCommand;
 
-public record SetMatrixCanvasCommand(SKMatrix Matrix) : CanvasCommand;
+public record SetMatrixCanvasCommand(SKMatrix DeltaMatrix, SKMatrix TotalMatrix) : CanvasCommand;
 
 public class SKCanvas
 {
@@ -77,10 +77,10 @@ public void DrawTextOnPath(string text, SKPath path, float hOffset, float vOffse
         Commands?.Add(new DrawTextOnPathCanvasCommand(text, path, hOffset, vOffset, paint));
     }
 
-    public void SetMatrix(SKMatrix matrix)
+    public void SetMatrix(SKMatrix deltaMatrix)
     {
-        TotalMatrix = matrix;
-        Commands?.Add(new SetMatrixCanvasCommand(matrix));
+        TotalMatrix = TotalMatrix.PreConcat(deltaMatrix);
+        Commands?.Add(new SetMatrixCanvasCommand(deltaMatrix, TotalMatrix));
     }
 
     public int Save()

diff --git a/src/Svg.CodeGen.Skia/SkiaCSharpModelExtensions.cs b/src/Svg.CodeGen.Skia/SkiaCSharpModelExtensions.cs
@@ -1780,7 +1780,7 @@ public static void ToSKPicture(this SKPicture? picture, SkiaCSharpCodeGenCounter
                 }
                 case SetMatrixCanvasCommand setMatrixCanvasCommand:
                 {
-                    sb.AppendLine($"{indent}{counter.CanvasVarName}{counterCanvas}.SetMatrix({setMatrixCanvasCommand.Matrix.ToSKMatrix()});");
+                    sb.AppendLine($"{indent}{counter.CanvasVarName}{counterCanvas}.SetMatrix({setMatrixCanvasCommand.TotalMatrix.ToSKMatrix()});");
                     break;
                 }
                 case SaveLayerCanvasCommand saveLayerCanvasCommand:

diff --git a/src/Svg.Model/Drawables/DrawableBase.cs b/src/Svg.Model/Drawables/DrawableBase.cs
@@ -114,9 +114,7 @@ public virtual void Draw(SKCanvas canvas, DrawAttributes ignoreAttributes, Drawa
 
         if (!Transform.IsIdentity && enableTransform)
         {
-            var skMatrixTotal = canvas.TotalMatrix;
-            skMatrixTotal = skMatrixTotal.PreConcat(Transform);
-            canvas.SetMatrix(skMatrixTotal);
+            canvas.SetMatrix(Transform);
         }
 
         if (Clip is { })

diff --git a/src/Svg.Model/Drawables/Elements/ImageDrawable.cs b/src/Svg.Model/Drawables/Elements/ImageDrawable.cs
@@ -162,9 +162,7 @@ public override void OnDraw(SKCanvas canvas, DrawAttributes ignoreAttributes, Dr
         {
             canvas.Save();
 
-            var skMatrixTotal = canvas.TotalMatrix;
-            skMatrixTotal = skMatrixTotal.PreConcat(FragmentTransform);
-            canvas.SetMatrix(skMatrixTotal);
+            canvas.SetMatrix(FragmentTransform);
 
             FragmentDrawable.Draw(canvas, ignoreAttributes, until, true);
 

diff --git a/src/Svg.Model/Drawables/Elements/TextDrawable.cs b/src/Svg.Model/Drawables/Elements/TextDrawable.cs
@@ -137,9 +137,7 @@ internal void BeginDraw(SvgTextBase svgTextBase, SKCanvas skCanvas, SKRect skBou
 
         if (!skMatrix.IsIdentity && enableTransform)
         {
-            var skMatrixTotal = skCanvas.TotalMatrix;
-            skMatrixTotal = skMatrixTotal.PreConcat(skMatrix);
-            skCanvas.SetMatrix(skMatrixTotal);
+            skCanvas.SetMatrix(skMatrix);
         }
 
         if (enableClip)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
@@ -1219,7 +1219,7 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
             }
             case SetMatrixCanvasCommand setMatrixCanvasCommand:
             {
-                var matrix = ToSKMatrix(setMatrixCanvasCommand.Matrix);
+                var matrix = ToSKMatrix(setMatrixCanvasCommand.TotalMatrix);
                 skCanvas.SetMatrix(matrix);
                 break;
             }