jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated basic2d, basic3d modules

Browse source
This commit is contained in:
Araq 2014-08-28 01:27:36 +02:00
commit a6211058c5
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/pure/basic3d.nim
View file

@ -220,7 +220,7 @@ proc rotate*(angle:float,axis:TVector3d):TMatrix3d {.noInit.}=
var normax=axis
if not normax.tryNormalize: #simplifies matrix computation below a lot
raise newException(EDivByZero,"Cannot rotate around zero length axis")
raise newException(DivByZeroError,"Cannot rotate around zero length axis")
let
cs=cos(angle)
@ -251,7 +251,7 @@ proc rotate*(angle:float,org:TPoint3d,axis:TVector3d):TMatrix3d {.noInit.}=
var normax=axis
if not normax.tryNormalize: #simplifies matrix computation below a lot
raise newException(EDivByZero,"Cannot rotate around zero length axis")
raise newException(DivByZeroError,"Cannot rotate around zero length axis")
let
u=normax.x
@ -348,7 +348,7 @@ proc mirror*(planeperp:TVector3d):TMatrix3d {.noInit.}=
# https://en.wikipedia.org/wiki/Transformation_matrix
var n=planeperp
if not n.tryNormalize:
raise newException(EDivByZero,"Cannot mirror over a plane with a zero length normal")
raise newException(DivByZeroError,"Cannot mirror over a plane with a zero length normal")
let
a=n.x
@ -375,7 +375,7 @@ proc mirror*(org:TPoint3d,planeperp:TVector3d):TMatrix3d {.noInit.}=
# With some fiddling this becomes reasonably simple:
var n=planeperp
if not n.tryNormalize:
raise newException(EDivByZero,"Cannot mirror over a plane with a zero length normal")
raise newException(DivByZeroError,"Cannot mirror over a plane with a zero length normal")
let
a=n.x
@ -448,7 +448,7 @@ proc inverse*(m:TMatrix3d):TMatrix3d {.noInit.}=
O19=m.bx*m.cy-m.by*m.cx
if det==0.0:
raise newException(EDivByZero,"Cannot normalize zero length vector")
raise newException(DivByZeroError,"Cannot normalize zero length vector")
result.setElements(
(m.bw*O4+m.by*O3-m.bz*O2)/det , (-m.aw*O4-m.ay*O3+m.az*O2)/det,
@ -537,7 +537,7 @@ proc apply*(m:TMatrix3d, x,y,z:var float, translate=false)=
# ***************************************
# TVector3d implementation
# ***************************************
proc Vector3d*(x,y,z:float):TVector3d=
proc vector3d*(x,y,z:float):TVector3d=
result.x=x
result.y=y
result.z=z
@ -559,7 +559,7 @@ proc `len=`*(v:var TVector3d,newlen:float) {.noInit.} =
v.z=0.0
return
if fac==inf or fac==neginf:
if fac==Inf or fac==NegInf:
#to short for float accuracy
#do as good as possible:
v.x=newlen
@ -670,7 +670,7 @@ proc normalize*(v:var TVector3d) {.inline.}=
## Modifies `v` to have a length of 1.0, keeping its angle.
## If `v` has zero length, an EDivByZero will be raised.
if not tryNormalize(v):
raise newException(EDivByZero,"Cannot normalize zero length vector")
raise newException(DivByZeroError,"Cannot normalize zero length vector")
proc rotate*(vec:var TVector3d,angle:float,axis:TVector3d)=
## Rotates `vec` in place, with `angle` radians over `axis`, which passes
@ -681,7 +681,7 @@ proc rotate*(vec:var TVector3d,angle:float,axis:TVector3d)=
var normax=axis
if not normax.tryNormalize:
raise newException(EDivByZero,"Cannot rotate around zero length axis")
raise newException(DivByZeroError,"Cannot rotate around zero length axis")
let
cs=cos(angle)
@ -842,9 +842,9 @@ proc bisect*(v1,v2:TVector3d):TVector3d {.noInit.}=
# there are actually inifinitely many bisectors, we select just
# one of them.
result=v1.cross(XAXIS)
if result.sqrlen<1.0e-9:
if result.sqrLen<1.0e-9:
result=v1.cross(YAXIS)
if result.sqrlen<1.0e-9:
if result.sqrLen<1.0e-9:
result=v1.cross(ZAXIS) # now we should be guaranteed to have succeeded
result.normalize
@ -853,7 +853,7 @@ proc bisect*(v1,v2:TVector3d):TVector3d {.noInit.}=
# ***************************************
# TPoint3d implementation
# ***************************************
proc Point3d*(x,y,z:float):TPoint3d=
proc point3d*(x,y,z:float):TPoint3d=
result.x=x
result.y=y
result.z=z