MyouProject/vmath
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6 from guzba/master

Browse source 
Cap like other things seem to
This commit is contained in:
treeform 2020-03-16 17:52:31 -07:00 committed by GitHub
commit f0b87ab1a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vmath.nim
View file

@ -616,13 +616,13 @@ proc `*`*(a: Mat3, b: Vec2): Vec2 =
type Mat4* = array[16, float32] ## 4x4 Matrix - OpenGL row order type Mat4* = array[16, float32] ## 4x4 Matrix - OpenGL row order
proc mat4*(v0, v1, Vec2, Vec3, Vec4, v5, v6, v7, v8, v9, v10, v11, v12, v13, proc mat4*(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
v14, v15: float32): Mat4 = v14, v15: float32): Mat4 =
result[0] = v0 result[0] = v0
result[1] = v1 result[1] = v1
result[2] = Vec2 result[2] = v2
result[3] = Vec3 result[3] = v3
result[4] = Vec4 result[4] = v4
result[5] = v5 result[5] = v5
result[6] = v6 result[6] = v6
result[7] = v7 result[7] = v7
@ -1072,7 +1072,7 @@ proc lookAt*(eye, center, up: Vec3): Mat4 =
result[14] = -(z0*eyex + z1*eyey + z2*eyez) result[14] = -(z0*eyex + z1*eyey + z2*eyez)
result[15] = 1 result[15] = 1
proc tofloat32*(m: Mat4): array[16, float32] = proc toFloat32*(m: Mat4): array[16, float32] =
return [ return [
float32 m[00], float32 m[01], float32 m[02], float32 m[03], float32 m[00], float32 m[01], float32 m[02], float32 m[03],
float32 m[04], float32 m[05], float32 m[06], float32 m[07], float32 m[04], float32 m[05], float32 m[06], float32 m[07],