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.4 by greg, Fri Jun 15 00:57:40 2012 UTC vs.
Revision 2.16 by greg, Wed Sep 9 21:28:19 2020 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 39 | Line 42 | extern long            waitflush;      /* how long until next flush *
42   extern RNUMBER          lastray;        /* last ray number sent */
43   extern RNUMBER          lastdone;       /* last ray processed */
44  
45 + extern int              report_intvl;   /* reporting interval (seconds) */
46 +
47   typedef double          DCOLOR[3];      /* double-precision color */
48  
49   /*
# Line 54 | Line 59 | typedef double         DCOLOR[3];      /* double-precision color *
59   typedef struct {
60          const char      *outspec;       /* output file specification */
61          const char      *modname;       /* modifier name */
62 +        const char      *params;        /* parameter list */
63          EPNODE          *binv;          /* bin value expression */
64 +        int             bin0;           /* starting bin offset */
65          int             nbins;          /* number of contribution bins */
66          DCOLOR          cbin[1];        /* contribution bins (extends struct) */
67   } MODCONT;                      /* modifier contribution */
# Line 75 | Line 82 | typedef struct {
82   extern LUTAB            ofiletab;       /* output stream table */
83  
84   #ifndef MAXPROCESS
85 < #ifdef _WIN32
85 > #if defined(_WIN32) || defined(_WIN64)
86   #define MAXPROCESS      1
87   #else
88   #define MAXPROCESS      128
# Line 83 | Line 90 | extern LUTAB           ofiletab;       /* output stream table */
90   #endif
91  
92   #ifndef MAXMODLIST
93 < #define MAXMODLIST      2048            /* maximum modifiers we'll track */
93 > #define MAXMODLIST      10000           /* maximum modifiers we'll track */
94   #endif
95  
96   extern const char       *modname[MAXMODLIST];   /* ordered modifier name list */
# Line 102 | Line 109 | extern void            mod_output(MODCONT *mp);
109   extern void             end_record(void);
110  
111   extern MODCONT          *addmodifier(char *modn, char *outf,
112 <                                                char *binv, int bincnt);
112 >                                        char *prms, char *binv, int bincnt);
113   extern void             addmodfile(char *fname, char *outf,
114 <                                                char *binv, int bincnt);
114 >                                        char *prms, char *binv, int bincnt);
115  
116   extern void             reload_output(void);
117   extern void             recover_output(void);
# Line 112 | Line 119 | extern void            recover_output(void);
119   extern int              getvec(FVECT vec);
120  
121   extern int              in_rchild(void);
122 < extern void             end_children(void);
122 > extern void             end_children(int immed);
123  
124   extern void             put_zero_record(int ndx);
118 – extern void             queue_modifiers(void);
125  
126 + extern int              morays(void);           /* reached end of input? */
127 +
128   extern void             parental_loop(void);    /* controlling process */
129 +
130 + extern void             feeder_loop(void);      /* feeder process */
131  
132   extern void             rcontrib(void);         /* main calculation loop */

Diff Legend

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