eryn/three-dee
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Math] Remove some dead code

Browse source
This commit is contained in:
Eryn Wells 2015-11-01 07:31:11 -08:00
parent c6203f1af8
commit bf9a4ba138
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Math/Math/Matrix.swift
View file

@ -181,6 +181,32 @@ public func /<T: Matrix>(lhs: T, rhs: Float) -> T {
return out return out
} }
// MARK: Matrix addition
public func +=<T: Matrix>(inout lhs: T, rhs: T) {
for i in 0..<T.dimension {
lhs[i] += rhs[i]
}
}
public func +<T: Matrix>(lhs: T, rhs: T) -> T {
var out = lhs
out += rhs
return out
}
public func -=<T: Matrix>(inout lhs: T, rhs: T) {
for i in 0..<T.dimension {
lhs[i] -= rhs[i]
}
}
public func -<T: Matrix>(lhs: T, rhs: T) -> T {
var out = lhs
out -= rhs
return out
}
// MARK: Matrix-Matrix multiplication // MARK: Matrix-Matrix multiplication
public func *=<T: Matrix>(inout lhs: T, rhs: T) { public func *=<T: Matrix>(inout lhs: T, rhs: T) {
@ -220,18 +246,4 @@ public func *(lhs: Matrix3, rhs: Vector3) -> Vector3 {
} }
} }
return out return out
} }
//func *<T: FloatingPointType>(matrix: Matrix4<T>, scalar: T) -> Matrix4<T> {
// var out: Matrix4<T>
// for i in 0..<out.data.count {
// out[i] = matrix.data[i] * scalar
// }
// return out
//}
// MARK: - Matrix-Vector Multiplication
//func *<T: FloatingPointType>(matrix: Matrix4<T>, vector: Vector4<T>) -> Vector4<T> {
// return Vector4<T>()
//}