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

Fix bug with perspective and add back nlerp.

Browse source
This commit is contained in:
treeform 2021-03-26 15:15:21 -07:00
parent 0f80873e58
commit a4662ebf0a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vmath.nim
View file

@ -777,8 +777,8 @@ proc frustum*[T](left, right, bottom, top, near, far: T): GMat4[T] =
proc perspective*[T](fovy, aspect, near, far: T): GMat4[T] =
let
top = near * tan(fovy * PI / 360.0)
right = top * aspect
top: T = near * tan(fovy * PI.float32 / 360.0)
right: T = top * aspect
frustum(-right, right, -top, top, near, far)
proc ortho*[T](left, right, bottom, top, near, far: T): GMat4[T] =
@ -980,6 +980,13 @@ proc fromTwoVectors*[T](a, b: GVec3[T]): GVec4[T] =
w = dot(u, half)
return [q.x, q.y, q.z, w]
proc nlerp*(a: Quat, b: Quat, v: float32): Quat =
if dot(a, b) < 0:
var c = a
(-c * (1.0 - v) + b * v).normalize()
else:
(a * (1.0 - v) + b * v).normalize()
proc quat*[T](m: GMat4[T]): GVec4[T] =
let
m00 = m[0, 0]

2
vmath.nimble
View file

@ -1,4 +1,4 @@
version = "1.0.0"
version = "1.0.1"
author = "treeform"
description = "Your single stop for vector math routines for 2d and 3d graphics."
license = "MIT"