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.29 by greg, Fri Sep 23 19:04:53 2005 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" {
16   #endif
17  
18 + #ifndef RNUMBER
19 + #define RNUMBER         unsigned long   /* ray counter (>= sizeof pointer) */
20 + #endif
21 +
22   #define  MAXDIM         32      /* maximum number of dimensions */
23  
24                                  /* ray type flags */
# Line 50 | Line 55 | typedef struct ray {
55          OBJREC  *ro;            /* intersected object (one with material) */
56          FULLXF  *rox;           /* object transformation */
57          int     *slights;       /* list of lights to test for scattering */
58 <        unsigned long  rno;     /* unique ray number */
58 >        RNUMBER rno;            /* unique ray number */
59          int     rlvl;           /* number of reflections for this ray */
60          int     rsrc;           /* source we're aiming for */
61          float   rweight;        /* cumulative weight (for termination) */
# Line 72 | 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 160 | 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 191 | Line 199 | extern void    ray_restore(RAYPARAMS *rp);
199   extern void     ray_defaults(RAYPARAMS *rp);
200                                          /* defined in raypcalls.c */
201   extern void     ray_pinit(char *otnm, int nproc);
202 < extern void     ray_psend(RAY *r);
202 > extern int      ray_psend(RAY *r);
203   extern int      ray_pqueue(RAY *r);
204   extern int      ray_presult(RAY *r, int poll);
205   extern void     ray_pdone(int freall);
206   extern void     ray_popen(int nadd);
207   extern void     ray_pclose(int nsub);
208 +                                        /* defined in ray_fifo.c */
209 + extern int      (*ray_fifo_out)(RAY *r);
210 + extern int      ray_fifo_in(RAY *r);
211 + extern int      ray_fifo_flush(void);
212                                          /* defined in raytrace.c */
213   extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
214   extern void     rayclear(RAY *r);
# Line 208 | 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 224 | Line 236 | extern void init_drawsources(int rad);
236                                          /* defined in rt/initotypes.c */
237   extern void initotypes(void);
238                                          /* module main procedures */
239 < extern void     rtrace(char *fname);
240 < extern char * formstr(int  f);
239 > extern void     rtrace(char *fname, int nproc);
240 > extern char     *formstr(int  f);
241   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)   (void)normalize(vn)
246 + #else
247 + #define checknorm(vn)
248 + #endif
249  
250   #ifdef __cplusplus
251   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines