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.39 by greg, Tue Nov 13 19:58:33 2018 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 41 | Line 46 | typedef struct ray {
46          RREAL   rod;            /* -DOT(rdir, ron) */
47          RREAL   uv[2];          /* local coordinates */
48          FVECT   pert;           /* surface normal perturbation */
49 <        RREAL   rt;             /* returned effective ray length */
49 >        RREAL   rmt;            /* returned mirrored ray length */
50 >        RREAL   rxt;            /* returned unmirrored ray length */
51          const struct ray  *parent;      /* ray this originated from */
52          OBJECT  *clipset;       /* set of objects currently clipped */
53          OBJECT  *newcset;       /* next clipset, used for transmission */
# Line 50 | Line 56 | typedef struct ray {
56          OBJREC  *ro;            /* intersected object (one with material) */
57          FULLXF  *rox;           /* object transformation */
58          int     *slights;       /* list of lights to test for scattering */
59 <        unsigned long  rno;     /* unique ray number */
59 >        RNUMBER rno;            /* unique ray number */
60          int     rlvl;           /* number of reflections for this ray */
61          int     rsrc;           /* source we're aiming for */
62          float   rweight;        /* cumulative weight (for termination) */
63          COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
64          COLOR   pcol;           /* pattern color */
65 +        COLOR   mcol;           /* mirrored color contribution */
66          COLOR   rcol;           /* returned radiance value */
67          COLOR   cext;           /* medium extinction coefficient */
68          COLOR   albedo;         /* medium scattering albedo */
# Line 67 | Line 74 | typedef struct ray {
74  
75   #define  rayvalue(r)    (*(r)->revf)(r)
76  
77 + #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
78 +                                (r)->rmt : (r)->rxt)
79 +
80   extern char  VersionID[];       /* Radiance version ID string */
81  
82   extern CUBE     thescene;       /* our scene */
83   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
84  
85 < extern unsigned long    raynum; /* next ray ID */
86 < extern unsigned long    nrays;  /* total rays traced so far */
85 > extern RNUMBER  raynum;         /* next ray ID */
86 > extern RNUMBER  nrays;          /* total rays traced so far */
87  
88   extern OBJREC  Lamb;            /* a Lambertian surface */
89   extern OBJREC  Aftplane;        /* aft clipping object */
# Line 160 | Line 170 | typedef struct {               /* rendering parameter holder */
170          int     ambincl;
171          short   amblndx[AMBLLEN+1];
172          char    amblval[AMBLLEN*AMBWORD];
173 +        
174 +        /* PMAP: photon mapping parameters */
175 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
176   } RAYPARAMS;
177  
178   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 191 | Line 204 | extern void    ray_restore(RAYPARAMS *rp);
204   extern void     ray_defaults(RAYPARAMS *rp);
205                                          /* defined in raypcalls.c */
206   extern void     ray_pinit(char *otnm, int nproc);
207 < extern void     ray_psend(RAY *r);
207 > extern int      ray_psend(RAY *r);
208   extern int      ray_pqueue(RAY *r);
209   extern int      ray_presult(RAY *r, int poll);
210   extern void     ray_pdone(int freall);
211   extern void     ray_popen(int nadd);
212   extern void     ray_pclose(int nsub);
213 +                                        /* defined in ray_fifo.c */
214 + extern int      (*ray_fifo_out)(RAY *r);
215 + extern int      ray_fifo_in(RAY *r);
216 + extern int      ray_fifo_flush(void);
217                                          /* defined in raytrace.c */
218   extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
219   extern void     rayclear(RAY *r);
# Line 208 | Line 225 | extern int     rayshade(RAY *r, int mod);
225   extern void     rayparticipate(RAY *r);
226   extern void     raytexture(RAY *r, OBJECT mod);
227   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
228 < extern void     raycontrib(double rc[3], const RAY *r, int flags);
228 > extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
229   extern double   raydist(const RAY *r, int flags);
230   extern double   raynormal(FVECT norm, RAY *r);
231   extern void     newrayxf(RAY *r);
# Line 224 | Line 241 | extern void init_drawsources(int rad);
241                                          /* defined in rt/initotypes.c */
242   extern void initotypes(void);
243                                          /* module main procedures */
244 < extern void     rtrace(char *fname);
245 < extern char * formstr(int  f);
244 > extern void     rtrace(char *fname, int nproc);
245 > extern char     *formstr(int  f);
246   extern void     rview(void);
247   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
248  
249 + #ifdef __FAST_MATH__
250 + #define checknorm(vn)   (void)normalize(vn)
251 + #else
252 + #define checknorm(vn)
253 + #endif
254  
255   #ifdef __cplusplus
256   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines