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.33 by greg, Tue Dec 15 18:21:53 2009 UTC

# Line 14 | Line 14
14   extern "C" {
15   #endif
16  
17 + #ifndef RNUMBER
18 + #define RNUMBER         unsigned long   /* ray counter (>= sizeof pointer) */
19 + #endif
20 +
21   #define  MAXDIM         32      /* maximum number of dimensions */
22  
23                                  /* ray type flags */
# Line 50 | Line 54 | typedef struct ray {
54          OBJREC  *ro;            /* intersected object (one with material) */
55          FULLXF  *rox;           /* object transformation */
56          int     *slights;       /* list of lights to test for scattering */
57 <        unsigned long  rno;     /* unique ray number */
57 >        RNUMBER rno;            /* unique ray number */
58          int     rlvl;           /* number of reflections for this ray */
59          int     rsrc;           /* source we're aiming for */
60          float   rweight;        /* cumulative weight (for termination) */
# Line 191 | Line 195 | extern void    ray_restore(RAYPARAMS *rp);
195   extern void     ray_defaults(RAYPARAMS *rp);
196                                          /* defined in raypcalls.c */
197   extern void     ray_pinit(char *otnm, int nproc);
198 < extern void     ray_psend(RAY *r);
198 > extern int      ray_psend(RAY *r);
199   extern int      ray_pqueue(RAY *r);
200   extern int      ray_presult(RAY *r, int poll);
201   extern void     ray_pdone(int freall);
202   extern void     ray_popen(int nadd);
203   extern void     ray_pclose(int nsub);
204 +                                        /* defined in ray_fifo.c */
205 + extern int      (*ray_fifo_out)(RAY *r);
206 + extern int      ray_fifo_in(RAY *r);
207 + extern int      ray_fifo_flush(void);
208                                          /* defined in raytrace.c */
209   extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
210   extern void     rayclear(RAY *r);
# Line 224 | Line 232 | extern void init_drawsources(int rad);
232                                          /* defined in rt/initotypes.c */
233   extern void initotypes(void);
234                                          /* module main procedures */
235 < extern void     rtrace(char *fname);
236 < extern char * formstr(int  f);
235 > extern void     rtrace(char *fname, int nproc);
236 > extern char     *formstr(int  f);
237   extern void     rview(void);
238   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
239  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines