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.8 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.13 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 2 | Line 2
2   /*
3   * Declarations for floating-point vector operations.
4   */
5 + #ifndef _RAD_FVECT_H_
6 + #define _RAD_FVECT_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 #include "copyright.h"
7
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 33 | 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  
36 #ifdef NOPROTO
39  
40 < extern double  fdot(), dist2(), dist2lseg(), dist2line(), normalize();
41 < extern void  fcross(), fvsum(), spinvector();
42 <
43 < #else
44 <
45 < 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);
40 > extern double   fdot(const FVECT v1, const FVECT v2);
41 > extern double   dist2(const FVECT v1, const FVECT v2);
42 > extern double   dist2line(const FVECT p, const FVECT ep1, const FVECT ep2);
43 > extern double   dist2lseg(const FVECT p, const FVECT ep1, const FVECT ep2);
44 > extern void     fcross(FVECT vres, const FVECT v1, const FVECT v2);
45 > extern void     fvsum(FVECT vres, const FVECT v0, const FVECT v1, double f);
46   extern double   normalize(FVECT v);
47 < extern void     spinvector(FVECT vres, FVECT vorig, FVECT vnorm, double theta);
47 > extern int      closestapproach(RREAL t[2],
48 >                        const FVECT rorg0, const FVECT rdir0,
49 >                        const FVECT rorg1, const FVECT rdir1);
50 > extern void     spinvector(FVECT vres, const FVECT vorig,
51 >                        const FVECT vnorm, double theta);
52  
53 +
54 + #ifdef __cplusplus
55 + }
56   #endif
57 + #endif /* _RAD_FVECT_H_ */
58 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines