Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/vmath.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1573,8 +1573,12 @@ proc angle*[T](a: GVec2[T]): T =
## Angle of a Vec2.
arctan2(a.y, a.x)

proc angle*[T; S: GVec2[T]|GVec3[T]](a, b: S): T =
## Angle between 2 Vec2 or Vec3.
proc angle*[T; S: GVec2[T]](a, b: S): T =
## Angle between 2 Vec2.
arctan2(a.y*b.x - a.x*b.y, a.x*b.x + a.y*b.y)

proc angle*[T; S: GVec3[T]](a, b: S): T =
## Angle between 2 Vec3.
var dot = dot(a, b)
dot = dot / (a.length * b.length)
# The cases of angle((1, 1), (-1, -1)) and its 3d counterpart
Expand Down
6 changes: 3 additions & 3 deletions tests/test.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1160,12 +1160,12 @@ block:
template gen2DTestsFor(constructor: untyped): void =
doAssert angle(constructor(1, 0), constructor(1, 0)) ~= 0
doAssert angle(constructor(1, 1), constructor(-1, -1)) ~= Pi
doAssert angle(constructor(1, 0), constructor(0, 1)) ~= Pi/2
doAssert angle(constructor(1, 0), constructor(-1, 0)) ~= Pi
doAssert angle(constructor(1, 0), constructor(0, 1)) ~= -Pi/2
doAssert angle(constructor(1, 0), constructor(-1, 0)) ~= -Pi
doAssert angle(constructor(1, 1), constructor(1, -1)) ~= Pi/2

# Edge cases:
doAssert angle(constructor(0, 0), constructor(1, 0)).isNaN()
doAssert angle(constructor(0, 0), constructor(1, 0)) ~= 0

gen2DTestsFor vec2
gen2DTestsFor dvec2
Expand Down