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.11 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.16 by greg, Fri Apr 11 20:27:23 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines