Skip to content

Commit

Permalink
add Mat3x3 NOSIMD implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@s1ddok
s1ddok committed Dec 16, 2016
1 parent 0f3c6a7 commit a2cd211
Show file tree
Hide file tree
Showing 6 changed files with 319 additions and 81 deletions.
221 changes: 221 additions & 0 deletions Sources/Matrix3x3+nosimd.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
//
// Matrix3x3fx3+nosimd.swift
// SwiftMath
//
// Created by Andrey Volodin on 16.12.16.
//
//

#if NOSIMD
public struct Matrix3x3f {
public var m11: Float = 0.0
public var m12: Float = 0.0
public var m13: Float = 0.0
public var m21: Float = 0.0
public var m22: Float = 0.0
public var m23: Float = 0.0
public var m31: Float = 0.0
public var m32: Float = 0.0
public var m33: Float = 0.0

public func toArray() -> [Float] {
return [m11, m12, m13, m21, m22, m23, m31, m32, m33]
}

@inline(__always)
public init() {}

/// Creates an instance using the vector to initialize the diagonal elements
@inline(__always)
public init(diagonal v: Vector3f) {
m11 = v[0]
m22 = v[1]
m33 = v[2]
}

/// Creates an instance with the specified columns
///
/// - parameter c0: a vector representing column 0
/// - parameter c1: a vector representing column 1
/// - parameter c2: a vector representing column 2
@inline(__always)
public init(_ c0: Vector3f, _ c1: Vector3f, _ c2: Vector3f) {
m11 = c0[0]
m12 = c0[1]
m13 = c0[2]

m21 = c1[0]
m22 = c1[1]
m23 = c1[2]

m31 = c2[0]
m32 = c2[1]
m33 = c2[2]
}

/// Access the `col`th column vector
public subscript(col: Int) -> Vector3f {
get {
switch col {
case 0: return Vector3f(m11, m12, m13)
case 1: return Vector3f(m21, m22, m23)
case 2: return Vector3f(m31, m32, m33)
default: fatalError("Index outside of bounds")
}
}

set {
switch col {
case 0: m11 = newValue[0]; m12 = newValue[1]; m12 = newValue[2];
case 1: m21 = newValue[0]; m22 = newValue[1]; m22 = newValue[2];
case 2: m31 = newValue[0]; m32 = newValue[1]; m32 = newValue[2];
default: fatalError("Index outside of bounds")
}
}
}

/// Access the `col`th column vector and then `row`th element
public subscript(col: Int, row: Int) -> Float {
get {
switch col {
case 0:
switch row {
case 0: return m11
case 1: return m12
case 2: return m13
default: fatalError("Index outside of bounds")
}
case 1:
switch row {
case 0: return m21
case 1: return m22
case 2: return m23
default: fatalError("Index outside of bounds")
}
case 2:
switch row {
case 0: return m31
case 1: return m32
case 2: return m33
default: fatalError("Index outside of bounds")
}
default: fatalError("Index outside of bounds")
}
}

set {
switch col {
case 0:
switch row {
case 0: m11 = newValue
case 1: m12 = newValue
case 2: m13 = newValue
default: fatalError("Index outside of bounds")
}
case 1:
switch row {
case 0: m21 = newValue
case 1: m22 = newValue
case 2: m23 = newValue
default: fatalError("Index outside of bounds")
}
case 2:
switch row {
case 0: m31 = newValue
case 1: m32 = newValue
case 2: m33 = newValue
default: fatalError("Index outside of bounds")
}
default: fatalError("Index outside of bounds")
}
}
}

public var adjugate: Matrix3x3f {
return Matrix3x3f(
m22 * m33 - m23 * m32,
m13 * m32 - m12 * m33,
m12 * m23 - m13 * m22,
m23 * m31 - m21 * m33,
m11 * m33 - m13 * m31,
m13 * m21 - m11 * m23,
m21 * m32 - m22 * m31,
m12 * m31 - m11 * m32,
m11 * m22 - m12 * m21
)
}

public var determinant: Float {
return (m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32)
- (m13 * m22 * m31 + m11 * m23 * m32 + m12 * m21 * m33)
}

public var transpose: Matrix3x3f {
return Matrix3x3f(m11, m21, m31, m12, m22, m32, m13, m23, m33)
}

public var inverse: Matrix3x3f {
return adjugate * (1 / determinant)
}

public func interpolated(with m: Matrix3x3f, by t: Float) -> Matrix3x3f {
return Matrix3x3f(
m11 + (m.m11 - m11) * t,
m12 + (m.m12 - m12) * t,
m13 + (m.m13 - m13) * t,
m21 + (m.m21 - m21) * t,
m22 + (m.m22 - m22) * t,
m23 + (m.m23 - m23) * t,
m31 + (m.m31 - m31) * t,
m32 + (m.m32 - m32) * t,
m33 + (m.m33 - m33) * t
)
}

public static prefix func -(m: Matrix3x3f) -> Matrix3x3f {
return Matrix3x3f(
-m.m11, -m.m12, -m.m13,
-m.m21, -m.m22, -m.m23,
-m.m31, -m.m32, -m.m33
)
}

public static func *(lhs: Matrix3x3f, rhs: Matrix3x3f) -> Matrix3x3f {
return Matrix3x3f(
lhs.m11 * rhs.m11 + lhs.m21 * rhs.m12 + lhs.m31 * rhs.m13,
lhs.m12 * rhs.m11 + lhs.m22 * rhs.m12 + lhs.m32 * rhs.m13,
lhs.m13 * rhs.m11 + lhs.m23 * rhs.m12 + lhs.m33 * rhs.m13,
lhs.m11 * rhs.m21 + lhs.m21 * rhs.m22 + lhs.m31 * rhs.m23,
lhs.m12 * rhs.m21 + lhs.m22 * rhs.m22 + lhs.m32 * rhs.m23,
lhs.m13 * rhs.m21 + lhs.m23 * rhs.m22 + lhs.m33 * rhs.m23,
lhs.m11 * rhs.m31 + lhs.m21 * rhs.m32 + lhs.m31 * rhs.m33,
lhs.m12 * rhs.m31 + lhs.m22 * rhs.m32 + lhs.m32 * rhs.m33,
lhs.m13 * rhs.m31 + lhs.m23 * rhs.m32 + lhs.m33 * rhs.m33
)
}

public static func *(lhs: Matrix3x3f, rhs: Float) -> Matrix3x3f {
return Matrix3x3f(
lhs.m11 * rhs, lhs.m12 * rhs, lhs.m13 * rhs,
lhs.m21 * rhs, lhs.m22 * rhs, lhs.m23 * rhs,
lhs.m31 * rhs, lhs.m32 * rhs, lhs.m33 * rhs
)
}

}

extension Matrix3x3f: Equatable {
public static func ==(lhs: Matrix3x3f, rhs: Matrix3x3f) -> Bool {
if lhs.m11 != rhs.m11 { return false }
if lhs.m12 != rhs.m12 { return false }
if lhs.m13 != rhs.m13 { return false }
if lhs.m21 != rhs.m21 { return false }
if lhs.m22 != rhs.m22 { return false }
if lhs.m23 != rhs.m23 { return false }
if lhs.m31 != rhs.m31 { return false }
if lhs.m32 != rhs.m32 { return false }
if lhs.m33 != rhs.m33 { return false }
return true
}
}
#endif
119 changes: 71 additions & 48 deletions Sources/Matrix3x3+simd.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,83 @@
//

#if !NOSIMD
import simd
import simd

/// Represents a standard 4x4 transformation matrix.
/// - remark:
/// Matrices are stored in column-major order
public struct Matrix3x3f {
internal var d: float3x3

/// Represents a standard 4x4 transformation matrix.
/// - remark:
/// Matrices are stored in column-major order
public struct Matrix3x3f {
internal var d: float3x3

//MARK: - initializers

/// Creates an instance initialized to zero
@inline(__always)
public init() {
self.d = float3x3()
}

/// Creates an instance using the vector to initialize the diagonal elements
@inline(__always)
public init(diagonal v: Vector3f) {
self.d = float3x3(diagonal: v.d)
}

/// Creates an instance with the specified columns
///
/// - parameter c0: a vector representing column 0
/// - parameter c1: a vector representing column 1
/// - parameter c2: a vector representing column 2
@inline(__always)
public init(_ c0: Vector3f, _ c1: Vector3f, _ c2: Vector3f) {
self.d = float3x3(matrix_float3x3(columns: (c0.d, c1.d, c2.d)))
}

//MARK:- properties

public var inversed: Matrix3x3f {
return unsafeBitCast(d.inverse, to: Matrix3x3f.self)
//MARK: - initializers

/// Creates an instance initialized to zero
@inline(__always)
public init() {
self.d = float3x3()
}

/// Creates an instance using the vector to initialize the diagonal elements
@inline(__always)
public init(diagonal v: Vector3f) {
self.d = float3x3(diagonal: v.d)
}

/// Creates an instance with the specified columns
///
/// - parameter c0: a vector representing column 0
/// - parameter c1: a vector representing column 1
/// - parameter c2: a vector representing column 2
@inline(__always)
public init(_ c0: Vector3f, _ c1: Vector3f, _ c2: Vector3f) {
self.d = float3x3(matrix_float3x3(columns: (c0.d, c1.d, c2.d)))
}

//MARK:- properties

public var inversed: Matrix3x3f {
return unsafeBitCast(d.inverse, to: Matrix3x3f.self)
}

//MARK:- operators

@inline(__always)
public static prefix func -(lhs: Matrix3x3f) -> Matrix3x3f {
return unsafeBitCast(-lhs.d, to: Matrix3x3f.self)
}

@inline(__always)
public static func *(lhs: Matrix3x3f, rhs: Float) -> Matrix3x3f {
return unsafeBitCast(lhs.d * rhs, to: Matrix3x3f.self)
}

@inline(__always)
public static func *(lhs: Matrix3x3f, rhs: Matrix3x3f) -> Matrix3x3f {
return unsafeBitCast(lhs.d * rhs.d, to: Matrix3x3f.self)
}

// MARK: - subscript operations

/// Access the `col`th column vector
public subscript(col: Int) -> Vector3f {
get {
return unsafeBitCast(d[col], to: Vector3f.self)
}

//MARK:- operators

@inline(__always)
public static prefix func -(lhs: Matrix3x3f) -> Matrix3x3f {
return unsafeBitCast(-lhs.d, to: Matrix3x3f.self)
set {
d[col] = newValue.d
}

@inline(__always)
public static func *(lhs: Matrix3x3f, rhs: Float) -> Matrix3x3f {
return unsafeBitCast(lhs.d * rhs, to: Matrix3x3f.self)
}

/// Access the `col`th column vector and then `row`th element
public subscript(col: Int, row: Int) -> Float {
get {
return d[col, row]
}

@inline(__always)
public static func *(lhs: Matrix3x3f, rhs: Matrix3x3f) -> Matrix3x3f {
return unsafeBitCast(lhs.d * rhs.d, to: Matrix3x3f.self)
set {
d[col, row] = newValue
}
}
}
#endif
Loading

0 comments on commit a2cd211

Please sign in to comment.