Lint

ctreffs · ctreffs · commit a50654f99c18 · 2020-11-16T07:11:31.000+01:00
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/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
`@@ -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`