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

Comparing ray/src/rt/ray.h (file contents):
Revision 2.34 by greg, Sun Sep 26 15:51:15 2010 UTC vs.
Revision 2.38 by greg, Tue Feb 24 19:39:27 2015 UTC

# Line 9 | Line 9
9   #include  "octree.h"
10   #include  "object.h"
11   #include  "color.h"
12 + #include  "pmapparm.h"
13  
14   #ifdef __cplusplus
15   extern "C" {
# Line 76 | Line 77 | extern char  VersionID[];      /* Radiance version ID strin
77   extern CUBE     thescene;       /* our scene */
78   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
79  
80 < extern unsigned long    raynum; /* next ray ID */
81 < extern unsigned long    nrays;  /* total rays traced so far */
80 > extern RNUMBER  raynum;         /* next ray ID */
81 > extern RNUMBER  nrays;          /* total rays traced so far */
82  
83   extern OBJREC  Lamb;            /* a Lambertian surface */
84   extern OBJREC  Aftplane;        /* aft clipping object */
# Line 164 | Line 165 | typedef struct {               /* rendering parameter holder */
165          int     ambincl;
166          short   amblndx[AMBLLEN+1];
167          char    amblval[AMBLLEN*AMBWORD];
168 +        
169 +        /* PMAP: photon mapping parameters */
170 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
171   } RAYPARAMS;
172  
173   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 216 | Line 220 | extern int     rayshade(RAY *r, int mod);
220   extern void     rayparticipate(RAY *r);
221   extern void     raytexture(RAY *r, OBJECT mod);
222   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
223 < extern void     raycontrib(double rc[3], const RAY *r, int flags);
223 > extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
224   extern double   raydist(const RAY *r, int flags);
225   extern double   raynormal(FVECT norm, RAY *r);
226   extern void     newrayxf(RAY *r);
# Line 238 | Line 242 | extern void    rview(void);
242   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
243  
244   #ifdef __FAST_MATH__
245 < #define checknorm(vn)   normalize(vn)
245 > #define checknorm(vn)   (void)normalize(vn)
246   #else
247 < #define checknorm(vn)   1.0
247 > #define checknorm(vn)
248   #endif
249  
250   #ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines