kylefang/PerspectiveTransform
1
0
Fork 0
mirror of https://github.com/zhigang1992/PerspectiveTransform.git synced 2026-01-12 22:49:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor matrix extensions

Browse Source 
to extract static constants
This commit is contained in:
Paul Zabelin
2018-02-26 21:33:29 -08:00
parent a62777c831
commit 2a72fc90fa
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Pod/Classes/Matrix3x3+3D.swift
View File

@@ -21,7 +21,7 @@ extension ScalarType {
}
extension Matrix4x3Type {
static let insertColumnBeforeLast : Matrix4x3Type = {
static let zeroColumnBeforeLast : Matrix4x3Type = {
let identity = Matrix3x3Type(diagonal: Vector3Type.one)
var columns = Vector3Type.indexArray.map{identity[$0]}
columns.insert(Vector3Type.zero, at: Vector3Type.lastIndex)
@@ -30,16 +30,24 @@ extension Matrix4x3Type {
}
extension Matrix3x4Type {
static let insertRowBeforeLast : Matrix3x4Type = {
return Matrix4x3Type.insertColumnBeforeLast.transpose
static let zeroRowBeforeLast : Matrix3x4Type = {
return Matrix4x3Type.zeroColumnBeforeLast.transpose
}()
func insertColumnBeforeLast() -> Matrix4x4Type {
return self * Matrix4x3Type.zeroColumnBeforeLast
}
}
extension Matrix3x3Type {
func insertRowBeforeLast() -> Matrix3x4Type {
return Matrix3x4Type.zeroRowBeforeLast * self
}
func to3d() -> Matrix4x4Type {
var stretch = Matrix3x4Type.insertRowBeforeLast * self * Matrix4x3Type.insertColumnBeforeLast
stretch[Vector3Type.lastIndex, Vector3Type.lastIndex] = ScalarType.one
return stretch
var m4x4 = insertRowBeforeLast().insertColumnBeforeLast()
m4x4[Vector3Type.lastIndex, Vector3Type.lastIndex] = ScalarType.one
return m4x4
}
func zNormalized() -> Matrix3x3Type {