Browse Source

Removed unused parameters

flabbet 10 months ago
parent
commit
7e76a323b8

+ 2 - 2
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/Data/EllipseVectorData.cs

@@ -27,12 +27,12 @@ public class EllipseVectorData : ShapeVectorData, IReadOnlyEllipseData
         Radius = radius;
         Radius = radius;
     }
     }
 
 
-    public override void RasterizeGeometry(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint)
+    public override void RasterizeGeometry(DrawingSurface drawingSurface)
     {
     {
         Rasterize(drawingSurface, false);
         Rasterize(drawingSurface, false);
     }
     }
 
 
-    public override void RasterizeTransformed(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint)
+    public override void RasterizeTransformed(DrawingSurface drawingSurface)
     {
     {
         Rasterize(drawingSurface, true);
         Rasterize(drawingSurface, true);
     }
     }

+ 7 - 5
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/Data/LineVectorData.cs

@@ -36,17 +36,17 @@ public class LineVectorData(VecD startPos, VecD pos) : ShapeVectorData, IReadOnl
     public override ShapeCorners TransformationCorners => new ShapeCorners(GeometryAABB)
     public override ShapeCorners TransformationCorners => new ShapeCorners(GeometryAABB)
         .WithMatrix(TransformationMatrix);
         .WithMatrix(TransformationMatrix);
 
 
-    public override void RasterizeGeometry(DrawingSurface drawingSurface, ChunkResolution resolution, Paint? paint)
+    public override void RasterizeGeometry(DrawingSurface drawingSurface)
     {
     {
-        Rasterize(drawingSurface, paint, false);
+        Rasterize(drawingSurface, false);
     }
     }
 
 
-    public override void RasterizeTransformed(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint)
+    public override void RasterizeTransformed(DrawingSurface drawingSurface)
     {
     {
-        Rasterize(drawingSurface, paint, true);
+        Rasterize(drawingSurface, true);
     }
     }
 
 
-    private void Rasterize(DrawingSurface drawingSurface, Paint paint, bool applyTransform)
+    private void Rasterize(DrawingSurface drawingSurface, bool applyTransform)
     {
     {
         int num = 0;
         int num = 0;
         if (applyTransform)
         if (applyTransform)
@@ -55,6 +55,8 @@ public class LineVectorData(VecD startPos, VecD pos) : ShapeVectorData, IReadOnl
             ApplyTransformTo(drawingSurface);
             ApplyTransformTo(drawingSurface);
         }
         }
 
 
+        using Paint paint = new Paint();
+
         paint.Color = StrokeColor;
         paint.Color = StrokeColor;
         paint.Style = PaintStyle.Stroke;
         paint.Style = PaintStyle.Stroke;
         paint.StrokeWidth = StrokeWidth;
         paint.StrokeWidth = StrokeWidth;

+ 7 - 10
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/Data/PointsVectorData.cs

@@ -20,18 +20,19 @@ public class PointsVectorData : ShapeVectorData
     public override ShapeCorners TransformationCorners => new ShapeCorners(
     public override ShapeCorners TransformationCorners => new ShapeCorners(
         GeometryAABB).WithMatrix(TransformationMatrix);
         GeometryAABB).WithMatrix(TransformationMatrix);
 
 
-    public override void RasterizeGeometry(DrawingSurface drawingSurface, ChunkResolution resolution, Paint? paint)
+    public override void RasterizeGeometry(DrawingSurface drawingSurface)
     {
     {
-        Rasterize(drawingSurface, paint, resolution, false);
+        Rasterize(drawingSurface, false);
     }
     }
 
 
-    public override void RasterizeTransformed(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint)
+    public override void RasterizeTransformed(DrawingSurface drawingSurface)
     {
     {
-        Rasterize(drawingSurface, paint, resolution, true);
+        Rasterize(drawingSurface, true);
     }
     }
 
 
-    private void Rasterize(DrawingSurface drawingSurface, Paint paint, ChunkResolution resolution, bool applyTransform)
+    private void Rasterize(DrawingSurface drawingSurface, bool applyTransform)
     {
     {
+        using Paint paint = new Paint();
         paint.Color = FillColor;
         paint.Color = FillColor;
         paint.StrokeWidth = StrokeWidth;
         paint.StrokeWidth = StrokeWidth;
 
 
@@ -39,11 +40,7 @@ public class PointsVectorData : ShapeVectorData
         if (applyTransform)
         if (applyTransform)
         {
         {
             num = drawingSurface.Canvas.Save();
             num = drawingSurface.Canvas.Save();
-            Matrix3X3 final = TransformationMatrix with
-            {
-                TransX = TransformationMatrix.TransX * (float)resolution.Multiplier(),
-                TransY = TransformationMatrix.TransY * (float)resolution.Multiplier()
-            };
+            Matrix3X3 final = TransformationMatrix;
             drawingSurface.Canvas.SetMatrix(final);
             drawingSurface.Canvas.SetMatrix(final);
         }
         }
 
 

+ 7 - 5
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/Data/RectangleVectorData.cs

@@ -25,17 +25,17 @@ public class RectangleVectorData : ShapeVectorData, IReadOnlyRectangleData
         Size = size;
         Size = size;
     }
     }
 
 
-    public override void RasterizeGeometry(DrawingSurface drawingSurface, ChunkResolution resolution, Paint? paint)
+    public override void RasterizeGeometry(DrawingSurface drawingSurface)
     {
     {
-        Rasterize(drawingSurface, paint, false);
+        Rasterize(drawingSurface, false);
     }
     }
 
 
-    public override void RasterizeTransformed(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint)
+    public override void RasterizeTransformed(DrawingSurface drawingSurface)
     {
     {
-        Rasterize(drawingSurface, paint, true);
+        Rasterize(drawingSurface, true);
     }
     }
 
 
-    private void Rasterize(DrawingSurface drawingSurface, Paint paint, bool applyTransform)
+    private void Rasterize(DrawingSurface drawingSurface, bool applyTransform)
     {
     {
         int saved = 0;
         int saved = 0;
         if (applyTransform)
         if (applyTransform)
@@ -44,6 +44,8 @@ public class RectangleVectorData : ShapeVectorData, IReadOnlyRectangleData
             ApplyTransformTo(drawingSurface);
             ApplyTransformTo(drawingSurface);
         }
         }
 
 
+        using Paint paint = new Paint();
+        
         paint.Color = FillColor;
         paint.Color = FillColor;
         paint.Style = PaintStyle.Fill;
         paint.Style = PaintStyle.Fill;
         drawingSurface.Canvas.DrawRect(RectD.FromCenterAndSize(Center, Size), paint);
         drawingSurface.Canvas.DrawRect(RectD.FromCenterAndSize(Center, Size), paint);

+ 2 - 2
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/Data/ShapeVectorData.cs

@@ -28,8 +28,8 @@ public abstract class ShapeVectorData : ICacheable, ICloneable, IReadOnlyShapeVe
         drawingSurface.Canvas.SetMatrix(final);
         drawingSurface.Canvas.SetMatrix(final);
     }
     }
 
 
-    public abstract void RasterizeGeometry(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint);
-    public abstract void RasterizeTransformed(DrawingSurface drawingSurface, ChunkResolution resolution, Paint paint);
+    public abstract void RasterizeGeometry(DrawingSurface drawingSurface);
+    public abstract void RasterizeTransformed(DrawingSurface drawingSurface);
     public abstract bool IsValid();
     public abstract bool IsValid();
     public abstract int GetCacheHash();
     public abstract int GetCacheHash();
     public abstract int CalculateHash();
     public abstract int CalculateHash();

+ 1 - 1
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/RasterizeShapeNode.cs

@@ -36,7 +36,7 @@ public class RasterizeShapeNode : Node
 
 
         image.DrawingSurface.Canvas.Save();
         image.DrawingSurface.Canvas.Save();
 
 
-        shape.RasterizeTransformed(image.DrawingSurface, context.ChunkResolution, rasterizePaint);
+        shape.RasterizeTransformed(image.DrawingSurface);
         
         
         image.DrawingSurface.Canvas.Restore();
         image.DrawingSurface.Canvas.Restore();
 
 

+ 1 - 1
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/ShapeNode.cs

@@ -36,7 +36,7 @@ public abstract class ShapeNode<T> : Node where T : ShapeVectorData
     {
     {
         Texture texture = RequestTexture(0, size);
         Texture texture = RequestTexture(0, size);
         
         
-        vectorData.RasterizeTransformed(texture.DrawingSurface, ChunkResolution.Full, rasterizePreviewPaint);
+        vectorData.RasterizeTransformed(texture.DrawingSurface);
         
         
         return texture;
         return texture;
     }
     }

+ 1 - 1
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/VectorLayerNode.cs

@@ -143,7 +143,7 @@ public class VectorLayerNode : LayerNode, ITransformableObject, IReadOnlyVectorN
     public void Rasterize(DrawingSurface surface, ChunkResolution resolution, Paint paint)
     public void Rasterize(DrawingSurface surface, ChunkResolution resolution, Paint paint)
     {
     {
         int layer = surface.Canvas.SaveLayer(paint);
         int layer = surface.Canvas.SaveLayer(paint);
-        ShapeData?.RasterizeTransformed(surface, resolution, paint);
+        ShapeData?.RasterizeTransformed(surface);
         
         
         surface.Canvas.RestoreToCount(layer);
         surface.Canvas.RestoreToCount(layer);
     }
     }