21 |
|
int ndims = 0; /* number of sampling dimensions */ |
22 |
|
int samplendx = 0; /* index for this sample */ |
23 |
|
|
24 |
< |
static void trace_contrib(RAY *r); /* our trace callback */ |
25 |
< |
void (*trace)() = trace_contrib; |
24 |
> |
void (*trace)() = NULL; /* trace call (NULL before rcinit) */ |
25 |
|
|
26 |
|
int do_irrad = 0; /* compute irradiance? */ |
27 |
|
|
28 |
|
int rand_samp = 1; /* pure Monte Carlo sampling? */ |
29 |
|
|
30 |
|
double dstrsrc = 0.9; /* square source distribution */ |
31 |
< |
double shadthresh = .03; /* shadow threshold */ |
31 |
> |
double shadthresh = 0.; /* shadow threshold */ |
32 |
|
double shadcert = .75; /* shadow certainty */ |
33 |
|
int directrelay = 3; /* number of source relays */ |
34 |
|
int vspretest = 512; /* virtual source pretest density */ |
40 |
|
double seccg = 0.; /* global scattering eccentricity */ |
41 |
|
double ssampdist = 0.; /* scatter sampling distance */ |
42 |
|
|
43 |
< |
double specthresh = .15; /* specular sampling threshold */ |
43 |
> |
double specthresh = .02; /* specular sampling threshold */ |
44 |
|
double specjitter = 1.; /* specular sampling jitter */ |
45 |
|
|
46 |
|
int backvis = 1; /* back face visibility */ |
51 |
|
char *ambfile = NULL; /* ambient file name */ |
52 |
|
COLOR ambval = BLKCOLOR; /* ambient value */ |
53 |
|
int ambvwt = 0; /* initial weight for ambient value */ |
54 |
< |
double ambacc = 0; /* ambient accuracy */ |
54 |
> |
double ambacc = 0.; /* ambient accuracy */ |
55 |
|
int ambres = 256; /* ambient resolution */ |
56 |
|
int ambdiv = 350; /* ambient divisions */ |
57 |
|
int ambssamp = 0; /* ambient super-samples */ |
66 |
|
RNUMBER lastray = 0; /* last ray number sent */ |
67 |
|
RNUMBER lastdone = 0; /* last ray output */ |
68 |
|
|
69 |
+ |
static void trace_contrib(RAY *r); /* our trace callback */ |
70 |
+ |
|
71 |
|
static void mcfree(void *p) { epfree((*(MODCONT *)p).binv); free(p); } |
72 |
|
|
73 |
|
LUTAB modconttab = LU_SINIT(NULL,mcfree); /* modifier lookup table */ |
102 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
103 |
|
error(USER, errmsg); |
104 |
|
} |
105 |
< |
if (nmods >= MAXMODLIST) |
106 |
< |
error(INTERNAL, "too many modifiers"); |
105 |
> |
if (nmods >= MAXMODLIST) { |
106 |
> |
sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST); |
107 |
> |
error(INTERNAL, errmsg); |
108 |
> |
} |
109 |
|
if (!strcmp(modn, VOIDID)) { |
110 |
|
sprintf(errmsg, "cannot track '%s' modifier", VOIDID); |
111 |
|
error(USER, errmsg); |
134 |
|
error(SYSTEM, "out of memory in addmodifier"); |
135 |
|
mp->outspec = outf; /* XXX assumes static string */ |
136 |
|
mp->modname = modn; /* XXX assumes static string */ |
137 |
< |
mp->params = prms; |
137 |
> |
mp->params = prms; /* XXX assumes static string */ |
138 |
|
mp->binv = ebinv; |
139 |
+ |
mp->bin0 = 0; |
140 |
|
mp->nbins = bincnt; |
141 |
|
memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt); |
142 |
< |
/* allocate output streams */ |
143 |
< |
for (i = bincnt; i-- > 0; ) |
144 |
< |
getostream(mp->outspec, mp->modname, i, 1); |
142 |
> |
/* figure out starting bin */ |
143 |
> |
while (!getostream(mp->outspec, mp->modname, mp->bin0, 1)) |
144 |
> |
mp->bin0++; |
145 |
> |
/* allocate other output streams */ |
146 |
> |
for (i = 0; ++i < mp->nbins; ) |
147 |
> |
getostream(mp->outspec, mp->modname, mp->bin0+i, 1); |
148 |
|
lep->data = (char *)mp; |
149 |
|
return(mp); |
150 |
|
} |
157 |
|
char *mname[MAXMODLIST]; |
158 |
|
int i; |
159 |
|
/* find the file & store strings */ |
160 |
< |
if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) { |
160 |
> |
i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK)); |
161 |
> |
if (i < 0) { |
162 |
|
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
163 |
|
error(SYSTEM, errmsg); |
164 |
|
} |
165 |
+ |
if (i >= MAXMODLIST-1) { |
166 |
+ |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
167 |
+ |
MAXMODLIST-1, fname); |
168 |
+ |
error(INTERNAL, errmsg); |
169 |
+ |
} |
170 |
|
for (i = 0; mname[i]; i++) /* add each one */ |
171 |
|
addmodifier(mname[i], outf, prms, binv, bincnt); |
172 |
|
} |
185 |
|
|
186 |
|
/* Initialize our process(es) */ |
187 |
|
static void |
188 |
< |
rcinit() |
188 |
> |
rcinit(void) |
189 |
|
{ |
190 |
|
int i; |
191 |
|
|
197 |
|
/* set shared memory boundary */ |
198 |
|
shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY"); |
199 |
|
} |
200 |
+ |
trace = trace_contrib; /* set up trace call-back */ |
201 |
|
for (i = 0; i < nsources; i++) /* tracing to sources as well */ |
202 |
|
source[i].sflags |= SFOLLOW; |
203 |
|
if (yres > 0) { /* set up flushing & ray counts */ |
307 |
|
|
308 |
|
/* Accumulate and/or output ray contributions (child or only process) */ |
309 |
|
static void |
310 |
< |
done_contrib() |
310 |
> |
done_contrib(void) |
311 |
|
{ |
312 |
|
MODCONT *mp; |
313 |
|
int i; |
328 |
|
|
329 |
|
/* Principal calculation loop (called by main) */ |
330 |
|
void |
331 |
< |
rcontrib() |
331 |
> |
rcontrib(void) |
332 |
|
{ |
333 |
|
static int ignore_warning_given = 0; |
334 |
|
FVECT orig, direc; |