Merge pull request #21 from synercoder/features/matrix-improvements

Made some matrix improvements

Author: synercoder

azure-build-artifacts.yml

@@ -6,7 +6,7 @@ pr: none
 jobs:
 - job: Windows
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-latest'
   steps:
   - powershell: .\build.ps1
     displayName: 'Run build script'

azure-pipelines.yml

@@ -5,7 +5,7 @@ jobs:
 
 - job: Linux
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
   steps:
   - bash: ./build.sh
     env:
@@ -15,7 +15,7 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-latest'
   steps:
   - bash: ./build.sh
     env:
@@ -25,7 +25,7 @@ jobs:
 
 - job: Windows
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-latest'
   steps:
   - powershell: .\build.ps1
     env:

samples/Synercoding.FileFormats.Pdf.ConsoleTester/Program.cs

@@ -68,7 +68,7 @@ public static void Main(string[] args)
                         {
                             var scale = (double)forestImage.Width / forestImage.Height;
 
-                            var matrix = new ScaleMatrix(_mmToPts(scale * 303), _mmToPts(303))
+                            var matrix = Matrix.CreateScaleMatrix(_mmToPts(scale * 303), _mmToPts(303))
                                 .Translate(_mmToPts(-100), 0);
 
                             page.AddImage(forestImage, matrix);

src/Synercoding.FileFormats.Pdf/PdfPage.cs

@@ -1,4 +1,3 @@
-using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using Synercoding.FileFormats.Pdf.Helpers;
 using Synercoding.FileFormats.Pdf.PdfInternals.Objects;
@@ -140,7 +139,10 @@ public PdfPage AddImage(Stream image, Matrix matrix)
         /// <returns>This <see cref="PdfPage"/> so calls can be chained.</returns>
         public PdfPage AddImage(Image image, Rectangle rectangle)
         {
-            var matrix = new Matrix(rectangle.URX - rectangle.LLX, 0, 0, rectangle.URY - rectangle.LLY, rectangle.LLX, rectangle.LLY);
+            var matrix = new Matrix(
+                rectangle.URX - rectangle.LLX, 0,
+                0, rectangle.URY - rectangle.LLY,
+                rectangle.LLX, rectangle.LLY);
             return AddImage(image, matrix);
         }
 
@@ -160,7 +162,10 @@ public PdfPage AddImage(Image image, Matrix matrix)
 
         private PdfPage _addImage(ImageSharp.Image image, Rectangle rectangle, bool clone)
         {
-            var matrix = new Matrix(rectangle.URX - rectangle.LLX, 0, 0, rectangle.URY - rectangle.LLY, rectangle.LLX, rectangle.LLY);
+            var matrix = new Matrix(
+                rectangle.URX - rectangle.LLX, 0,
+                0, rectangle.URY - rectangle.LLY,
+                rectangle.LLX, rectangle.LLY);
 
             return _addImage(image, matrix, clone);
         }

src/Synercoding.FileFormats.Pdf/Primitives/Matrices/MatrixExtensions.cs

@@ -1,23 +1,32 @@
+using System;
+
 namespace Synercoding.FileFormats.Pdf.Primitives.Matrices
 {
     /// <summary>
-    /// Class that represents a <see cref="Matrix"/>
+    /// Struct that represents a <see cref="Matrix"/>
     /// </summary>
     /// <remarks>
     /// Matrix is structured as follows:
     /// <code>
-    /// a b 0
-    /// c d 0
-    /// e f 1
+    /// A B 0
+    /// C D 0
+    /// E F 1
     /// </code>
     /// </remarks>
-    public class Matrix
+    public readonly struct Matrix
     {
-        private readonly double[,] _matrix = new double[3, 3];
-
-        private Matrix(double[,] matrix)
+        /// <summary>
+        /// Copy constructor for the <see cref="Matrix"/>
+        /// </summary>
+        /// <param name="matrix">The matrix to copy</param>
+        public Matrix(Matrix matrix)
         {
-            _matrix = matrix;
+            A = matrix.A;
+            B = matrix.B;
+            C = matrix.C;
+            D = matrix.D;
+            E = matrix.E;
+            F = matrix.F;
         }
 
         /// <summary>
@@ -31,72 +40,158 @@ private Matrix(double[,] matrix)
         /// <param name="f">The <see cref="F"/> value</param>
         public Matrix(double a, double b, double c, double d, double e, double f)
         {
-            _matrix[0, 0] = a;
-            _matrix[0, 1] = b;
-            _matrix[0, 2] = 0;
-            _matrix[1, 0] = c;
-            _matrix[1, 1] = d;
-            _matrix[1, 2] = 0;
-            _matrix[2, 0] = e;
-            _matrix[2, 1] = f;
-            _matrix[2, 2] = 1;
+            A = a;
+            B = b;
+            C = c;
+            D = d;
+            E = e;
+            F = f;
         }
 
         /// <summary>
         /// The A value
         /// </summary>
-        public double A => _matrix[0, 0];
+        public double A { get; }
 
         /// <summary>
         /// The B value
         /// </summary>
-        public double B => _matrix[0, 1];
+        public double B { get; }
 
         /// <summary>
         /// The C value
         /// </summary>
-        public double C => _matrix[1, 0];
+        public double C { get; }
 
         /// <summary>
         /// The D value
         /// </summary>
-        public double D => _matrix[1, 1];
+        public double D { get; }
 
         /// <summary>
         /// The E value
         /// </summary>
-        public double E => _matrix[2, 0];
+        public double E { get; }
 
         /// <summary>
         /// The F value
         /// </summary>
-        public double F => _matrix[2, 1];
+        public double F { get; }
+
+        /// <summary>
+        /// Apply a rotation operation on the matrix
+        /// </summary>
+        /// <param name="degrees">The amount of degrees to rotate</param>
+        /// <returns>The new <see cref="Matrix"/></returns>
+        public Matrix Rotate(double degrees)
+            => Multiply(CreateRotationMatrix(degrees));
+
+        /// <summary>
+        /// Apply a scale operation on the matrix
+        /// </summary>
+        /// <param name="x">The X amount to scale</param>
+        /// <param name="y">The Y amount to scale</param>
+        /// <returns>The new <see cref="Matrix"/></returns>
+        public Matrix Scale(double x, double y)
+            => Multiply(CreateScaleMatrix(x, y));
+
+        /// <summary>
+        /// Apply a skew operation on the matrix
+        /// </summary>
+        /// <param name="a">The amount of degrees to skew (top left direction)</param>
+        /// <param name="b">The amount of degrees to skew (bottom right direction)</param>
+        /// <returns>The new <see cref="Matrix"/></returns>
+        public Matrix Skew(double a, double b)
+            => Multiply(CreateSkewMatrix(a, b));
+
+        /// <summary>
+        /// Apply a translation operation on the matrix
+        /// </summary>
+        /// <param name="x">The X distance to translate</param>
+        /// <param name="y">The Y distance to translate</param>
+        /// <returns>The new <see cref="Matrix"/></returns>
+        public Matrix Translate(double x, double y)
+            => Multiply(CreateTranslationMatrix(x, y));
+
+        /// <summary>
+        /// Multiply matrix <paramref name="m1"/> with <paramref name="m2"/>
+        /// </summary>
+        /// <param name="m1">The left side of the matrix multiplication</param>
+        /// <param name="m2">The right side of the matrix multiplication</param>
+        /// <returns>The new <see cref="Matrix"/></returns>
+        public static Matrix operator *(Matrix m1, Matrix m2)
+            => m1.Multiply(m2);
 
         /// <summary>
         /// Multiply this matrix with <paramref name="other"/>
         /// </summary>
-        /// <param name="other">The other matrix to multiply by</param>
+        /// <param name="other">The matrix to multiply with</param>
         /// <returns>The new <see cref="Matrix"/></returns>
-        public Matrix Multiply(Matrix other)
+        public Matrix Multiply(in Matrix other)
         {
-            var a = _matrix;
-            var b = other._matrix;
-            var resultMatrix = new double[3, 3];
-
-            for (int row = 0; row < 3; row++)
-            {
-                for (int column = 0; column < 3; column++)
-                {
-                    double temp = 0;
-                    for (int currentColumn = 0; currentColumn < 3; currentColumn++)
-                    {
-                        temp += a[row, currentColumn] * b[currentColumn, column];
-                    }
-                    resultMatrix[row, column] = temp;
-                }
-            }
-
-            return new Matrix(resultMatrix);
+            double a, b, c, d, e, f;
+
+            a = ( this.A * other.A ) + ( this.B * other.C );
+            b = ( this.A * other.B ) + ( this.B * other.D );
+            c = ( this.C * other.A ) + ( this.D * other.C );
+            d = ( this.C * other.B ) + ( this.D * other.D );
+            e = ( this.E * other.A ) + ( this.F * other.C ) + other.E;
+            f = ( this.E * other.B ) + ( this.F * other.D ) + other.F;
+
+            return new Matrix(a, b, c, d, e, f);
+        }
+
+        /// <summary>
+        /// Create a matrix used for rotation
+        /// </summary>
+        /// <param name="degree">The amount of degrees to rotate by</param>
+        /// <returns>A rotated matrix</returns>
+        public static Matrix CreateRotationMatrix(double degree)
+            => new Matrix(
+                Math.Cos(_degreeToRad(degree)), Math.Sin(_degreeToRad(degree)) * -1,
+                Math.Sin(_degreeToRad(degree)), Math.Cos(_degreeToRad(degree)),
+                0, 0);
+
+        /// <summary>
+        /// Create a matrix used for scaling
+        /// </summary>
+        /// <param name="x">The X scale</param>
+        /// <param name="y">The Y scale</param>
+        /// <returns>A scaled matrix</returns>
+        public static Matrix CreateScaleMatrix(double x, double y)
+            => new Matrix(
+                x, 0,
+                0, y,
+                0, 0);
+
+        /// <summary>
+        /// Create a matrix used for skewing
+        /// </summary>
+        /// <param name="a">The amount of degree to skew the top left direction</param>
+        /// <param name="b">The amount of degree to skew the bottom right direction</param>
+        /// <returns>A skewed matrix</returns>
+        public static Matrix CreateSkewMatrix(double a, double b)
+            => new Matrix(
+                1, Math.Tan(_degreeToRad(a)),
+                Math.Tan(_degreeToRad(b)), 1,
+                0, 0);
+
+        /// <summary>
+        /// Create a matrix used for translation
+        /// </summary>
+        /// <param name="x">The amount of X translation</param>
+        /// <param name="y">The amount of Y translation</param>
+        /// <returns>A matrix representing a translation</returns>
+        public static Matrix CreateTranslationMatrix(double x, double y)
+            => new Matrix(
+                1, 0,
+                0, 1,
+                x, y);
+
+        private static double _degreeToRad(double degree)
+        {
+            return degree * Math.PI / 180;
         }
     }
+
 }