ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rcontrib.h
(Generate patch)

Comparing ray/src/rt/rcontrib.h (file contents):
Revision 2.1 by greg, Sat Jun 9 07:16:47 2012 UTC vs.
Revision 2.10 by greg, Sat Jul 19 18:19:33 2014 UTC

# Line 4 | Line 4
4   * Header file for rcontrib modules
5   */
6  
7 + #include "platform.h"
8 + #include "paths.h"
9 + #include "rtprocess.h"
10   #include "ray.h"
11   #include "func.h"
12   #include "lookup.h"
# Line 36 | Line 39 | extern int             account;        /* current accumulation count */
39   extern RNUMBER          raysleft;       /* number of rays left to trace */
40   extern long             waitflush;      /* how long until next flush */
41  
42 < extern int              lastray;        /* last ray number sent */
43 < extern int              lastdone;       /* last ray processed */
42 > extern RNUMBER          lastray;        /* last ray number sent */
43 > extern RNUMBER          lastdone;       /* last ray processed */
44  
45 < typedef double  DCOLOR[3];              /* double-precision color */
45 > typedef double          DCOLOR[3];      /* double-precision color */
46  
47   /*
48   * The MODCONT structure is used to accumulate ray contributions
# Line 54 | Line 57 | typedef double DCOLOR[3];              /* double-precision color *
57   typedef struct {
58          const char      *outspec;       /* output file specification */
59          const char      *modname;       /* modifier name */
60 +        const char      *params;        /* parameter list */
61          EPNODE          *binv;          /* bin value expression */
62          int             nbins;          /* number of contribution bins */
63          DCOLOR          cbin[1];        /* contribution bins (extends struct) */
# Line 85 | Line 89 | extern LUTAB           ofiletab;       /* output stream table */
89   #ifndef MAXMODLIST
90   #define MAXMODLIST      2048            /* maximum modifiers we'll track */
91   #endif
88 – #ifndef  MAXTSET
89 – #define  MAXTSET        16383           /* maximum number in trace set */
90 – #endif
92  
93   extern const char       *modname[MAXMODLIST];   /* ordered modifier name list */
94   extern int              nmods;                  /* number of modifiers */
95  
96   extern char             RCCONTEXT[];            /* special evaluation context */
97  
97 – extern void             tranotify(OBJECT obj);  /* new trace modifier */
98 –
98   extern char             *formstr(int f);        /* return format identifier */
99  
100   extern void             process_rcontrib(void); /* trace ray contributions */
# Line 107 | Line 106 | extern void            mod_output(MODCONT *mp);
106   extern void             end_record(void);
107  
108   extern MODCONT          *addmodifier(char *modn, char *outf,
109 <                                                char *binv, int bincnt);
109 >                                        char *prms, char *binv, int bincnt);
110   extern void             addmodfile(char *fname, char *outf,
111 <                                                char *binv, int bincnt);
111 >                                        char *prms, char *binv, int bincnt);
112  
113   extern void             reload_output(void);
114   extern void             recover_output(void);
# Line 117 | Line 116 | extern void            recover_output(void);
116   extern int              getvec(FVECT vec);
117  
118   extern int              in_rchild(void);
119 < extern void             end_children(void);
119 > extern void             end_children(int immed);
120  
121 < extern void             zero_record(int ndx);
123 < extern void             queue_modifiers(void);
121 > extern void             put_zero_record(int ndx);
122  
123   extern void             parental_loop(void);    /* controlling process */
124 +
125 + extern void             feeder_loop(void);      /* feeder process */
126  
127   extern void             rcontrib(void);         /* main calculation loop */

Diff Legend

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