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

Merge pull request from guzba/master

Browse source 
fix
This commit is contained in:
treeform 2020-11-30 11:25:19 -08:00 committed by GitHub
commit 404cace019
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions

4
README.md
View file

@ -1361,11 +1361,11 @@ proc mat3(q: Quat): Mat3
proc mat4(q: Quat): Mat4 proc mat4(q: Quat): Mat4
``` ```
## **proc** recifuncalSqrt ## **proc** reciprocalSqrt
```nim ```nim
proc recifuncalSqrt(x: float32): float32 {.inline.} proc reciprocalSqrt(x: float32): float32 {.inline.}
``` ```
## **proc** quat ## **proc** quat

14
src/vmath.nim
View file

@ -661,7 +661,7 @@ proc transpose*(a: Mat4): Mat4 {.inline.} =
] ]
proc determinant*(a: Mat4): float32 = proc determinant*(a: Mat4): float32 =
var let
a00 = a[0] a00 = a[0]
a01 = a[1] a01 = a[1]
a02 = a[2] a02 = a[2]
@ -689,7 +689,7 @@ proc determinant*(a: Mat4): float32 =
) )
proc inverse*(a: Mat4): Mat4 = proc inverse*(a: Mat4): Mat4 =
var let
a00 = a[0] a00 = a[0]
a01 = a[1] a01 = a[1]
a02 = a[2] a02 = a[2]
@ -707,7 +707,7 @@ proc inverse*(a: Mat4): Mat4 =
a32 = a[14] a32 = a[14]
a33 = a[15] a33 = a[15]
var let
b00 = a00 * a11 - a01 * a10 b00 = a00 * a11 - a01 * a10
b01 = a00 * a12 - a02 * a10 b01 = a00 * a12 - a02 * a10
b02 = a00 * a13 - a03 * a10 b02 = a00 * a13 - a03 * a10
@ -722,7 +722,7 @@ proc inverse*(a: Mat4): Mat4 =
b11 = a22 * a33 - a23 * a32 b11 = a22 * a33 - a23 * a32
# Calculate the inverse determinant. # Calculate the inverse determinant.
var invDet = 1.0/(b00*b11 - b01*b10 + b02*b09 + b03*b08 - b04*b07 + b05*b06) let invDet = 1.0/(b00*b11 - b01*b10 + b02*b09 + b03*b08 - b04*b07 + b05*b06)
result[00] = (+a11 * b11 - a12 * b10 + a13 * b09) * invDet result[00] = (+a11 * b11 - a12 * b10 + a13 * b09) * invDet
result[01] = (-a01 * b11 + a02 * b10 - a03 * b09) * invDet result[01] = (-a01 * b11 + a02 * b10 - a03 * b09) * invDet
@ -742,7 +742,7 @@ proc inverse*(a: Mat4): Mat4 =
result[15] = (+a20 * b03 - a21 * b01 + a22 * b00) * invDet result[15] = (+a20 * b03 - a21 * b01 + a22 * b00) * invDet
proc `*`*(a, b: Mat4): Mat4 = proc `*`*(a, b: Mat4): Mat4 =
var let
a00 = a[0] a00 = a[0]
a01 = a[1] a01 = a[1]
a02 = a[2] a02 = a[2]
@ -760,7 +760,7 @@ proc `*`*(a, b: Mat4): Mat4 =
a32 = a[14] a32 = a[14]
a33 = a[15] a33 = a[15]
var let
b00 = b[0] b00 = b[0]
b01 = b[1] b01 = b[1]
b02 = b[2] b02 = b[2]
@ -1308,7 +1308,7 @@ proc mat4*(q: Quat): Mat4 =
result[14] = 0 result[14] = 0
result[15] = 1.0 result[15] = 1.0
proc recifuncalSqrt*(x: float32): float32 {.inline.} = proc reciprocalSqrt*(x: float32): float32 {.inline.} =
1.0 / sqrt(x) 1.0 / sqrt(x)
proc quat*(m: Mat4): Quat = proc quat*(m: Mat4): Quat =

2
vmath.nimble
View file

@ -5,4 +5,4 @@ license = "MIT"
srcDir = "src" srcDir = "src"
requires "nim >= 0.19.1" requires "nim >= 1.4.0"