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.22 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.45 by greg, Sun Jan 31 18:08:04 2021 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 28 | Line 33 | extern "C" {
33                                  /* reflected ray types */
34   #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
35  
36 + /* Arrange so double's come first for optimal alignment */
37 + /* Pointers and long's come second for 64-bit mode */
38 + /* Int's next (unknown length), then floats, followed by short's & char's */
39   typedef struct ray {
32 –        unsigned long  rno;     /* unique ray number */
33 –        int     rlvl;           /* number of reflections for this ray */
34 –        float   rweight;        /* cumulative weight of this ray */
35 –        short   rtype;          /* ray type */
36 –        short   crtype;         /* cumulative ray type */
37 –        struct ray  *parent;    /* ray this originated from */
40          FVECT   rorg;           /* origin of ray */
41          FVECT   rdir;           /* normalized direction of ray */
42 <        double  rmax;           /* maximum distance (aft clipping plane) */
43 <        int     rsrc;           /* source we're aiming for */
42 >        RREAL   rmax;           /* maximum distance (aft clipping plane) */
43 >        RREAL   rot;            /* distance to object */
44 >        FVECT   rop;            /* intersection point */
45 >        FVECT   ron;            /* intersection surface normal */
46 >        RREAL   rod;            /* -DOT(rdir, ron) */
47 >        RREAL   uv[2];          /* local coordinates */
48 >        FVECT   pert;           /* surface normal perturbation */
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 */
54 <        void    (*revf)(struct ray *);  /* evaluation function for this ray */
54 >        void    (*revf)(struct ray *);  /* ray evaluation function */
55          void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
46 –        OBJECT  robj;           /* intersected object number */
56          OBJREC  *ro;            /* intersected object (one with material) */
48 –        double  rot;            /* distance to object */
49 –        FVECT   rop;            /* intersection point */
50 –        FVECT   ron;            /* intersection surface normal */
51 –        double  rod;            /* -DOT(rdir, ron) */
57          FULLXF  *rox;           /* object transformation */
58 <        RREAL   uv[2];          /* local coordinates */
59 <        FVECT   pert;           /* surface normal perturbation */
58 >        int     *slights;       /* list of lights to test for scattering */
59 >        RNUMBER rno;            /* unique ray number */
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   rcol;           /* returned ray value */
67 <        double  rt;             /* returned effective ray length */
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 <        int     *slights;       /* list of lights to test for scattering */
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 84 | Line 101 | extern int     ray_savesiz;    /* size of parameter save buff
101  
102   extern int      do_irrad;       /* compute irradiance? */
103  
104 + extern int      rand_samp;      /* pure Monte Carlo sampling? */
105 +
106   extern double   dstrsrc;        /* square source distribution */
107   extern double   shadthresh;     /* shadow threshold */
108   extern double   shadcert;       /* shadow testing certainty */
# Line 119 | Line 138 | extern int     ambincl;        /* include == 1, exclude == 0 */
138   extern int      ray_pnprocs;    /* number of child processes */
139   extern int      ray_pnidle;     /* number of idle processes */
140  
141 < #define AMBLLEN         128     /* max. ambient list length */
142 < #define AMBWORD         8       /* average word length */
141 > #ifndef AMBLLEN
142 > #define AMBLLEN         512     /* max. ambient list length */
143 > #endif
144 > #define AMBWORD         12      /* average word length */
145  
146   typedef struct {                /* rendering parameter holder */
147          int     do_irrad;
148 +        int     rand_samp;
149          double  dstrsrc;
150          double  shadthresh;
151          double  shadcert;
# Line 151 | Line 173 | typedef struct {               /* rendering parameter holder */
173          int     ambincl;
174          short   amblndx[AMBLLEN+1];
175          char    amblval[AMBLLEN*AMBWORD];
176 +        
177 +        /* PMAP: photon mapping parameters */
178 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
179   } RAYPARAMS;
180  
181   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 182 | Line 207 | extern void    ray_restore(RAYPARAMS *rp);
207   extern void     ray_defaults(RAYPARAMS *rp);
208                                          /* defined in raypcalls.c */
209   extern void     ray_pinit(char *otnm, int nproc);
210 < extern void     ray_psend(RAY *r);
210 > extern int      ray_psend(RAY *r);
211   extern int      ray_pqueue(RAY *r);
212   extern int      ray_presult(RAY *r, int poll);
213   extern void     ray_pdone(int freall);
214   extern void     ray_popen(int nadd);
215   extern void     ray_pclose(int nsub);
216 +                                        /* defined in ray_fifo.c */
217 + extern int      (*ray_fifo_out)(RAY *r);
218 + extern int      ray_fifo_in(RAY *r);
219 + extern int      ray_fifo_flush(void);
220                                          /* defined in raytrace.c */
221 < extern int      rayorigin(RAY *r, RAY *ro, int rt, double rw);
221 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
222   extern void     rayclear(RAY *r);
223   extern void     raytrace(RAY *r);
224 + extern int      rayreject(OBJREC *o, RAY *r, double t);
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 double   raydist(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);
237   extern void     flipsurface(RAY *r);
# Line 214 | Line 246 | extern void init_drawsources(int rad);
246                                          /* defined in rt/initotypes.c */
247   extern void initotypes(void);
248                                          /* module main procedures */
249 < extern void     rtrace(char *fname);
250 < extern char * formstr(int  f);
249 > extern void     rtrace(char *fname, int nproc);
250 > 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