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

fix

Browse source
This commit is contained in:
Ryan Oldenburg 2020-11-29 22:10:43 -06:00
parent 1a5fbe202a
commit 35c99e641f
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/vmath.nim
View file

@ -152,7 +152,7 @@ proc inRect*(v: Vec2, a: Vec2, b: Vec2): bool {.inline.} =
v.x > min.x and v.x < max.x and v.y > min.y and v.y < max.y v.x > min.x and v.x < max.x and v.y > min.y and v.y < max.y
proc `[]`*(a: Vec2, i: int): float32 = proc `[]`*(a: Vec2, i: int): float32 =
if i > 1: if i < 0 or i > 1:
raise newException(IndexDefect, "Vec2 index out of bounds") raise newException(IndexDefect, "Vec2 index out of bounds")
if i == 0: if i == 0:
a.x a.x
@ -160,7 +160,7 @@ proc `[]`*(a: Vec2, i: int): float32 =
a.y a.y
proc `[]=`*(a: var Vec2, i: int, b: float32) = proc `[]=`*(a: var Vec2, i: int, b: float32) =
if i > 1: if i < 0 or i > 1:
raise newException(IndexDefect, "Vec2 index out of bounds") raise newException(IndexDefect, "Vec2 index out of bounds")
if i == 0: if i == 0:
a.x = b a.x = b
@ -329,7 +329,7 @@ proc angleBetween*(a, b: Vec3): float32 =
arccos(dot) arccos(dot)
proc `[]`*(a: Vec3, i: int): float32 = proc `[]`*(a: Vec3, i: int): float32 =
if i > 2: if i < 0 or i > 2:
raise newException(IndexDefect, "Vec3 index out of bounds") raise newException(IndexDefect, "Vec3 index out of bounds")
if i == 0: if i == 0:
a.x a.x
@ -339,7 +339,7 @@ proc `[]`*(a: Vec3, i: int): float32 =
a.z a.z
proc `[]=`*(a: var Vec3, i: int, b: float32) = proc `[]=`*(a: var Vec3, i: int, b: float32) =
if i > 2: if i < 0 or i > 2:
raise newException(IndexDefect, "Vec3 index out of bounds") raise newException(IndexDefect, "Vec3 index out of bounds")
if i == 0: if i == 0:
a.x = b a.x = b
@ -479,7 +479,7 @@ proc hash*(a: Vec4): Hash {.inline.} =
hash((a.x, a.y, a.z, a.w)) hash((a.x, a.y, a.z, a.w))
proc `[]`*(a: Vec4, i: int): float32 = proc `[]`*(a: Vec4, i: int): float32 =
if i > 3: if i < 0 or i > 3:
raise newException(IndexDefect, "Vec4 index out of bounds") raise newException(IndexDefect, "Vec4 index out of bounds")
if i == 0: if i == 0:
a.x a.x
@ -491,7 +491,7 @@ proc `[]`*(a: Vec4, i: int): float32 =
a.w a.w
proc `[]=`*(a: var Vec4, i: int, b: float32) = proc `[]=`*(a: var Vec4, i: int, b: float32) =
if i > 3: if i < 0 or i > 3:
raise newException(IndexDefect, "Vec4 index out of bounds") raise newException(IndexDefect, "Vec4 index out of bounds")
if i == 0: if i == 0:
a.x = b a.x = b
@ -520,6 +520,23 @@ proc vec4*(a: Vec3, w = 0.0): Vec4 {.inline.} =
proc vec4*(a: Vec2, z = 0.0, w = 0.0): Vec4 {.inline.} = proc vec4*(a: Vec2, z = 0.0, w = 0.0): Vec4 {.inline.} =
vec4(a.x, a.y, z, w) vec4(a.x, a.y, z, w)
type Mat3* = array[9, float32] ## 3x3 Matrix type Mat3* = array[9, float32] ## 3x3 Matrix
template `[]`*(a: Mat3, i, j: int): float32 = a[i * 3 + j] template `[]`*(a: Mat3, i, j: int): float32 = a[i * 3 + j]
@ -550,7 +567,7 @@ proc identity*(a: var Mat3) =
a[7] = 0 a[7] = 0
a[8] = 1 a[8] = 1
proc mat3*(): Mat3 = proc mat3*(): Mat3 {.inline.} =
result.identity() result.identity()
proc transpose*(a: Mat3): Mat3 = proc transpose*(a: Mat3): Mat3 =