Add Ability to Scale or Translate X Y by CGPoint

Author: b3ll

Diff for: Sources/Decomposed/CATransform3DExtensions.swift

@@ -110,11 +110,27 @@ public extension CATransform3D {
     return self.translated(by: translation)
   }
 
+    /**
+     Returns a copy by translating the current transform by the given translation components.
+
+     - Note: Omitted components have no effect on the translation.
+     */
+    func translated(by translation: CGPoint) -> Self {
+        let translation = Translation(translation.x, translation.y, 0.0)
+      return self.translated(by: translation)
+    }
+
   /// Translates the current transform by the given translation amount.
   mutating func translate(by translation: Translation) {
     self = CATransform3D(matrix.translated(by: translation.storage))
   }
 
+    /// Translates the current transform by the given translation amount.
+    mutating func translate(by translation: CGPoint) {
+        let translation = Translation(translation.x, translation.y, 0.0)
+        translate(by: translation)
+    }
+
   /// The scale of the transform.
   var scale: Scale {
     get {
@@ -134,6 +150,11 @@ public extension CATransform3D {
     return transform
   }
 
+    /// Returns a copy by scaling the current transform by the given scale.
+    func scaled(by scale: CGPoint) -> Self {
+        return self.scaled(by: Scale(scale.x, scale.y, 0.0))
+    }
+
   /**
    Returns a copy by scaling the current transform by the given scale.
 
@@ -149,6 +170,12 @@ public extension CATransform3D {
     self = CATransform3D(matrix.scaled(by: scale.storage))
   }
 
+    /// Scales the current transform by the given scale.
+    mutating func scale(by scale: CGPoint) {
+        let scale = Scale(scale.x, scale.y, 0.0)
+        self.scale(by: scale)
+    }
+
   /// The rotation of the transform (expressed as a quaternion).
   var rotation: CGQuaternion {
     get {

Diff for: Tests/DecomposedTests/DoubleTests.swift

@@ -23,6 +23,14 @@ final class DoubleTests: XCTestCase {
     let testTransform3 = CATransform3DIdentity.translated(by: CGVector3(x: 2.0, y: 3.0, z: 4.0))
 
     XCTAssertEqual(testTransform3, testTransformCA)
+
+    testTransform2.translation.z = 0.0
+    let testTransform4 = CATransform3DIdentity.translated(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform4, testTransform2)
+
+    var testTransform5 = CATransform3DIdentity
+    testTransform5.translate(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform5, testTransform2)
   }
 
   func testScale() {
@@ -41,6 +49,15 @@ final class DoubleTests: XCTestCase {
 
     let testTransform3 = CATransform3DIdentity.scaled(by: CGVector3(x: 2.0, y: 3.0, z: 4.0))
     XCTAssertEqual(testTransform3, testTransformCA)
+
+    testTransform2.scale.z = 0.0
+
+    let testTransform4 = CATransform3DIdentity.scaled(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform4, testTransform2)
+
+    var testTransform5 = CATransform3DIdentity
+    testTransform5.scale(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform5, testTransform2)
   }
 
   func testRotation() {

Diff for: Tests/DecomposedTests/FloatTests.swift

@@ -23,6 +23,14 @@ final class FloatTests: XCTestCase {
     let testTransform3 = CATransform3DIdentity.translated(by: CGVector3(x: 2.0, y: 3.0, z: 4.0))
 
     XCTAssertEqual(testTransform3, testTransformCA)
+
+    testTransform2.translation.z = 0.0
+    let testTransform4 = CATransform3DIdentity.translated(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform4, testTransform2)
+
+    var testTransform5 = CATransform3DIdentity
+    testTransform5.translate(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform5, testTransform2)
   }
 
   func testScale() {
@@ -41,6 +49,15 @@ final class FloatTests: XCTestCase {
 
     let testTransform3 = CATransform3DIdentity.scaled(by: CGVector3(x: 2.0, y: 3.0, z: 4.0))
     XCTAssertEqual(testTransform3, testTransformCA)
+
+    testTransform2.scale.z = 0.0
+
+    let testTransform4 = CATransform3DIdentity.scaled(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform4, testTransform2)
+
+    var testTransform5 = CATransform3DIdentity
+    testTransform5.scale(by: CGPoint(x: 2.0, y: 3.0))
+    XCTAssertEqual(testTransform5, testTransform2)
   }
 
   func testRotation() {