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.32 by greg, Sun Dec 13 19:13:04 2009 UTC vs.
Revision 2.43 by greg, Mon Jun 15 15:44:03 2020 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 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 + #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  
85   extern CUBE     thescene;       /* our scene */
86   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
87  
88 < extern unsigned long    raynum; /* next ray ID */
89 < extern unsigned long    nrays;  /* total rays traced so far */
88 > extern RNUMBER  raynum;         /* next ray ID */
89 > extern RNUMBER  nrays;          /* total rays traced so far */
90  
91   extern OBJREC  Lamb;            /* a Lambertian surface */
92   extern OBJREC  Aftplane;        /* aft clipping object */
# Line 128 | Line 137 | extern int     ambincl;        /* include == 1, exclude == 0 */
137  
138   extern int      ray_pnprocs;    /* number of child processes */
139   extern int      ray_pnidle;     /* number of idle processes */
140 + extern int      ray_pnbatch;    /* throughput over responsiveness? */
141  
142   #ifndef AMBLLEN
143   #define AMBLLEN         512     /* max. ambient list length */
# Line 164 | Line 174 | typedef struct {               /* rendering parameter holder */
174          int     ambincl;
175          short   amblndx[AMBLLEN+1];
176          char    amblval[AMBLLEN*AMBWORD];
177 +        
178 +        /* PMAP: photon mapping parameters */
179 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
180   } RAYPARAMS;
181  
182   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 195 | Line 208 | extern void    ray_restore(RAYPARAMS *rp);
208   extern void     ray_defaults(RAYPARAMS *rp);
209                                          /* defined in raypcalls.c */
210   extern void     ray_pinit(char *otnm, int nproc);
211 < extern void     ray_psend(RAY *r);
211 > extern int      ray_psend(RAY *r);
212   extern int      ray_pqueue(RAY *r);
213   extern int      ray_presult(RAY *r, int poll);
214   extern void     ray_pdone(int freall);
# Line 212 | Line 225 | extern void    raytrace(RAY *r);
225   extern void     rayhit(OBJECT *oset, RAY *r);
226   extern void     raycont(RAY *r);
227   extern void     raytrans(RAY *r);
228 + extern int      raytirrad(OBJREC *m, RAY *r);
229   extern int      rayshade(RAY *r, int mod);
230   extern void     rayparticipate(RAY *r);
231   extern void     raytexture(RAY *r, OBJECT mod);
232   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
233 < extern void     raycontrib(double rc[3], const RAY *r, int flags);
233 > extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
234   extern double   raydist(const RAY *r, int flags);
235   extern double   raynormal(FVECT norm, RAY *r);
236   extern void     newrayxf(RAY *r);
# Line 237 | Line 251 | extern char    *formstr(int  f);
251   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)   (void)normalize(vn)
256 + #else
257 + #define checknorm(vn)
258 + #endif
259  
260   #ifdef __cplusplus
261   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines