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.5 by greg, Sat Jun 16 17:09:49 2012 UTC vs.
Revision 2.14 by greg, Mon Mar 21 19:06:08 2016 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 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 75 | Line 79 | typedef struct {
79   extern LUTAB            ofiletab;       /* output stream table */
80  
81   #ifndef MAXPROCESS
82 < #ifdef _WIN32
82 > #if defined(_WIN32) || defined(_WIN64)
83   #define MAXPROCESS      1
84   #else
85   #define MAXPROCESS      128
# Line 83 | Line 87 | extern LUTAB           ofiletab;       /* output stream table */
87   #endif
88  
89   #ifndef MAXMODLIST
90 < #define MAXMODLIST      2048            /* maximum modifiers we'll track */
90 > #define MAXMODLIST      10000           /* maximum modifiers we'll track */
91   #endif
92  
93   extern const char       *modname[MAXMODLIST];   /* ordered modifier name list */
# Line 102 | 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 112 | 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             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