ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/fvect.h
(Generate patch)

Comparing ray/src/common/fvect.h (file contents):
Revision 2.9 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.15 by greg, Sat Jun 29 21:03:44 2013 UTC

# Line 8 | Line 8
8   extern "C" {
9   #endif
10  
11 #include "copyright.h"
12
11   #ifdef  SMLFLT
12 < #define  FLOAT          float
12 > #define  RREAL          float
13   #define  FTINY          (1e-3)
14   #else
15 < #define  FLOAT          double
15 > #define  RREAL          double
16   #define  FTINY          (1e-6)
17   #endif
18   #define  FHUGE          (1e10)
19  
20 < typedef FLOAT  FVECT[3];
20 > typedef RREAL  FVECT[3];
21  
22   #define  VCOPY(v1,v2)   ((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
23   #define  DOT(v1,v2)     ((v1)[0]*(v2)[0]+(v1)[1]*(v2)[1]+(v1)[2]*(v2)[2])
# Line 38 | Line 36 | typedef FLOAT  FVECT[3];
36                          (vr)[1]=(v1)[2]*(v2)[0]-(v1)[0]*(v2)[2], \
37                          (vr)[2]=(v1)[0]*(v2)[1]-(v1)[1]*(v2)[0])
38  
39 + #define GEOD_RAD        0       /* geodesic distance specified in radians */
40 + #define GEOD_ABS        1       /* absolute geodesic distance */
41 + #define GEOD_REL        2       /* relative geodesic distance */
42  
43 < extern double   fdot(FVECT v1, FVECT v2);
44 < extern double   dist2(FVECT v1, FVECT v2);
45 < extern double   dist2line(FVECT p, FVECT ep1, FVECT ep2);
46 < extern double   dist2lseg(FVECT p, FVECT ep1, FVECT ep2);
47 < extern void     fcross(FVECT vres, FVECT v1, FVECT v2);
48 < extern void     fvsum(FVECT vres, FVECT v0, FVECT v1, double f);
43 > extern double   Acos(double x);
44 > extern double   Asin(double x);
45 > extern double   fdot(const FVECT v1, const FVECT v2);
46 > extern double   dist2(const FVECT v1, const FVECT v2);
47 > extern double   dist2line(const FVECT p, const FVECT ep1, const FVECT ep2);
48 > extern double   dist2lseg(const FVECT p, const FVECT ep1, const FVECT ep2);
49 > extern void     fcross(FVECT vres, const FVECT v1, const FVECT v2);
50 > extern void     fvsum(FVECT vres, const FVECT v0, const FVECT v1, double f);
51   extern double   normalize(FVECT v);
52 < extern void     spinvector(FVECT vres, FVECT vorig, FVECT vnorm, double theta);
53 <
54 <
52 > extern int      closestapproach(RREAL t[2],
53 >                        const FVECT rorg0, const FVECT rdir0,
54 >                        const FVECT rorg1, const FVECT rdir1);
55 > extern void     spinvector(FVECT vres, const FVECT vorig,
56 >                        const FVECT vnorm, double theta);
57 > extern double   geodesic(FVECT vres, const FVECT vorig,
58 >                        const FVECT vtarg, double t, int meas);
59   #ifdef __cplusplus
60   }
61   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines