Merge pull request #3 from fireblade-engine/feature/size-extensions

ctreffs · web-flow · commit 6008d56ffe8e · 2020-11-16T07:27:43.000+01:00
Size &amp; Point extensions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        xcode: ["11.7", "12"]
+        xcode: ["11.7", "12.1"]
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -52,14 +52,14 @@ jobs:
         run: swift build -c release
         
 
-  webAssembly:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Swift version
-        run: swift --version
-      - name: Build
-        uses: swiftwasm/swiftwasm-action@v5.3
-        with:
-          shell-action: carton test
+#  webAssembly:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@master
+#      - name: Swift version
+#        run: swift --version
+#      - name: Build
+#        uses: swiftwasm/swiftwasm-action@main
+#        with:
+#          shell-action: carton test
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![github CI](https://github.com/fireblade-engine/math/workflows/CI/badge.svg)](https://github.com/fireblade-engine/math/actions?query=workflow%3ACI)  
 [![swift-version-compatibility](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Ffireblade-engine%2Fmath%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/fireblade-engine/math) 
 [![platform-compatilibilty](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Ffireblade-engine%2Fmath%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/fireblade-engine/math) 
-[![platform-webassembly](https://img.shields.io/badge/Platform-WebAssembly-blue.svg)](https://github.com/swiftwasm/swift#swiftwasm)
+<!--[![platform-webassembly](https://img.shields.io/badge/Platform-WebAssembly-blue.svg)](https://github.com/swiftwasm/swift#swiftwasm)-->
 
 
 A dependency free, lightweight, fast math library for 2D and 3D vectors, quaternions and matrices in Swift with (optional) SIMD support.  It is developed and maintained as part of the [Fireblade Game Engine project](https://github.com/fireblade-engine).
diff --git a/Sources/FirebladeMath/Functions/determinant.swift b/Sources/FirebladeMath/Functions/determinant.swift
@@ -13,14 +13,14 @@ public func determinant(_ mat: Mat4x4f) -> Float {
     #if FRB_MATH_USE_SIMD
     return simd.simd_determinant(mat.storage)
     #else
-    return mat[0, 0]*mat[1, 1]*mat[2, 2]*mat[3, 3] - mat[1, 0]*mat[0, 1]*mat[2, 2]*mat[3, 3] + mat[0, 2]*mat[0, 1]*mat[1, 2]*mat[3, 3]
-        - mat[0, 0]*mat[2, 1]*mat[1, 2]*mat[3, 3] + mat[1, 0]*mat[2, 1]*mat[0, 2]*mat[3, 3] - mat[0, 2]*mat[1, 1]*mat[0, 2]*mat[3, 3]
-        + mat[0, 2]*mat[1, 1]*mat[3, 2]*mat[0, 3] - mat[1, 0]*mat[2, 1]*mat[3, 2]*mat[0, 3] + mat[3, 0]*mat[2, 1]*mat[1, 2]*mat[0, 3]
-        - mat[0, 2]*mat[3, 1]*mat[1, 2]*mat[0, 3] + mat[1, 0]*mat[3, 1]*mat[2, 2]*mat[0, 3] - mat[3, 0]*mat[1, 1]*mat[2, 2]*mat[0, 3]
-        + mat[3, 0]*mat[0, 1]*mat[2, 2]*mat[1, 3] - mat[0, 0]*mat[3, 1]*mat[2, 2]*mat[1, 3] + mat[0, 2]*mat[3, 1]*mat[0, 2]*mat[1, 3]
-        - mat[3, 0]*mat[2, 1]*mat[0, 2]*mat[1, 3] + mat[0, 0]*mat[2, 1]*mat[3, 2]*mat[1, 3] - mat[0, 2]*mat[0, 1]*mat[3, 2]*mat[1, 3]
-        + mat[1, 0]*mat[0, 1]*mat[3, 2]*mat[2, 3] - mat[0, 0]*mat[1, 1]*mat[3, 2]*mat[2, 3] + mat[3, 0]*mat[1, 1]*mat[0, 2]*mat[2, 3]
-        - mat[1, 0]*mat[3, 1]*mat[0, 2]*mat[2, 3] + mat[0, 0]*mat[3, 1]*mat[1, 2]*mat[2, 3] - mat[3, 0]*mat[0, 1]*mat[1, 2]*mat[2, 3]
+    return mat[0, 0] * mat[1, 1] * mat[2, 2] * mat[3, 3] - mat[1, 0] * mat[0, 1] * mat[2, 2] * mat[3, 3] + mat[0, 2] * mat[0, 1] * mat[1, 2] * mat[3, 3]
+        - mat[0, 0] * mat[2, 1] * mat[1, 2] * mat[3, 3] + mat[1, 0] * mat[2, 1] * mat[0, 2] * mat[3, 3] - mat[0, 2] * mat[1, 1] * mat[0, 2] * mat[3, 3]
+        + mat[0, 2] * mat[1, 1] * mat[3, 2] * mat[0, 3] - mat[1, 0] * mat[2, 1] * mat[3, 2] * mat[0, 3] + mat[3, 0] * mat[2, 1] * mat[1, 2] * mat[0, 3]
+        - mat[0, 2] * mat[3, 1] * mat[1, 2] * mat[0, 3] + mat[1, 0] * mat[3, 1] * mat[2, 2] * mat[0, 3] - mat[3, 0] * mat[1, 1] * mat[2, 2] * mat[0, 3]
+        + mat[3, 0] * mat[0, 1] * mat[2, 2] * mat[1, 3] - mat[0, 0] * mat[3, 1] * mat[2, 2] * mat[1, 3] + mat[0, 2] * mat[3, 1] * mat[0, 2] * mat[1, 3]
+        - mat[3, 0] * mat[2, 1] * mat[0, 2] * mat[1, 3] + mat[0, 0] * mat[2, 1] * mat[3, 2] * mat[1, 3] - mat[0, 2] * mat[0, 1] * mat[3, 2] * mat[1, 3]
+        + mat[1, 0] * mat[0, 1] * mat[3, 2] * mat[2, 3] - mat[0, 0] * mat[1, 1] * mat[3, 2] * mat[2, 3] + mat[3, 0] * mat[1, 1] * mat[0, 2] * mat[2, 3]
+        - mat[1, 0] * mat[3, 1] * mat[0, 2] * mat[2, 3] + mat[0, 0] * mat[3, 1] * mat[1, 2] * mat[2, 3] - mat[3, 0] * mat[0, 1] * mat[1, 2] * mat[2, 3]
     #endif
 }
 
@@ -37,14 +37,14 @@ public func determinant(_ mat: Mat4x4d) -> Double {
     #if FRB_MATH_USE_SIMD
     return simd.simd_determinant(mat.storage)
     #else
-    return mat[0, 0]*mat[1, 1]*mat[2, 2]*mat[3, 3] - mat[1, 0]*mat[0, 1]*mat[2, 2]*mat[3, 3] + mat[0, 2]*mat[0, 1]*mat[1, 2]*mat[3, 3]
-        - mat[0, 0]*mat[2, 1]*mat[1, 2]*mat[3, 3] + mat[1, 0]*mat[2, 1]*mat[0, 2]*mat[3, 3] - mat[0, 2]*mat[1, 1]*mat[0, 2]*mat[3, 3]
-        + mat[0, 2]*mat[1, 1]*mat[3, 2]*mat[0, 3] - mat[1, 0]*mat[2, 1]*mat[3, 2]*mat[0, 3] + mat[3, 0]*mat[2, 1]*mat[1, 2]*mat[0, 3]
-        - mat[0, 2]*mat[3, 1]*mat[1, 2]*mat[0, 3] + mat[1, 0]*mat[3, 1]*mat[2, 2]*mat[0, 3] - mat[3, 0]*mat[1, 1]*mat[2, 2]*mat[0, 3]
-        + mat[3, 0]*mat[0, 1]*mat[2, 2]*mat[1, 3] - mat[0, 0]*mat[3, 1]*mat[2, 2]*mat[1, 3] + mat[0, 2]*mat[3, 1]*mat[0, 2]*mat[1, 3]
-        - mat[3, 0]*mat[2, 1]*mat[0, 2]*mat[1, 3] + mat[0, 0]*mat[2, 1]*mat[3, 2]*mat[1, 3] - mat[0, 2]*mat[0, 1]*mat[3, 2]*mat[1, 3]
-        + mat[1, 0]*mat[0, 1]*mat[3, 2]*mat[2, 3] - mat[0, 0]*mat[1, 1]*mat[3, 2]*mat[2, 3] + mat[3, 0]*mat[1, 1]*mat[0, 2]*mat[2, 3]
-        - mat[1, 0]*mat[3, 1]*mat[0, 2]*mat[2, 3] + mat[0, 0]*mat[3, 1]*mat[1, 2]*mat[2, 3] - mat[3, 0]*mat[0, 1]*mat[1, 2]*mat[2, 3]
+    return mat[0, 0] * mat[1, 1] * mat[2, 2] * mat[3, 3] - mat[1, 0] * mat[0, 1] * mat[2, 2] * mat[3, 3] + mat[0, 2] * mat[0, 1] * mat[1, 2] * mat[3, 3]
+        - mat[0, 0] * mat[2, 1] * mat[1, 2] * mat[3, 3] + mat[1, 0] * mat[2, 1] * mat[0, 2] * mat[3, 3] - mat[0, 2] * mat[1, 1] * mat[0, 2] * mat[3, 3]
+        + mat[0, 2] * mat[1, 1] * mat[3, 2] * mat[0, 3] - mat[1, 0] * mat[2, 1] * mat[3, 2] * mat[0, 3] + mat[3, 0] * mat[2, 1] * mat[1, 2] * mat[0, 3]
+        - mat[0, 2] * mat[3, 1] * mat[1, 2] * mat[0, 3] + mat[1, 0] * mat[3, 1] * mat[2, 2] * mat[0, 3] - mat[3, 0] * mat[1, 1] * mat[2, 2] * mat[0, 3]
+        + mat[3, 0] * mat[0, 1] * mat[2, 2] * mat[1, 3] - mat[0, 0] * mat[3, 1] * mat[2, 2] * mat[1, 3] + mat[0, 2] * mat[3, 1] * mat[0, 2] * mat[1, 3]
+        - mat[3, 0] * mat[2, 1] * mat[0, 2] * mat[1, 3] + mat[0, 0] * mat[2, 1] * mat[3, 2] * mat[1, 3] - mat[0, 2] * mat[0, 1] * mat[3, 2] * mat[1, 3]
+        + mat[1, 0] * mat[0, 1] * mat[3, 2] * mat[2, 3] - mat[0, 0] * mat[1, 1] * mat[3, 2] * mat[2, 3] + mat[3, 0] * mat[1, 1] * mat[0, 2] * mat[2, 3]
+        - mat[1, 0] * mat[3, 1] * mat[0, 2] * mat[2, 3] + mat[0, 0] * mat[3, 1] * mat[1, 2] * mat[2, 3] - mat[3, 0] * mat[0, 1] * mat[1, 2] * mat[2, 3]
     #endif
 }
 
diff --git a/Sources/FirebladeMath/Matrix/Matrix+Multiplication.swift b/Sources/FirebladeMath/Matrix/Matrix+Multiplication.swift
@@ -17,26 +17,26 @@ public func multiply(_ lhs: Mat4x4d, _ rhs: Mat4x4d) -> Mat4x4d {
     #else
     return Mat4x4d(
         Vec4d(
-            lhs[0] * rhs[0]  + lhs[4] * rhs[1]  + lhs[8] * rhs[2]   + lhs[12] * rhs[3],
-            lhs[1] * rhs[0]  + lhs[5] * rhs[1]  + lhs[9] * rhs[2]   + lhs[13] * rhs[3],
-            lhs[2] * rhs[0]  + lhs[6] * rhs[1]  + lhs[10] * rhs[2]  + lhs[14] * rhs[3],
-            lhs[3] * rhs[0]  + lhs[7] * rhs[1]  + lhs[11] * rhs[2]  + lhs[15] * rhs[3]
+            lhs[0] * rhs[0] + lhs[4] * rhs[1] + lhs[8] * rhs[2] + lhs[12] * rhs[3],
+            lhs[1] * rhs[0] + lhs[5] * rhs[1] + lhs[9] * rhs[2] + lhs[13] * rhs[3],
+            lhs[2] * rhs[0] + lhs[6] * rhs[1] + lhs[10] * rhs[2] + lhs[14] * rhs[3],
+            lhs[3] * rhs[0] + lhs[7] * rhs[1] + lhs[11] * rhs[2] + lhs[15] * rhs[3]
         ),
         Vec4d(
-            lhs[0] * rhs[4]  + lhs[4] * rhs[5]  + lhs[8] * rhs[6]   + lhs[12] * rhs[7],
-            lhs[1] * rhs[4]  + lhs[5] * rhs[5]  + lhs[9] * rhs[6]   + lhs[13] * rhs[7],
-            lhs[2] * rhs[4]  + lhs[6] * rhs[5]  + lhs[10] * rhs[6]  + lhs[14] * rhs[7],
-            lhs[3] * rhs[4]  + lhs[7] * rhs[5]  + lhs[11] * rhs[6]  + lhs[15] * rhs[7]
+            lhs[0] * rhs[4] + lhs[4] * rhs[5] + lhs[8] * rhs[6] + lhs[12] * rhs[7],
+            lhs[1] * rhs[4] + lhs[5] * rhs[5] + lhs[9] * rhs[6] + lhs[13] * rhs[7],
+            lhs[2] * rhs[4] + lhs[6] * rhs[5] + lhs[10] * rhs[6] + lhs[14] * rhs[7],
+            lhs[3] * rhs[4] + lhs[7] * rhs[5] + lhs[11] * rhs[6] + lhs[15] * rhs[7]
         ),
         Vec4d(
-            lhs[0] * rhs[8]  + lhs[4] * rhs[9]  + lhs[8] * rhs[10]  + lhs[12] * rhs[11],
-            lhs[1] * rhs[8]  + lhs[5] * rhs[9]  + lhs[9] * rhs[10]  + lhs[13] * rhs[11],
-            lhs[2] * rhs[8]  + lhs[6] * rhs[9]  + lhs[10] * rhs[10] + lhs[14] * rhs[11],
-            lhs[3] * rhs[8]  + lhs[7] * rhs[9]  + lhs[11] * rhs[10] + lhs[15] * rhs[11]
+            lhs[0] * rhs[8] + lhs[4] * rhs[9] + lhs[8] * rhs[10] + lhs[12] * rhs[11],
+            lhs[1] * rhs[8] + lhs[5] * rhs[9] + lhs[9] * rhs[10] + lhs[13] * rhs[11],
+            lhs[2] * rhs[8] + lhs[6] * rhs[9] + lhs[10] * rhs[10] + lhs[14] * rhs[11],
+            lhs[3] * rhs[8] + lhs[7] * rhs[9] + lhs[11] * rhs[10] + lhs[15] * rhs[11]
         ),
         Vec4d(
-            lhs[0] * rhs[12] + lhs[4] * rhs[13] + lhs[8] * rhs[14]  + lhs[12] * rhs[15],
-            lhs[1] * rhs[12] + lhs[5] * rhs[13] + lhs[9] * rhs[14]  + lhs[13] * rhs[15],
+            lhs[0] * rhs[12] + lhs[4] * rhs[13] + lhs[8] * rhs[14] + lhs[12] * rhs[15],
+            lhs[1] * rhs[12] + lhs[5] * rhs[13] + lhs[9] * rhs[14] + lhs[13] * rhs[15],
             lhs[2] * rhs[12] + lhs[6] * rhs[13] + lhs[10] * rhs[14] + lhs[14] * rhs[15],
             lhs[3] * rhs[12] + lhs[7] * rhs[13] + lhs[11] * rhs[14] + lhs[15] * rhs[15]
         )
@@ -87,26 +87,26 @@ public func multiply(_ lhs: Mat4x4f, _ rhs: Mat4x4f) -> Mat4x4f {
     #else
     return Mat4x4f(
         Vec4f(
-            lhs[0] * rhs[0]  + lhs[4] * rhs[1]  + lhs[8] * rhs[2]   + lhs[12] * rhs[3],
-            lhs[1] * rhs[0]  + lhs[5] * rhs[1]  + lhs[9] * rhs[2]   + lhs[13] * rhs[3],
-            lhs[2] * rhs[0]  + lhs[6] * rhs[1]  + lhs[10] * rhs[2]  + lhs[14] * rhs[3],
-            lhs[3] * rhs[0]  + lhs[7] * rhs[1]  + lhs[11] * rhs[2]  + lhs[15] * rhs[3]
+            lhs[0] * rhs[0] + lhs[4] * rhs[1] + lhs[8] * rhs[2] + lhs[12] * rhs[3],
+            lhs[1] * rhs[0] + lhs[5] * rhs[1] + lhs[9] * rhs[2] + lhs[13] * rhs[3],
+            lhs[2] * rhs[0] + lhs[6] * rhs[1] + lhs[10] * rhs[2] + lhs[14] * rhs[3],
+            lhs[3] * rhs[0] + lhs[7] * rhs[1] + lhs[11] * rhs[2] + lhs[15] * rhs[3]
         ),
         Vec4f(
-            lhs[0] * rhs[4]  + lhs[4] * rhs[5]  + lhs[8] * rhs[6]   + lhs[12] * rhs[7],
-            lhs[1] * rhs[4]  + lhs[5] * rhs[5]  + lhs[9] * rhs[6]   + lhs[13] * rhs[7],
-            lhs[2] * rhs[4]  + lhs[6] * rhs[5]  + lhs[10] * rhs[6]  + lhs[14] * rhs[7],
-            lhs[3] * rhs[4]  + lhs[7] * rhs[5]  + lhs[11] * rhs[6]  + lhs[15] * rhs[7]
+            lhs[0] * rhs[4] + lhs[4] * rhs[5] + lhs[8] * rhs[6] + lhs[12] * rhs[7],
+            lhs[1] * rhs[4] + lhs[5] * rhs[5] + lhs[9] * rhs[6] + lhs[13] * rhs[7],
+            lhs[2] * rhs[4] + lhs[6] * rhs[5] + lhs[10] * rhs[6] + lhs[14] * rhs[7],
+            lhs[3] * rhs[4] + lhs[7] * rhs[5] + lhs[11] * rhs[6] + lhs[15] * rhs[7]
         ),
         Vec4f(
-            lhs[0] * rhs[8]  + lhs[4] * rhs[9]  + lhs[8] * rhs[10]  + lhs[12] * rhs[11],
-            lhs[1] * rhs[8]  + lhs[5] * rhs[9]  + lhs[9] * rhs[10]  + lhs[13] * rhs[11],
-            lhs[2] * rhs[8]  + lhs[6] * rhs[9]  + lhs[10] * rhs[10] + lhs[14] * rhs[11],
-            lhs[3] * rhs[8]  + lhs[7] * rhs[9]  + lhs[11] * rhs[10] + lhs[15] * rhs[11]
+            lhs[0] * rhs[8] + lhs[4] * rhs[9] + lhs[8] * rhs[10] + lhs[12] * rhs[11],
+            lhs[1] * rhs[8] + lhs[5] * rhs[9] + lhs[9] * rhs[10] + lhs[13] * rhs[11],
+            lhs[2] * rhs[8] + lhs[6] * rhs[9] + lhs[10] * rhs[10] + lhs[14] * rhs[11],
+            lhs[3] * rhs[8] + lhs[7] * rhs[9] + lhs[11] * rhs[10] + lhs[15] * rhs[11]
         ),
         Vec4f(
-            lhs[0] * rhs[12] + lhs[4] * rhs[13] + lhs[8] * rhs[14]  + lhs[12] * rhs[15],
-            lhs[1] * rhs[12] + lhs[5] * rhs[13] + lhs[9] * rhs[14]  + lhs[13] * rhs[15],
+            lhs[0] * rhs[12] + lhs[4] * rhs[13] + lhs[8] * rhs[14] + lhs[12] * rhs[15],
+            lhs[1] * rhs[12] + lhs[5] * rhs[13] + lhs[9] * rhs[14] + lhs[13] * rhs[15],
             lhs[2] * rhs[12] + lhs[6] * rhs[13] + lhs[10] * rhs[14] + lhs[14] * rhs[15],
             lhs[3] * rhs[12] + lhs[7] * rhs[13] + lhs[11] * rhs[14] + lhs[15] * rhs[15]
         )
diff --git a/Sources/FirebladeMath/Point.swift b/Sources/FirebladeMath/Point.swift
@@ -22,36 +22,53 @@ extension Point {
     }
 }
 
+extension Point: Equatable where Value: Equatable { }
+extension Point: Hashable where Value: Hashable { }
+extension Point: Codable where Value: Codable { }
+
 extension Point where Value == Float {
     public init(_ vector: Vec2f) {
         self.init(x: vector.x, y: vector.y)
     }
 }
 
+extension Vec2f {
+    public init(_ point: Point<Float>) {
+        self.init(x: point.x, y: point.y)
+    }
+}
+
 extension Point where Value == Int {
     public init(_ vector: Vec2i) {
         self.init(x: vector.x, y: vector.y)
     }
 }
 
+extension Vec2i {
+    public init(_ point: Point<Int>) {
+        self.init(x: point.x, y: point.y)
+    }
+}
+
 extension Point where Value == Double {
     public init(_ vector: Vec2d) {
         self.init(x: vector.x, y: vector.y)
     }
 }
+extension Vec2d {
+    public init(_ point: Point<Double>) {
+        self.init(x: point.x, y: point.y)
+    }
+}
 
 extension Point where Value == UInt {
     public init(_ vector: Vec2u) {
         self.init(x: vector.x, y: vector.y)
     }
 }
 
-extension Point: Equatable where Value: Equatable { }
-extension Point: Hashable where Value: Hashable { }
-extension Point: Codable where Value: Codable { }
-
-extension Vec2f {
-    public init(_ point: Point<Float>) {
+extension Vec2u {
+    public init(_ point: Point<UInt>) {
         self.init(x: point.x, y: point.y)
     }
 }
diff --git a/Sources/FirebladeMath/Size.swift b/Sources/FirebladeMath/Size.swift
@@ -9,6 +9,27 @@
 public struct Size<Value> where Value: Numeric {
     public var width: Value
     public var height: Value
+
+    public init(width: Value, height: Value) {
+        self.width = width
+        self.height = height
+    }
+}
+
+extension Size {
+    public init(_ width: Value, _ height: Value) {
+        self.init(width: width, height: height)
+    }
+}
+
+extension Size: Equatable where Value: Equatable { }
+extension Size: Hashable where Value: Hashable { }
+extension Size: Codable where Value: Codable { }
+
+extension Size where Value: FloatingPoint & ExpressibleByFloatLiteral {
+    public var center: Point<Value> {
+        Point(x: width * 0.5, y: height * 0.5)
+    }
 }
 
 extension Size where Value == Float {
@@ -17,30 +38,44 @@ extension Size where Value == Float {
     }
 }
 
+extension Vec2f {
+    public init(_ size: Size<Float>) {
+        self.init(x: size.width, y: size.height)
+    }
+}
+
 extension Size where Value == Int {
     public init(_ vector: Vec2i) {
         self.init(width: vector.x, height: vector.y)
     }
 }
 
+extension Vec2i {
+    public init(_ size: Size<Int>) {
+        self.init(x: size.width, y: size.height)
+    }
+}
+
 extension Size where Value == Double {
     public init(_ vector: Vec2d) {
         self.init(width: vector.x, height: vector.y)
     }
 }
 
+extension Vec2d {
+    public init(_ size: Size<Double>) {
+        self.init(x: size.width, y: size.height)
+    }
+}
+
 extension Size where Value == UInt {
     public init(_ vector: Vec2u) {
         self.init(width: vector.x, height: vector.y)
     }
 }
 
-extension Size: Equatable where Value: Equatable { }
-extension Size: Hashable where Value: Hashable { }
-extension Size: Codable where Value: Codable { }
-
-extension Vec2f {
-    public init(_ size: Size<Float>) {
+extension Vec2u {
+    public init(_ size: Size<UInt>) {
         self.init(x: size.width, y: size.height)
     }
 }
diff --git a/Tests/FirebladeMathTests/XCTestManifests.swift b/Tests/FirebladeMathTests/XCTestManifests.swift
@@ -54,7 +54,7 @@ extension FunctionTests {
         ("test_sqrt", test_sqrt),
         ("test_step", test_step),
         ("test_tan", test_tan),
-        ("test_tanh", test_tanh)
+        ("test_tanh", test_tanh),
     ]
 }
 
@@ -88,7 +88,7 @@ extension Mat4x4fTests {
         ("testTranslateMatrixByVector", testTranslateMatrixByVector),
         ("testTranslation", testTranslation),
         ("testTranslationInit", testTranslationInit),
-        ("testUpperLeft", testUpperLeft)
+        ("testUpperLeft", testUpperLeft),
     ]
 }
 
@@ -120,15 +120,15 @@ extension Quat4fTests {
         ("testRotMat3x3", testRotMat3x3),
         ("testRotMat4x4", testRotMat4x4),
         ("testSubtract", testSubtract),
-        ("testVectorInit", testVectorInit)
+        ("testVectorInit", testVectorInit),
     ]
 }
 
 public func __allTests() -> [XCTestCaseEntry] {
     return [
         testCase(FunctionTests.__allTests__FunctionTests),
         testCase(Mat4x4fTests.__allTests__Mat4x4fTests),
-        testCase(Quat4fTests.__allTests__Quat4fTests)
+        testCase(Quat4fTests.__allTests__Quat4fTests),
     ]
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -22,36 +22,53 @@ extension Point {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
	`25`	`+extension Point: Equatable where Value: Equatable { }`
	`26`	`+extension Point: Hashable where Value: Hashable { }`
	`27`	`+extension Point: Codable where Value: Codable { }`
	`28`	`+`
`25`	`29`	`extension Point where Value == Float {`
`26`	`30`	`public init(_ vector: Vec2f) {`
`27`	`31`	`self.init(x: vector.x, y: vector.y)`
`28`	`32`	`}`
`29`	`33`	`}`
`30`	`34`
	`35`	`+extension Vec2f {`
	`36`	`+ public init(_ point: Point<Float>) {`
	`37`	`+ self.init(x: point.x, y: point.y)`
	`38`	`+ }`
	`39`	`+}`
	`40`	`+`
`31`	`41`	`extension Point where Value == Int {`
`32`	`42`	`public init(_ vector: Vec2i) {`
`33`	`43`	`self.init(x: vector.x, y: vector.y)`
`34`	`44`	`}`
`35`	`45`	`}`
`36`	`46`
	`47`	`+extension Vec2i {`
	`48`	`+ public init(_ point: Point<Int>) {`
	`49`	`+ self.init(x: point.x, y: point.y)`
	`50`	`+ }`
	`51`	`+}`
	`52`	`+`
`37`	`53`	`extension Point where Value == Double {`
`38`	`54`	`public init(_ vector: Vec2d) {`
`39`	`55`	`self.init(x: vector.x, y: vector.y)`
`40`	`56`	`}`
`41`	`57`	`}`
	`58`	`+extension Vec2d {`
	`59`	`+ public init(_ point: Point<Double>) {`
	`60`	`+ self.init(x: point.x, y: point.y)`
	`61`	`+ }`
	`62`	`+}`
`42`	`63`
`43`	`64`	`extension Point where Value == UInt {`
`44`	`65`	`public init(_ vector: Vec2u) {`
`45`	`66`	`self.init(x: vector.x, y: vector.y)`
`46`	`67`	`}`
`47`	`68`	`}`
`48`	`69`
`49`		`-extension Point: Equatable where Value: Equatable { }`
`50`		`-extension Point: Hashable where Value: Hashable { }`
`51`		`-extension Point: Codable where Value: Codable { }`
`52`		`-`
`53`		`-extension Vec2f {`
`54`		`- public init(_ point: Point<Float>) {`
	`70`	`+extension Vec2u {`
	`71`	`+ public init(_ point: Point<UInt>) {`
`55`	`72`	`self.init(x: point.x, y: point.y)`
`56`	`73`	`}`
`57`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ extension FunctionTests {`
`54`	`54`	`("test_sqrt", test_sqrt),`
`55`	`55`	`("test_step", test_step),`
`56`	`56`	`("test_tan", test_tan),`
`57`		`- ("test_tanh", test_tanh)`
	`57`	`+ ("test_tanh", test_tanh),`
`58`	`58`	`]`
`59`	`59`	`}`
`60`	`60`
`@@ -88,7 +88,7 @@ extension Mat4x4fTests {`
`88`	`88`	`("testTranslateMatrixByVector", testTranslateMatrixByVector),`
`89`	`89`	`("testTranslation", testTranslation),`
`90`	`90`	`("testTranslationInit", testTranslationInit),`
`91`		`- ("testUpperLeft", testUpperLeft)`
	`91`	`+ ("testUpperLeft", testUpperLeft),`
`92`	`92`	`]`
`93`	`93`	`}`
`94`	`94`
`@@ -120,15 +120,15 @@ extension Quat4fTests {`
`120`	`120`	`("testRotMat3x3", testRotMat3x3),`
`121`	`121`	`("testRotMat4x4", testRotMat4x4),`
`122`	`122`	`("testSubtract", testSubtract),`
`123`		`- ("testVectorInit", testVectorInit)`
	`123`	`+ ("testVectorInit", testVectorInit),`
`124`	`124`	`]`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public func __allTests() -> [XCTestCaseEntry] {`
`128`	`128`	`return [`
`129`	`129`	`testCase(FunctionTests.__allTests__FunctionTests),`
`130`	`130`	`testCase(Mat4x4fTests.__allTests__Mat4x4fTests),`
`131`		`- testCase(Quat4fTests.__allTests__Quat4fTests)`
	`131`	`+ testCase(Quat4fTests.__allTests__Quat4fTests),`
`132`	`132`	`]`
`133`	`133`	`}`
`134`	`134`	`#endif`