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.48 by greg, Tue Nov 22 02:28:03 2022 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) */
19 > #define RNUMBER         size_t          /* ray counter (>= sizeof pointer) */
20   #endif
21  
22   #define  MAXDIM         32      /* maximum number of dimensions */
# Line 45 | 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 55 | Line 57 | typedef struct ray {
57          FULLXF  *rox;           /* object transformation */
58          int     *slights;       /* list of lights to test for scattering */
59          RNUMBER rno;            /* unique ray number */
60 <        int     rlvl;           /* number of reflections for this ray */
60 >        OBJECT  robj;           /* intersected object number */
61          int     rsrc;           /* source we're aiming for */
62          float   rweight;        /* cumulative weight (for termination) */
63 +        float   gecc;           /* scattering eccentricity coefficient */
64          COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
65          COLOR   pcol;           /* pattern color */
66 +        COLOR   mcol;           /* mirrored color contribution */
67          COLOR   rcol;           /* returned radiance value */
68          COLOR   cext;           /* medium extinction coefficient */
69          COLOR   albedo;         /* medium scattering albedo */
70 <        float   gecc;           /* scattering eccentricity coefficient */
71 <        OBJECT  robj;           /* intersected object number */
70 >        short   rflips;         /* surface orientation has been reversed */
71 >        short   rlvl;           /* number of reflections for this ray */
72          short   rtype;          /* ray type */
73          short   crtype;         /* cumulative ray type */
74   }  RAY;
75  
76   #define  rayvalue(r)    (*(r)->revf)(r)
77  
78 < extern char  VersionID[];       /* Radiance version ID string */
78 > #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
79 >                                (r)->rmt : (r)->rxt)
80  
81 + #define  rayreorient(r) if ((r)->rflips & 1) flipsurface(r); else
82 +
83 + extern char     VersionID[];    /* Radiance version ID string */
84 + extern char     RFeatureList[]; /* newline-separated feature list */
85 +
86   extern CUBE     thescene;       /* our scene */
87   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
88  
89 < extern unsigned long    raynum; /* next ray ID */
90 < extern unsigned long    nrays;  /* total rays traced so far */
89 > extern RNUMBER  raynum;         /* next ray ID */
90 > extern RNUMBER  nrays;          /* total rays traced so far */
91  
92   extern OBJREC  Lamb;            /* a Lambertian surface */
93   extern OBJREC  Aftplane;        /* aft clipping object */
# Line 88 | Line 98 | extern int     dimlist[];      /* dimension list for distributi
98   extern int      ndims;          /* number of dimensions so far */
99   extern int      samplendx;      /* index for this sample */
100  
91 extern int      ray_savesiz;    /* size of parameter save buffer */
92
101   extern int      do_irrad;       /* compute irradiance? */
102  
103   extern int      rand_samp;      /* pure Monte Carlo sampling? */
# Line 164 | Line 172 | typedef struct {               /* rendering parameter holder */
172          int     ambincl;
173          short   amblndx[AMBLLEN+1];
174          char    amblval[AMBLLEN*AMBWORD];
175 +        
176 +        /* PMAP: photon mapping parameters */
177 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
178   } RAYPARAMS;
179  
180   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 174 | Line 185 | extern void    headclean(void);
185   extern void     openheader(void);
186   extern void     dupheader(void);
187                                          /* defined in persist.c */
188 < extern void persistfile(char *pfn);
188 > extern void     persistfile(char *pfn);
189   extern void     pfdetach(void);
190   extern void     pfclean(void);
191   extern void     pflock(int lf);
# Line 209 | Line 220 | extern int     ray_fifo_flush(void);
220   extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
221   extern void     rayclear(RAY *r);
222   extern void     raytrace(RAY *r);
223 + extern int      rayreject(OBJREC *o, RAY *r, double t);
224   extern void     rayhit(OBJECT *oset, RAY *r);
225   extern void     raycont(RAY *r);
226   extern void     raytrans(RAY *r);
227 + extern int      raytirrad(OBJREC *m, RAY *r);
228   extern int      rayshade(RAY *r, int mod);
229   extern void     rayparticipate(RAY *r);
230   extern void     raytexture(RAY *r, OBJECT mod);
231   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
232 < extern void     raycontrib(double rc[3], const RAY *r, int flags);
232 > extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
233   extern double   raydist(const RAY *r, int flags);
234   extern double   raynormal(FVECT norm, RAY *r);
235   extern void     newrayxf(RAY *r);
236   extern void     flipsurface(RAY *r);
237   extern int      localhit(RAY *r, CUBE *scene);
238                                          /* defined in renderopts.c */
239 + extern int      feature_status(int ac, char *av[]);
240   extern int      getrenderopt(int ac, char *av[]);
241   extern void     print_rdefaults(void);
242                                          /* defined in srcdraw.c */
243   extern void     drawsources(COLOR *pic[], float *zbf[],
244                          int x0, int xsiz, int y0, int ysiz);
245 < extern void init_drawsources(int rad);
245 > extern void     init_drawsources(int rad);
246                                          /* defined in rt/initotypes.c */
247 < extern void initotypes(void);
247 > extern void     initotypes(void);
248                                          /* module main procedures */
249   extern void     rtrace(char *fname, int nproc);
250   extern char     *formstr(int  f);
# Line 238 | Line 252 | extern void    rview(void);
252   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
253  
254   #ifdef __FAST_MATH__
255 < #define checknorm(vn)   normalize(vn)
255 > #define checknorm(vn)   (void)normalize(vn)
256   #else
257 < #define checknorm(vn)   1.0
257 > #define checknorm(vn)
258   #endif
259  
260   #ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines